passenger 4.0.25 → 4.0.26

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSi8RJAAoJECrHRaUKISqMCSIIAI+VKk4qgW9zhjSUAZ7HsZbT
-jyB8LsJqSdcoenACclHob+RozCcvXFW2BLZp6tx6QrQV2HQ2nolNAFdVBO8SfgOf
-WC4AAeYby/GBCiRZHFN69zCxmp/WAgP/9GAsSAwJDhW/0qDjx36RWE+Z8Elq4wd/
-H31gpnOma9DD5rWSpFxYuqpT7MR6Ino4Bf1QnwpVo6tHpe2PO5wHA8fSiBwG+uyX
-VnCKWkpjqadczpdqHI//AftXo7LtLmDGFY/jA7LtISk4WPuH3PHAhXnblAxvFV4+
-bhZGqZionb1bq/OcWeB68Pa2IalxLLkZzi3NR08jnfjJuUuspQpvSQ5VQh78DCc=
-=aoKj
+iQEcBAABAgAGBQJSlyZAAAoJECrHRaUKISqMPoYH/Re2+/VKPaDbGqAdn5Mkz+M6
+GDSzfoGdSnaNN361EKI4kommvEaWYQOu3YoOMa5841rAc7e+cqlmLz4BM68qoNsx
+1Cc9QIBBuO0mwoxzze/Ecqfu/xDzSWC5LveDJb+GAWyk4YTUCUf8w82OTfqf/KSV
+w0IlUApvPFW/Qpddq8g6VyYabcCcJdwa/UNVsCf4h+oTPMC8Ll3R3ZMX3Xzm0Fub
+Au33s0RiVSaGkOhzPAGrDxbajt3pFBs/Gwc4aBJr6Kd5LEynETzZVkjxpDEUVVVd
+lLjPk2hF3pKDy0ZCPPq75gzsgkgo0BZVM2s9auA1kFgIUqQnjkJS/c9FlfACaPo=
+=FcDX
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,14 @@
+Release 4.0.26
+--------------
+
+ * Introduced the `PassengerBufferUpload` option for Apache. This option allows one
+   to disable upload buffering, e.g. in order to be able to track upload progress.
+ * [Nginx] The `HTTPS` variable is now set correctly for HTTPS connections, even
+   without setting `ssl on`. Fixes issue #401.
+ * [Standalone] It is now possible to listen on both a normal HTTP and an HTTPS port.
+ * [Enterprise] The `passenger-status` tool now displays rolling restart status.
+
+
 Release 4.0.25
 --------------
 

data/build/packaging.rb

