passenger 5.1.1 → 5.1.2

data/src/nodejs_supportlib/phusion_passenger/ustrouter_connector.js

@@ -25,7 +25,6 @@
 
 var log;
 var net = require('net');
-var os = require('os');
 var nbo = require('vendor-copy/network-byte-order');
 var codify = require('vendor-copy/codify');
 
@@ -102,15 +101,15 @@ exports.init = function(logger, routerAddress, routerUser, routerPass, gatewayKe
 	changeState(0, "Init approved");
 
 	beginConnection();
-}
+};
 
 exports.finit = function() {
 	resetState("finit()");
-}
+};
 
 exports.isEnabled = function() {
 	return routerState >= 0;
-}
+};
 
 function beginConnection() {
 	changeState(1);
@@ -162,7 +161,7 @@ function LogTransaction(cat) {
 }
 
 function findLastPendingTxnForId(txnId) {
-	for (i = pendingTxnBuf.length - 1; i >= 0; i--) {
+	for (var i = pendingTxnBuf.length - 1; i >= 0; i--) {
 		if (pendingTxnBuf[i].txnId == txnId) {
 			return pendingTxnBuf[i];
 		}
@@ -180,7 +179,7 @@ exports.deferIfPendingTxns = function(txnId, deferThis, deferFn, deferArgs) {
 		txn.deferFn = deferFn;
 		txn.deferArgs = deferArgs;
 	}
-}
+};
 
 // Example categories are "requests", "exceptions". The lineArray is a specific format parsed by Union STation.
 // txnIfContinue is an optional txnId and attaches the log to an existing transaction with the specified txnId.
@@ -204,7 +203,7 @@ exports.logToUstTransaction = function(category, lineArray, txnIfContinue) {
 	}
 
 	pushPendingData();
-}
+};
 
 function verifyOk(rcvString, topic) {
 	if ("status" != rcvString[0] || "ok" != rcvString[1]) {
@@ -249,7 +248,7 @@ function pushPendingData() {
 		case 2:
 			// txn is open, log the data & close
 			log.debug("log & close transaction(" + pendingTxnBuf[0].txnId + ")");
-			txn = pendingTxnBuf.shift();
+			var txn = pendingTxnBuf.shift();
 
 			if (txn.deferFn) {
 				var moveToTxn = findLastPendingTxnForId(txn.txnId);
@@ -264,7 +263,7 @@ function pushPendingData() {
 				}
 			}
 
-			for (i = 0; i < txn.logBuf.length; i++) {
+			for (var i = 0; i < txn.logBuf.length; i++) {
 				writeLenArray(routerConn, "log\0" + txn.txnId + "\0" + codify.toCode(txn.timestamp) + "\0");
 				writeLenString(routerConn, txn.logBuf[i]);
 			}
@@ -309,17 +308,20 @@ function readLenArray(newData) {
 	readBuf += newData;
 	log.silly("read: total len = " + readBuf.length);
 	log.silly(new Buffer(readBuf).toString("hex"));
+
 	if (readBuf.length < 2) {
-	log.silly("need more header data..");
+		log.silly("need more header data..");
 		return null; // expecting at least length bytes
 	}
-	payloadLen = nbo.ntohs(new Buffer(readBuf), 0);
+
+	var payloadLen = nbo.ntohs(new Buffer(readBuf), 0);
 	log.silly("read: payloadLen = " + payloadLen);
+
 	if (readBuf.length < 2 + payloadLen) {
-	log.silly("need more payload data..");
+		log.silly("need more payload data..");
 		return null; // not fully read yet
 	}
-	resultStr = readBuf.substring(2, payloadLen + 2);
+	var resultStr = readBuf.substring(2, payloadLen + 2);
 	readBuf = readBuf.substring(payloadLen + 2); // keep any bytes read beyond length for next read
 
 	return resultStr.split("\0");
@@ -328,7 +330,7 @@ function readLenArray(newData) {
 function onData(data) {
 	log.silly("onData [" + data + "] (len = " + data.length + ")");
 
-	rcvString = readLenArray(data);
+	var rcvString = readLenArray(data);
 	if (!rcvString) {
 		return;
 	}
@@ -365,8 +367,8 @@ function onData(data) {
 
 		case 5:
 			log.warn("unexpected data receive state (5)");
-	 		pushPendingData();
-	 		break;
+			pushPendingData();
+			break;
 
 		case 6:
 			resetWatchdog();
@@ -421,14 +423,14 @@ function changeState(newRouterState, optReason) {
 }
 
 function writeLenString(c, str) {
-	len = new Buffer(4);
+	var len = new Buffer(4);
 	nbo.htonl(len, 0, str.length);
 	c.write(len);
 	c.write(str);
 }
 
 function writeLenArray(c, str) {
-	len = new Buffer(2);
+	var len = new Buffer(2);
 	nbo.htons(len, 0, str.length);
 	c.write(len);
 	c.write(str);

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.1.1'
+  VERSION_STRING = '5.1.2'
 
   PREFERRED_NGINX_VERSION = '1.10.2'
   NGINX_SHA256_CHECKSUM = '1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2'

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -90,7 +90,7 @@ module PhusionPassenger
       # Phusion Passenger is not running.
       def passenger_processes
         @passenger_processes ||= list_processes(:match =>
-          /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py|(.*)PassengerAgent)/)
+          /((^| )Passenger|(^| )Rails:|(^| )Rack:|wsgi-loader.py|(.*)PassengerAgent|rack-loader.rb)/)
       end
 
       # Returns the sum of the memory usages of all given processes.

data/src/ruby_supportlib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion Holding B.V.
+#  Copyright (c) 2014-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -100,6 +100,11 @@ module PhusionPassenger
             "Nginx version with --nginx-version") do |val|
             options[:nginx_tarball] = val
           end
+          opts.on("--engine ENGINE", String, "Engine to use. " +
+            "Default: Nginx") do |val|
+            options[:engine] = val.downcase
+            options[:compile] = false unless options[:engine] == "nginx"
+          end
           opts.on("--brief", "Report progress in a brief style") do
             options[:brief] = true
             options[:install_agent_args] << "--brief"
@@ -182,12 +187,14 @@ module PhusionPassenger
           end
           result
         end
-        if !@options[:nginx_version]
-          if @options[:nginx_tarball]
-            abort "#{@colors.red}Error: if you specify --nginx-tarball, " +
-              "you must also specify --nginx-version.#{@colors.reset}"
-          else
-            @options[:nginx_version] = PREFERRED_NGINX_VERSION
+        if @options[:engine] == "nginx"
+          if !@options[:nginx_version]
+            if @options[:nginx_tarball]
+              abort "#{@colors.red}Error: if you specify --nginx-tarball, " +
+                "you must also specify --nginx-version.#{@colors.reset}"
+            else
+              @options[:nginx_version] = PREFERRED_NGINX_VERSION
+            end
           end
         end
       end
@@ -221,6 +228,7 @@ module PhusionPassenger
       end
 
       def download_nginx_engine
+        return true if @options[:engine] != "nginx"
         if @options[:nginx_version] != PREFERRED_NGINX_VERSION
           return false
         end
@@ -242,6 +250,10 @@ module PhusionPassenger
       end
 
       def compile_nginx_engine(tmpdir)
+        if @options[:engine] != "nginx"
+          puts "Not compiling Nginx engine, because builtin engine selected."
+          return
+        end
         puts
         puts "---------------------------------------"
         puts
@@ -251,6 +263,14 @@ module PhusionPassenger
           args = @options[:compile_args].dup
           args << "--working-dir"
           args << tmpdir
+          if @options[:nginx_version]
+            args << "--nginx-version"
+            args << @options[:nginx_version]
+          end
+          if @options[:nginx_tarball]
+            args << "--nginx-tarball"
+            args << @options[:nginx_tarball]
+          end
           CompileNginxEngineCommand.new(args).run
         else
           abort "No precompiled Nginx engine could be downloaded. Refusing to compile because --no-compile is given."

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -1,7 +1,7 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -242,12 +242,24 @@ module PhusionPassenger
             abort
           end
         end
-        nginx_sources_name = "nginx-#{@nginx_version}"
 
         puts "Extracting tarball..."
         e_working_dir = Shellwords.escape(@working_dir)
         e_tarball = Shellwords.escape(tarball)
-        system("cd #{e_working_dir} && tar xzf #{e_tarball}")
+        result = system("cd #{e_working_dir} && tar xzf #{e_tarball}")
+        if !result
+          puts
+          if @nginx_tarball
+            new_screen
+            puts "You specified --nginx-tarball, but the file could not be extracted. " +
+              "Please check the path and format (tar.gz), and ensure Passenger can write to " + 
+              PlatformInfo.tmpexedir + "."
+            puts
+          else
+            show_possible_solutions_for_download_and_extraction_problems
+          end
+          abort
+        end
       end
 
       def show_possible_solutions_for_download_and_extraction_problems

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -106,7 +106,7 @@ module PhusionPassenger
     SHORT_PROGRAM_NAME = "Passenger"
     SERVER_TOKEN_NAME = "Phusion_Passenger"
     FLYING_PASSENGER_NAME = "Flying Passenger"
-    SUPPORT_URL         = "https://www.phusionpassenger.com/documentation_and_support"
+    SUPPORT_URL         = "https://www.phusionpassenger.com/support"
     ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
     GLOBAL_NAMESPACE_DIRNAME            = PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME_
     # Subdirectory under $HOME to use for storing stuff.

data/src/ruby_supportlib/phusion_passenger/platform_info/apache_detector.rb

@@ -239,7 +239,7 @@ module PhusionPassenger
         elsif @results.size > 1
           log "<yellow>WARNING: You have multiple Apache installations on your system!</yellow>"
           log "You are strongly recommended to read this section of the documentation:"
-          log "<b>https://www.phusionpassenger.com/install/apache/multiple_apache_installs.html</b>"
+          log "<b>https://www.phusionpassenger.com/library/install/apache/multiple_apache_installs.html</b>"
         end
       end
 

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -49,7 +49,10 @@ define 'libcurl-dev' do
     source = %Q{
       #include <curl/curl.h>
       int main() {
-        curl_global_init(CURL_GLOBAL_ALL);
+        CURLcode result = curl_global_init(CURL_GLOBAL_ALL);
+        if (result == CURLE_PEER_FAILED_VERIFICATION) { // fails to compile if too old
+          return 1;
+        }
         return 0;
       }
     }

data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -177,6 +177,9 @@ module PhusionPassenger
         if @options[:ssl] && !@options[:ssl_certificate_key]
           abort "You specified --ssl. Please specify --ssl-certificate-key as well."
         end
+        if @options[:nginx_tarball] && !@options_without_defaults[:nginx_version]
+          abort "You specified --nginx-tarball. Please also specify which Nginx version the tarball contains using --nginx-version."
+        end
         if @options[:engine] != "builtin" && @options[:engine] != "nginx"
           abort "You've specified an invalid value for --engine. The only values allowed are: builtin, nginx."
         end
@@ -218,10 +221,10 @@ module PhusionPassenger
         else
           nginx_name = "nginx-#{@options[:nginx_version]}"
           @nginx_binary = PhusionPassenger.find_support_binary(nginx_name)
-          if !@agent_exe || !@nginx_binary
+          if !@agent_exe || (@options[:engine] == "nginx" && !@nginx_binary)
             install_runtime
             @agent_exe = PhusionPassenger.find_support_binary(AGENT_EXE)
-            @nginx_binary = PhusionPassenger.find_support_binary(nginx_name)
+            @nginx_binary = PhusionPassenger.find_support_binary(nginx_name) if @options[:engine] == "nginx"
           end
         end
       end
@@ -240,6 +243,7 @@ module PhusionPassenger
           # (as opposed to responding quickly with an error), then the system
           # quickly switches to a mirror.
           "--connect-timeout", "0",
+          "--engine", @options[:engine],
           "--idle-timeout", "0"
         ]
         if @options[:auto]
@@ -249,13 +253,15 @@ module PhusionPassenger
           args << "--url-root"
           args << @options[:binaries_url_root]
         end
-        if @options[:nginx_version]
-          args << "--nginx-version"
-          args << @options[:nginx_version]
-        end
-        if @options[:nginx_tarball]
-          args << "--nginx-tarball"
-          args << @options[:nginx_tarball]
+        if @options[:engine] == "nginx"
+          if @options[:nginx_version]
+            args << "--nginx-version"
+            args << @options[:nginx_version]
+          end
+          if @options[:nginx_tarball]
+            args << "--nginx-tarball"
+            args << @options[:nginx_tarball]
+          end
         end
         if @options[:dont_compile_runtime]
           args << "--no-compile"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake