passenger 4.0.24 → 4.0.25

data/doc/users_guide_snippets/installation.txt

@@ -124,6 +124,10 @@ sudo apt-get update
 
 ==== Installing packages
 
+ifdef::nginx[]
+NOTE: You should install `nginx-extras` even if you have already installed an Nginx package from the official Debian/Ubuntu repository. This is because the Nginx binary that our packages supply is compiled with the Passenger module.
+endif::nginx[]
+
 **Open source**::
 +
 1. <<install_add_apt_repo,Add our APT repository.>>
@@ -131,8 +135,9 @@ ifdef::nginx[]
 2. Install the packages:
 +
 --------------------------------------------------------------
-sudo apt-get install nginx-full passenger
+sudo apt-get install nginx-extras passenger
 --------------------------------------------------------------
++
 3. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
 4. Restart Nginx:
 +
@@ -163,7 +168,7 @@ endif::[]
 +
 ifdef::nginx[]
 --------------------------------------------------------------
-sudo apt-get install nginx-full passenger-enterprise
+sudo apt-get install nginx-extras passenger-enterprise
 --------------------------------------------------------------
 4. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
 5. Restart Nginx:
@@ -721,21 +726,13 @@ endif::[]
 ifdef::nginx[]
 === Installing as a normal Nginx module without using the installer
 
-You can also install Phusion Passenger the way you install any other Nginx module, e.g. with `--add-module`. Run Nginx's configure script with `--add-module=/path-to-passenger-root/ext/nginx`.
+You can also install Phusion Passenger the way you install any other Nginx module, e.g. with `--add-module`. This installation mode is useful if you already have an Nginx tarball somewhere, or if you're using link:http://nginx.com/products/[Nginx Plus].
 
-If you installed Phusion Passenger via the gem, then 'path-to-passenger-root' can be obtained with the command:
-
---------------------------
-passenger-config --root
---------------------------
+You need to run Nginx's configure script with `--add-module=/path-to-passenger-nginx-addon-dir`. The right value for `/path-to-passenger-nginx-addon-dir` can be obtained with the command:
 
-This will probably output something along the lines of '/usr/lib/ruby/gems/1.8/gems/passenger-x.x.x',
-so you'll probably have to specify something like `--add-module=/usr/lib/ruby/gems/1.8/gems/passenger-x.x.x/ext/nginx`.
-
-If you installed Phusion Passenger via a source tarball, then 'path-to-passenger-root'
-is the directory which contains the Phusion Passenger source code. So if you
-extracted the Phusion Passenger source code to '/opt/passenger-x.x.x', then you'll
-have to specify `--add-module=/opt/passenger-x.x.x/ext/nginx`.
+-------------------------------------
+passenger-config --nginx-addon-dir
+-------------------------------------
 
 After having installed Nginx with Phusion Passenger support, you must paste the following
 line into your Nginx configuration file:
@@ -744,7 +741,13 @@ line into your Nginx configuration file:
 passenger_root /path-to-passenger-root;
 ------------------------------------------
 
-After having done so, restart Nginx.
+The right value for `/path-to-passenger-root` can be obtained by running the following command:
+
+-------------------------------------
+passenger-config --root
+-------------------------------------
+
+After having modified the Nginx configuration file, restart Nginx.
 
 [[nginx_init_script]]
 === Creating an Nginx init script

data/ext/common/AgentsStarter.h

@@ -389,6 +389,7 @@ public:
 		params
 			.set    ("web_server_type", type == AS_APACHE ? "apache" : "nginx")
 			.setPid ("web_server_pid",  getpid())
+			.set    ("web_server_passenger_version", PASSENGER_VERSION)
 			.set    ("passenger_root",  passengerRoot)
 			.setInt ("log_level",       getLogLevel())
 			.set    ("temp_dir",        getSystemTempDir());
@@ -404,17 +405,6 @@ public:
 		// .set    ("default_ruby",    defaultRubyCommand)
 		// .setInt ("max_pool_size",   maxPoolSize)
 		// .setInt ("max_instances_per_app",     maxInstancesPerApp)