@@ -389,15 +389,15 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	sh "mkdir -p #{fake_include_dir}"
 	# Infer headers that the Nginx module needs
 	headers = [
-		["ext/common/Exceptions.h", "Exceptions.h"]
+		["ext/common/Exceptions.h", "common/Exceptions.h"]
 	]
 	Dir["ext/nginx/*.[ch]"].each do |filename|
 		File.read(filename).split("\n").grep(%r{#include "common/(.+)"}) do |match|
-			headers << ["ext/common/#{$1}", $1]
+			headers << ["ext/common/#{$1}", "common/#{$1}"]
 		end
 	end
 	headers.each do |header|
-		target = "#{fake_include_dir}/common/#{header[1]}"
+		target = "#{fake_include_dir}/#{header[1]}"
 		dir = File.dirname(target)
 		if !File.directory?(dir)
 			sh "mkdir -p #{dir}"

data/debian.template/passenger.install.template

@@ -1,5 +1,5 @@
 usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents/
-nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>/objs/nginx usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/
+nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>/objs/PassengerWebHelper usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/templates/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/standalone_default_root/

data/debian.template/rules.template

@@ -31,7 +31,8 @@ override_dh_auto_build:
 		./configure --prefix=/tmp \
 		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
 		--add-module=`pwd`/../ext/nginx && \
-		make
+		make && \
+		mv objs/nginx objs/PassengerWebHelper
 
 override_dh_auto_install:
 	mkdir debian/tmp/

data/doc/Users guide Apache.idmap.txt

@@ -198,11 +198,13 @@
 
 6.7. Connection handling options	=>	connection-handling-options-1k3zd1a
 
-6.7.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
+6.7.1. PassengerBufferUpload <on|off>	=>	passengerbufferupload-on-off--1lsjr93
 
-6.7.2. PassengerErrorOverride <on|off>	=>	passengererroroverride-on-off--1pq9nez
+6.7.2. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
 
-6.7.3. PassengerMaxRequestQueueSize <number>	=>	passenger-max-request-queue-size-number--1f1uocd
+6.7.3. PassengerErrorOverride <on|off>	=>	passengererroroverride-on-off--1pq9nez
+
+6.7.4. PassengerMaxRequestQueueSize <number>	=>	passenger-max-request-queue-size-number--1f1uocd
 
 6.8. Compatibility options	=>	compatibility-options-8jve5a
 

data/doc/Users guide Apache.txt

@@ -1636,6 +1636,28 @@ http://www.foo.com/chatroom/ajax_update_poll only.
 
 === Connection handling options ===
 
+[[PassengerBufferUpload]]
+==== PassengerBufferUpload <on|off> ====
+When turned on, HTTP request uploads (HTTP POST request bodies) will be buffered before sending the request to the application. Enabling upload buffering protects the application from slow clients, but will also prevent the ability to track upload progress.
+
+If you want to allow your application to track upload progress, it is recommended that you disable upload buffering for specific URIs only. For example:
+
+------------------------
+# Disable upload buffering for /upload_video only.
+<Location /upload_video>
+    PassengerBufferUpload off
+</Location>
+------------------------
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess'.
+
+In each place, it may be specified at most once. The default value is 'on'.
+
 [[PassengerBufferResponse]]
 ==== PassengerBufferResponse <on|off> ====
 When turned on, application-generated responses are buffered by Apache. Buffering will

data/doc/Users guide Nginx.txt

@@ -89,9 +89,9 @@ And you want your Rails application, located in `/websites/rails`, to be accessi
 
 To do this, you need to perform the following:
 
- 1. Create a `location` with parameter `^/<SUBURI>(/|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
+ 1. Create a `location` with parameter `~ ^/<SUBURI>(/.*|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
  2. Inside the location block, set `passenger_base_uri <SUBURI>`.
- 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>$1`.
  4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
  5. Inside the location block, re-specify `passenger_enabled on`.
 
@@ -107,9 +107,9 @@ http {
         root /websites/phusion;
 
         # This block has been added.
-        location ^/subapp(/|$) {
+        location ~ ^/subapp(/.*|$) {
             passenger_base_uri /subapp;
-            alias /websites/rails/public;  # <-- be sure to point to 'public'!
+            alias /websites/rails/public$1;  # <-- be sure to point to 'public'!
             passenger_app_root /websites/rails;
             passenger_enabled on;
         }
@@ -280,9 +280,9 @@ And you want your Rack application, located in `/websites/rack`, to be accessibl
 
 To do this, you need to perform the following:
 
- 1. Create a `location` with parameter `^/<SUBURI>(/|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
+ 1. Create a `location` with parameter `~ ^/<SUBURI>(/.*|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
  2. Inside the location block, set `passenger_base_uri <SUBURI>`.
- 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>$1`.
  4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
  5. Inside the location block, re-specify `passenger_enabled on`.
 
@@ -298,9 +298,9 @@ http {
         root /websites/phusion;
 
         # This block has been added.
-        location ^/subapp(/|$) {
+        location ~ ^/subapp(/.*|$) {
             passenger_base_uri /subapp;
-            alias /websites/rack/public;  # <-- be sure to point to 'public'!
+            alias /websites/rack/public$1;  # <-- be sure to point to 'public'!
             passenger_app_root /websites/rack;
             passenger_enabled on;
         }
@@ -440,9 +440,9 @@ And you want your WSGI application, located in `/websites/wsgi`, to be accessibl
 
 To do this, you need to perform the following:
 
- 1. Create a `location` with parameter `^/<SUBURI>(/|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
+ 1. Create a `location` with parameter `~ ^/<SUBURI>(/.*|$)`. This is a regular expression that says: "match everything that is exactly <SUBURI>, or starts with <SUBDURI>/".
  2. Inside the location block, set `passenger_base_uri <SUBURI>`.
- 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>$1`.
  4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
  5. Inside the location block, re-specify `passenger_enabled on`.
 
@@ -458,9 +458,9 @@ http {
         root /websites/phusion;
 
         # This block has been added.
-        location ^/subapp(/|$) {
+        location ~ ^/subapp(/.*|$) {
             passenger_base_uri /subapp;
-            alias /websites/wsgi/public;  # <-- be sure to point to 'public'!
+            alias /websites/wsgi/public$1;  # <-- be sure to point to 'public'!
             passenger_app_root /websites/wsgi;
             passenger_enabled on;
         }

data/doc/Users guide Standalone.txt

@@ -36,7 +36,7 @@ passenger start
 Most configuration is done by customizing the arguments passed to the `passenger` command. The most important ones are:
 
 `--port NUMBER`::
-	The port number that Phusion Passenger should listen on. Defaults to 3000.
+	The port number that Phusion Passenger Standalone should listen on. If not given, port 3000 is assumed.
 `--environment NAME`::
 	Customizes the value of the `RAILS_ENV`, `RACK_ENV`, `WSGI_ENV`, `NODE_ENV` and `PASSENGER_ENV` environment variables. Some web frameworks, for example Rails and Connect.js, adjust their behavior according to the environment. The default value is 'development'.
 `--max-pool-size NUMBER`::
@@ -49,6 +49,13 @@ Most configuration is done by customizing the arguments passed to the `passenger
 	If your app fails to start, Phusion Passenger will tell you by showing a friendly error page in the browser. This option disables it.
 `--ssl`::
 	Enables SSL support. If this is set, you must also set `--ssl-certificate` and `--ssl-certificate-key` to the SSL certificate and key files, respectively.
+`--ssl-port`::
+	If `--ssl` is given, and you set this option, then Phusion Passenger Standalone will listen for HTTP on the regular `--port` number, *as well as* listen for HTTPS on the port you specified with this option. For example:
++
+------------------------------------------------------------------------------
+# Listen for HTTP on port 3000, HTTPS on port 3001.
+passenger start --ssl --ssl-certificate ... --ssl-certificate-key ... --ssl-port 3001
+------------------------------------------------------------------------------
 
 See `--help` for all available options.
 
@@ -76,6 +83,8 @@ The following configuration options are supported:
 	Equivalent to the `--spawn-method` command line option.
 `ssl`::
 	Equivalent to the `--ssl` command line option. When given, you must also set `ssl_certificate` and `ssl_certificate_key` in the configuration file.
+`ssl_port`::
+	Equivalent to the `--ssl-port` command line option.
 +
 When in mass deployment mode, you will probably want to set a different `port` too. If you don't, and you end up in a situation in which a port is used for both HTTP and HTTPS traffic, then the builtin Nginx core will abort with an error.
 

data/ext/apache2/ConfigurationCommands.cpp

@@ -117,3 +117,21 @@
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to load environment variables from the shell before running the application."),
 
+	AP_INIT_FLAG("PassengerBufferUpload",
+		(FlagFunc) cmd_passenger_buffer_upload,
+		NULL,
+		OR_ALL,
+		"Whether to buffer file uploads."),
+
+	AP_INIT_TAKE1("PassengerAppType",
+		(Take1Func) cmd_passenger_app_type,
+		NULL,
+		OR_ALL,
+		"Force specific application type."),
+
+	AP_INIT_TAKE1("PassengerStartupFile",
+		(Take1Func) cmd_passenger_startup_file,
+		NULL,
+		OR_ALL,
+		"Force specific startup file."),
+

data/ext/apache2/ConfigurationFields.hpp

@@ -38,6 +38,8 @@
 
 
 
+	/** Whether to buffer file uploads. */
+	Threeway bufferUpload;
 	/** Enable or disable Phusion Passenger. */
 	Threeway enabled;
 	/** Allow Apache to handle error response. */
@@ -54,6 +56,8 @@
 	int minInstances;
 	/** A timeout for application startup. */
 	int startTimeout;
+	/** Force specific application type. */
+	const char *appType;
 	/** The group that Ruby applications must run as. */
 	const char *group;
 	/** The Node.js command to use. */
@@ -62,6 +66,8 @@
 	const char *python;
 	/** The Ruby interpreter to use. */
 	const char *ruby;
+	/** Force specific startup file. */
+	const char *startupFile;
 	/** The user that Ruby applications must run as. */
 	const char *user;
 

data/ext/apache2/ConfigurationSetters.cpp

@@ -258,4 +258,31 @@
 			return NULL;
 		}
 	
+	
+		static const char *
+		cmd_passenger_buffer_upload(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->bufferUpload =
+				arg ?
+				DirConfig::ENABLED :
+				DirConfig::DISABLED;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_app_type(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->appType = arg;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_startup_file(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->startupFile = arg;
+			return NULL;
+		}
+	
 

data/ext/apache2/CreateDirConfig.cpp

@@ -51,4 +51,7 @@
 				config->enabled = DirConfig::UNSET;
 				config->maxRequestQueueSize = UNSET_INT_VALUE;
 				config->loadShellEnvvars = DirConfig::UNSET;
+				config->bufferUpload = DirConfig::UNSET;
+				config->appType = NULL;
+				config->startupFile = NULL;
 	

data/ext/apache2/DirectoryMapper.h

@@ -145,13 +145,22 @@ private:
 		AppTypeDetector detector(cstat, throttleRate);
 		PassengerAppType appType;
 		string appRoot;
-		if (config->appRoot == NULL) {
-			appType = detector.checkDocumentRoot(publicDir,
-				baseURI != NULL || config->resolveSymlinksInDocRoot == DirConfig::ENABLED,
-				&appRoot);
+		if (config->appType == NULL) {
+			if (config->appRoot == NULL) {
+				appType = detector.checkDocumentRoot(publicDir,
+					baseURI != NULL || config->resolveSymlinksInDocRoot == DirConfig::ENABLED,
+					&appRoot);
+			} else {
+				appRoot = config->appRoot;
+				appType = detector.checkAppRoot(appRoot);
+			}
 		} else {
-			appRoot = config->appRoot;
-			appType = detector.checkAppRoot(appRoot);
+			if (config->appRoot == NULL) {
+				appType = PAT_NONE;
+			} else {
+				appRoot = config->appRoot;
+				appType = getAppType(config->appType);
+			}
 		}
 
 		this->appRoot = appRoot;

data/ext/apache2/Hooks.cpp

@@ -534,19 +534,21 @@ private:
 			/********** Step 2: handle HTTP upload data, if any **********/
 			
 			int httpStatus = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK);
-	    		if (httpStatus != OK) {
+	    	if (httpStatus != OK) {
 				return httpStatus;
 			}
 			
 			this_thread::disable_interruption di;
 			this_thread::disable_syscall_interruption dsi;
 			bool expectingUploadData;
+			bool shouldBufferUploads;
 			string uploadDataMemory;
 			boost::shared_ptr<BufferedUpload> uploadDataFile;
 			const char *contentLength;
 			
 			expectingUploadData = ap_should_client_block(r);
 			contentLength = lookupHeader(r, "Content-Length");
+			shouldBufferUploads = config->bufferUpload != DirConfig::DISABLED;
 			
 			/* If the HTTP upload data is larger than a threshold, or if the HTTP
 			 * client sent HTTP upload data using the "chunked" transfer encoding
@@ -557,17 +559,15 @@ private:
 			 * the HTTP client might block indefinitely until it's done uploading.
 			 * This would quickly exhaust the application pool.
 			 */
-			if (expectingUploadData) {
+			if (expectingUploadData && shouldBufferUploads) {
 				if (contentLength == NULL || atol(contentLength) > LARGE_UPLOAD_THRESHOLD) {
 					uploadDataFile = receiveRequestBody(r);
 				} else {
 					receiveRequestBody(r, contentLength, uploadDataMemory);
 				}
-			}
-			
-			if (expectingUploadData) {
+
 				/* We'll set the Content-Length header to the length of the
-				 * received upload data. Rails requires this header for its
+				 * received upload data. Rails 2 requires this header for its
 				 * HTTP upload data multipart parsing process.
 				 * There are two reasons why we don't rely on the Content-Length
 				 * header as sent by the client:
@@ -606,16 +606,20 @@ private:
 			sizeString[ret] = '\0';
 			requestData[0] = StaticString(sizeString, ret);
 			
-			if (expectingUploadData && uploadDataFile == NULL) {
+			if (expectingUploadData && shouldBufferUploads && uploadDataFile == NULL) {
 				requestData.push_back(uploadDataMemory);
 			}
 			
 			FileDescriptor conn = connectToHelperAgent();
 			gatheredWrite(conn, &requestData[0], requestData.size());
 			
-			if (expectingUploadData && uploadDataFile != NULL) {
-				sendRequestBody(conn, uploadDataFile);
-				uploadDataFile.reset();
+			if (expectingUploadData) {
+				if (shouldBufferUploads && uploadDataFile != NULL) {
+					sendRequestBody(conn, uploadDataFile);
+					uploadDataFile.reset();
+				} else if (!shouldBufferUploads) {
+					sendRequestBody(conn, r);
+				}
 			}
 			
 			do {
@@ -1219,6 +1223,26 @@ private:
 		}
 	}
 
+	void sendRequestBody(const FileDescriptor &fd, request_rec *r) {
+		TRACE_POINT();
+		char buf[1024 * 32];
+		apr_off_t len;
+		
+		try {
+			while ((len = readRequestBodyFromApache(r, buf, sizeof(buf))) > 0) {
+				writeExact(fd, buf, len);
+			}
+		} catch (const SystemException &e) {
+			if (e.code() == EPIPE || e.code() == ECONNRESET) {
+				// The HelperAgent stopped reading the body, probably
+				// because the application already sent EOF.
+				return;
+			} else {
+				throw e;
+			}
+		}
+	}
+
 public:
 	Hooks(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
 	    : cstat(1024),

data/ext/apache2/MergeDirConfig.cpp

@@ -130,3 +130,24 @@
 			add->loadShellEnvvars;
 	
 
+	
+		config->bufferUpload =
+			(add->bufferUpload == DirConfig::UNSET) ?
+			base->bufferUpload :
+			add->bufferUpload;
+	
+
+	
+		config->appType =
+			(add->appType == NULL) ?
+			base->appType :
+			add->appType;
+	
+
+	
+		config->startupFile =
+			(add->startupFile == NULL) ?
+			base->startupFile :
+			add->startupFile;
+	
+