-		/*
-			.setInt ("pool_idle_time",            poolIdleTime)
-			.set    ("analytics_server",          analyticsServer)
-			.set    ("analytics_log_user",        analyticsLogUser)
-			.set    ("analytics_log_group",       analyticsLogGroup)
-			.set    ("union_station_gateway_address",  unionStationGatewayAddress)
-			.setInt ("union_station_gateway_port", unionStationGatewayPort)
-			.set    ("union_station_gateway_cert", realUnionStationGatewayCert)
-			.set    ("union_station_proxy_address", unionStationProxyAddress)
-			.set    ("prestart_urls",   serializePrestartURLs(prestartURLs));
-		*/
 		
 		fds = createUnixSocketPair();
 		pid = syscalls::fork();

data/ext/common/ApplicationPool2/AppTypes.cpp

@@ -92,3 +92,8 @@ const char *
 pp_get_app_type_name(PassengerAppType type) {
 	return getAppTypeName(type);
 }
+
+PassengerAppType
+pp_get_app_type2(const char *name, unsigned int len) {
+	return getAppType(StaticString(name, len));
+}

data/ext/common/ApplicationPool2/AppTypes.h

@@ -61,6 +61,7 @@ PassengerAppType pp_app_type_detector_check_app_root(PP_AppTypeDetector *detecto
 	const char *appRoot, unsigned int len, PP_Error *error);
 
 const char *pp_get_app_type_name(PassengerAppType type);
+PassengerAppType pp_get_app_type2(const char *name, unsigned int len);
 
 #ifdef __cplusplus
 }

data/ext/common/ApplicationPool2/Options.h

@@ -603,11 +603,15 @@ public:
 	}
 	
 	StaticString getStartupFile() const {
-		const char *result = getAppTypeStartupFile(getAppType(appType));
-		if (result == NULL) {
-			return startupFile;
+		if (startupFile.empty()) {
+			const char *result = getAppTypeStartupFile(getAppType(appType));
+			if (result == NULL) {
+				return "";
+			} else {
+				return result;
+			}
 		} else {
-			return result;
+			return startupFile;
 		}
 	}
 	

data/ext/common/ApplicationPool2/Spawner.h

@@ -1004,6 +1004,7 @@ protected:
 		appendNullTerminatedKeyValue(result, "RAILS_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "RACK_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "WSGI_ENV", options.environment);
+		appendNullTerminatedKeyValue(result, "NODE_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "PASSENGER_ENV", options.environment);
 		if (!options.baseURI.empty() && options.baseURI != "/") {
 			appendNullTerminatedKeyValue(result,

data/ext/common/Constants.h

@@ -80,7 +80,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.24"
+	#define PASSENGER_VERSION "4.0.25"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -90,7 +90,7 @@
 
 	#define PROGRAM_NAME "Phusion Passenger"
 
-	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 2
+	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 3
 
 	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0
 

data/ext/common/ServerInstanceDir.h

@@ -110,6 +110,11 @@ public:
 				toString(SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION),
 				S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 			
+			string passengerVersionFile = path + "/passenger_version.txt";
+			createFile(passengerVersionFile,
+				PASSENGER_VERSION "\n",
+				S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+			
 			
 			/* We want the upload buffer directory to be only writable by the web
 			 * server's worker processs. Other users may not have any access to this
@@ -122,17 +127,17 @@ public:
 				makeDirTree(path + "/buffered_uploads", "u=rwx,g=,o=");
 			}
 			
-			/* The web server must be able to directly connect to a backend. */
+			/* The HelperAgent must be able to connect to an application. */
 			if (runningAsRoot) {
 				if (userSwitching) {
-					/* Each backend process may be running as a different user,
+					/* Each application process may be running as a different user,
 					 * so the backends subdirectory must be world-writable.
 					 * However we don't want everybody to be able to know the
 					 * sockets' filenames, so the directory is not readable.
 					 */
 					makeDirTree(path + "/backends", "u=rwx,g=wx,o=wx,+t");
 				} else {
-					/* All backend processes are running as defaultUser/defaultGroup,
+					/* All application processes are running as defaultUser/defaultGroup,
 					 * so make defaultUser/defaultGroup the owner and group of the
 					 * subdirecory.
 					 *
@@ -143,32 +148,12 @@ public:
 					makeDirTree(path + "/backends", "u=rwx,g=x,o=x", defaultUid, defaultGid);
 				}
 			} else {
-				/* All backend processes are running as the same user as the web server,
+				/* All application processes are running as the same user as the web server,
 				 * so only allow access for this user.
 				 */
 				makeDirTree(path + "/backends", "u=rwx,g=,o=");
 			}
 			
-			/* The helper server (containing the application pool) must be able to access
-			 * the spawn server's socket.
-			 */
-			if (runningAsRoot) {
-				if (userSwitching) {
-					/* Both the helper server and the spawn server are
-					 * running as root.
-					 */
-					makeDirTree(path + "/spawn-server", "u=rwx,g=,o=");
-				} else {
-					/* Both the helper server and the spawn server are
-					 * running as defaultUser/defaultGroup.
-					 */
-					makeDirTree(path + "/spawn-server", "u=rwx,g=,o=",
-						defaultUid, defaultGid);
-				}
-			} else {
-				makeDirTree(path + "/spawn-server", "u=rwx,g=,o=");
-			}
-			
 			owner = true;
 		}
 	

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1730,6 +1730,7 @@ private:
 		fillPoolOption(client, options.maxRequestQueueSize, "PASSENGER_MAX_REQUEST_QUEUE_SIZE");
 		fillPoolOption(client, options.statThrottleRate, "PASSENGER_STAT_THROTTLE_RATE");
 		fillPoolOption(client, options.restartDir, "PASSENGER_RESTART_DIR");
+		fillPoolOption(client, options.startupFile, "PASSENGER_STARTUP_FILE");
 		fillPoolOption(client, options.loadShellEnvvars, "PASSENGER_LOAD_SHELL_ENVVARS");
 		fillPoolOption(client, options.debugger, "PASSENGER_DEBUGGER");
 		fillPoolOption(client, options.raiseInternalError, "PASSENGER_RAISE_INTERNAL_ERROR");

data/ext/nginx/CacheLocationConfig.c

@@ -221,6 +221,20 @@ u_char int_buf[32], *end, *buf, *pos;
 		}
 	
 
+	
+		if (conf->restart_dir.data != NULL) {
+			len += 22;
+			len += conf->restart_dir.len + 1;
+		}
+	
+
+	
+		if (conf->startup_file.data != NULL) {
+			len += 23;
+			len += conf->startup_file.len + 1;
+		}
+	
+
 
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
@@ -536,6 +550,32 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 		}
 	
 
+	
+		if (conf->restart_dir.data != NULL) {
+			pos = ngx_copy(pos,
+				"PASSENGER_RESTART_DIR",
+				22);
+			pos = ngx_copy(pos,
+				conf->restart_dir.data,
+				conf->restart_dir.len);
+			*pos = '\0';
+			pos++;
+		}
+	
+
+	
+		if (conf->startup_file.data != NULL) {
+			pos = ngx_copy(pos,
+				"PASSENGER_STARTUP_FILE",
+				23);
+			pos = ngx_copy(pos,
+				conf->startup_file.data,
+				conf->startup_file.len);
+			*pos = '\0';
+			pos++;
+		}
+	
+
 
 conf->options_cache.data = buf;
 conf->options_cache.len = pos - buf;

data/ext/nginx/ConfigurationCommands.c

@@ -379,6 +379,36 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_restart_dir"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, restart_dir),
+	NULL
+},
+
+{
+	
+	ngx_string("passenger_app_type"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, app_type),
+	NULL
+},
+
+{
+	
+	ngx_string("passenger_startup_file"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, startup_file),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_fly_with"),

data/ext/nginx/ConfigurationFields.h

@@ -75,6 +75,8 @@
 
 	ngx_str_t app_root;
 
+	ngx_str_t app_type;
+
 	ngx_str_t environment;
 
 	ngx_str_t group;
@@ -83,10 +85,14 @@
 
 	ngx_str_t python;
 
+	ngx_str_t restart_dir;
+
 	ngx_str_t ruby;
 
 	ngx_str_t spawn_method;
 
+	ngx_str_t startup_file;
+
 	ngx_str_t union_station_key;
 
 	ngx_str_t user;

data/ext/nginx/ContentHandler.c

@@ -1304,40 +1304,48 @@ passenger_content_handler(ngx_http_request_t *r)
         return passenger_static_content_handler(r, &page_cache_file);
     }
     
-    pp_error_init(&error);
-    if (slcf->app_root.data == NULL) {
-        context->app_type = pp_app_type_detector_check_document_root(
-            pp_app_type_detector,
-            (const char *) context->public_dir.data, context->public_dir.len,
-            context->base_uri.len != 0,
-            &error);
-    } else {
-        context->app_type = pp_app_type_detector_check_app_root(
-            pp_app_type_detector,
-            (const char *) slcf->app_root.data, slcf->app_root.len,
-            &error);
-    }
-    if (context->app_type == PAT_NONE) {
-        return NGX_DECLINED;
-    } else if (context->app_type == PAT_ERROR) {
-        if (error.errnoCode == EACCES) {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                          "%s; This error means that the Nginx worker process (PID %d, "
-                          "running as UID %d) does not have permission to access this file. "
-                          "Please read the manual to learn how to fix this problem: "
-                          "section 'Troubleshooting' -> 'Upon accessing the web app, Nginx "
-                          "reports a \"Permission denied\" error'; Extra info",
-                          error.message,
-                          (int) getpid(),
-                          (int) getuid());
+    if (slcf->app_type.data == NULL) {
+        pp_error_init(&error);
+        if (slcf->app_root.data == NULL) {
+            context->app_type = pp_app_type_detector_check_document_root(
+                pp_app_type_detector,
+                (const char *) context->public_dir.data, context->public_dir.len,
+                context->base_uri.len != 0,
+                &error);
         } else {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log,
-                          (error.errnoCode == PP_NO_ERRNO) ? 0 : error.errnoCode,
-                          "%s",
-                          error.message);
+            context->app_type = pp_app_type_detector_check_app_root(
+                pp_app_type_detector,
+                (const char *) slcf->app_root.data, slcf->app_root.len,
+                &error);
+        }
+        if (context->app_type == PAT_NONE) {
+            return NGX_DECLINED;
+        } else if (context->app_type == PAT_ERROR) {
+            if (error.errnoCode == EACCES) {
+                ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                              "%s; This error means that the Nginx worker process (PID %d, "
+                              "running as UID %d) does not have permission to access this file. "
+                              "Please read the manual to learn how to fix this problem: "
+                              "section 'Troubleshooting' -> 'Upon accessing the web app, Nginx "
+                              "reports a \"Permission denied\" error'; Extra info",
+                              error.message,
+                              (int) getpid(),
+                              (int) getuid());
+            } else {
+                ngx_log_error(NGX_LOG_ALERT, r->connection->log,
+                              (error.errnoCode == PP_NO_ERRNO) ? 0 : error.errnoCode,
+                              "%s",
+                              error.message);
+            }
+            pp_error_destroy(&error);
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+    } else {
+        context->app_type = pp_get_app_type2((const char *) slcf->app_type.data,
+            slcf->app_type.len);
+        if (context->app_type == PAT_NONE) {
+            return NGX_DECLINED;
         }
-        pp_error_destroy(&error);
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
     
     

data/ext/nginx/CreateLocationConfig.c

@@ -154,3 +154,18 @@
 		conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
 	
 
+	
+		conf->restart_dir.data = NULL;
+		conf->restart_dir.len  = 0;
+	
+
+	
+		conf->app_type.data = NULL;
+		conf->app_type.len  = 0;
+	
+
+	
+		conf->startup_file.data = NULL;
+		conf->startup_file.len  = 0;
+	
+