passenger 4.0.21 → 4.0.23

data/doc/Users guide Standalone.idmap.txt

@@ -68,31 +68,37 @@
 
 3. Usage	=>	usage-1eyt33o
 
-4. Troubleshooting	=>	troubleshooting-o7g75o
+4. Configuration	=>	configuration-10trfau
 
-4.1. Generic troubleshooting tips	=>	generic-troubleshooting-tips-2vokcr
+4.1. Command line options	=>	command-line-options-1njv6kt
 
-4.2. Upon uploading a file, Phusion Passenger reports "client_body_temp/00000000xx failed (2: No such file or directory)"	=>	upon-uploading-a-file-phusion-passenger-reports-client-body-temp-00000000xx-failed-2-no-such-file-or-directory--d01goe
+4.2. Advanced configuration	=>	advanced-configuration-e3v4pk
 
-5. Appendix: About environment variables	=>	appendix-about-environment-variables-1ct91x3
+5. Troubleshooting	=>	troubleshooting-o7g75o
 
-5.1. Working with environment variables	=>	working-with-environment-variables-11cmwlv
+5.1. Generic troubleshooting tips	=>	generic-troubleshooting-tips-2vokcr
 
-5.2. The PATH environment variable	=>	the-path-environment-variable-yzfn3k
+5.2. Upon uploading a file, Phusion Passenger reports "client_body_temp/00000000xx failed (2: No such file or directory)"	=>	upon-uploading-a-file-phusion-passenger-reports-client-body-temp-00000000xx-failed-2-no-such-file-or-directory--d01goe
 
-5.2.1. Adding Phusion Passenger’s administration tools to PATH	=>	adding-phusion-passenger-s-administration-tools-to-path-d7k5mh
+6. Appendix: About environment variables	=>	appendix-about-environment-variables-1ct91x3
 
-5.3. Making environment variables permanent	=>	making-environment-variables-permanent-mkq46d
+6.1. Working with environment variables	=>	working-with-environment-variables-11cmwlv
 
-5.3.1. bash	=>	bash-hmcscc
+6.2. The PATH environment variable	=>	the-path-environment-variable-yzfn3k
 
-5.3.2. Apache	=>	apache-15y3bm0
+6.2.1. Adding Phusion Passenger’s administration tools to PATH	=>	adding-phusion-passenger-s-administration-tools-to-path-d7k5mh
 
-5.3.3. Nginx	=>	nginx-uarf27
+6.3. Making environment variables permanent	=>	making-environment-variables-permanent-mkq46d
 
-5.3.4. cron	=>	cron-6272ar
+6.3.1. bash	=>	bash-hmcscc
 
-5.3.5. Phusion Passenger-served apps	=>	phusion-passenger-served-apps-127wbl2
+6.3.2. Apache	=>	apache-15y3bm0
 
-5.4. Environment variables and sudo	=>	environment-variables-and-sudo-znzmif
+6.3.3. Nginx	=>	nginx-uarf27
+
+6.3.4. cron	=>	cron-6272ar
+
+6.3.5. Phusion Passenger-served apps	=>	phusion-passenger-served-apps-127wbl2
+
+6.4. Environment variables and sudo	=>	environment-variables-and-sudo-znzmif
 

data/doc/Users guide Standalone.txt

@@ -2,20 +2,13 @@
 
 image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
-Phusion Passenger Standalone is a web server that allows one to run Ruby web applications.
-Here are some of the highlights:
+link:https://www.phusionpassenger.com/[Phusion Passenger] is a web server and application server, designed to be fast, robust and lightweight. It runs your web apps with the least amount of hassle by taking care of almost all administrative heavy lifting for you. Advanced administration tools allow you to gain deep insight into your web applications' operations and to keep your servers healthy. Phusion Passenger is polyglot by design, and currently supports Ruby (Rack), Python (WSGI) and Node.js.
 
-- Unlike Phusion Passenger for Apache and Phusion Passenger for Nginx, Phusion Passenger
-  Standalone does not require an external web server, it is its own and therefore
-  extremely easy to get started.
-- It is powered by an Nginx core. This allows it to serve static files at blazing speeds,
-  makes it secure enough to be directly attached to port 80, and allows it to handle slow
-  clients. You don't need to have Nginx already installed.
-- Automatically spawns and shuts down application processes. One Phusion Passenger
-  Standalone instance can therefore handle multiple simultaneous connections and handles
-  resource management for you. Crashing application processes are automatically restarted.
-- Can listen on a Unix socket, for use in reverse proxy setups.
+In the Standalone mode, Phusion Passenger operates as a fully-featured, secure standalone HTTP server. You do not need to have an existing web server like Apache or Nginx. This mode is ideal...
 
+ * ...if you are not familiar with Apache or Nginx
+ * ...when you want to quickly start up a server without editing configuration files (e.g. during development)
+ * ...or when you want to decouple the web server from the application server, by setting up reverse proxies.
 
 == Support information
 
@@ -36,15 +29,43 @@ Go to your application's root directory, and run:
 passenger start
 ------------------------------
 
-This will start Phusion Passenger on port 3000. If you want to run it on a different port,
-use the `-p` option, e.g.:
+== Configuration
 
-------------------------------
-passenger start -p 8000
-------------------------------
+=== Command line options
+
+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.
+`--environment NAME`::
+	Customizes the value of the `RAILS_ENV`, `RACK_ENV` and `PASSENGER_ENV` environment variable. The default is "development".
+`--max-pool-size NUMBER`::
+	The maximum number of application processes to run. The maximum number that you can run depends on the amount of memory your server has. The article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's concurrency settings] explains how you can infer a good number for this option.
+`--min-instances NUMBER`::
+	If you don't want the number of application processes to scale dynamically, then use this option to set it to a value equal to `--max-pool-size`.
+`--spawn-method NAME`::
+	When set to "smart" (the default), Phusion Passenger preloads your app and utilizes copy-on-write in order to save memory. You can disable this by setting this option to "direct". Preloading is only supported for Ruby apps. For apps written in other languages, it is as if "direct" is always used.
+`--no-friendly-error-pages`::
+	If your app fails to start, Phusion Passenger will tell you by showing a friendly error page in the browser. This option disables it.
 
 See `--help` for all available options.
 
+=== Advanced configuration
+
+Phusion Passenger Standalone is built on the same technology that powers link:Users%20guide%20Nginx.html[Phusion Passenger for Nginx], so any configuration option supported by Phusion Passenger for Nginx can be applied to Standalone as well. You can do this by editing the Standalone configuration template directly.
+
+First, go to the directory where Phusion Passenger is installed:
+
+-------------------------------------
+cd $(passenger-config --root)
+-------------------------------------
+
+Then open the file `resources/templates/standalone/config.erb`.
+
+NOTE: If you installed Phusion Passenger using the Debian or Ubuntu packages, then the filename is `/usr/share/passenger/templates/standalone/config.erb` or `/usr/share/passenger-enterprise/templates/standalone/config.erb`.
+
+Please note that changes to this file only last until you reinstall or upgrade Phusion Passenger. We are currently working on a mechanism for permanently editing the configuration file.
+
 
 [[troubleshooting]]
 == Troubleshooting

data/doc/Users guide.txt

@@ -14,13 +14,13 @@ Phusion Passenger has several integration modes, each mode with its own document
 
 In this mode, Phusion Passenger integrates directly into Nginx as an Nginx module. You operate Phusion Passenger mostly through Nginx and through Nginx configuration files. The Nginx integration mode is, along with the Standalone mode, highly optimized for performance.
 
-link:Users%20Guide%20Nginx.html[**Read the documentation for the Nginx integration mode >>**]
+link:Users%20guide%20Nginx.html[**Read the documentation for the Nginx integration mode >>**]
 
 === Apache integration mode
 
 In this mode, Phusion Passenger integrates directly into Apache as an Apache module. You operate Phusion Passenger mostly through Apache and through Apache configuration files.
 
-link:Users%20Guide%20Apache.html[**Read the documentation for the Apache integration mode >>**]
+link:Users%20guide%20Apache.html[**Read the documentation for the Apache integration mode >>**]
 
 === Standalone mode
 
@@ -32,16 +32,16 @@ In this mode, Phusion Passenger operates as a fully-featured, secure standalone
 
 Along with the Nginx mode, the Standalone mode is highly optimized for performance.
 
-link:Users%20Guide%20Standalone.html[**Read the documentation for the Standalone mode >>**]
+link:Users%20guide%20Standalone.html[**Read the documentation for the Standalone mode >>**]
 
 [[installation]]
 == Installation and upgrade
 
 Please refer to:
 
- * link:Users%20Guide%20Nginx.html#installation[**Nginx** mode installation & upgrade]
- * link:Users%20Guide%20Apache.html#installation[**Apache** mode installation & upgrade]
- * link:Users%20Guide%20Standalone.html#installation[**Standalone** mode installation & upgrade]
+ * link:Users%20guide%20Nginx.html#installation[**Nginx** mode installation & upgrade]
+ * link:Users%20guide%20Apache.html#installation[**Apache** mode installation & upgrade]
+ * link:Users%20guide%20Standalone.html#installation[**Standalone** mode installation & upgrade]
 
 [[support]]
 == Where to get support

data/doc/users_guide_snippets/deployment_basics.txt

@@ -0,0 +1,37 @@
+== Deploying a web application: the basics
+
+=== Anatomy of a web application
+
+==== Ruby
+
+==== Python
+
+===== Django
+
+For Django >= 1.4, `passenger_wsgi.py` should contain the following. Replace "mysite" with your application's actual module name.
+
+--------------------------------------------------------------------
+from mysite.wsgi import application
+--------------------------------------------------------------------
+
+For earlier Django versions, it should contain:
+
+--------------------------------------------------------------------
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+--------------------------------------------------------------------
+
+==== Node.js
+
+=== Attaching to a virtual host's root URI
+
+=== Attaching to a sub-URI
+
+==== How to fix broken images/CSS/JavaScript URIs in sub-URI deployments
+
+=== Restarting the web application
+
+=== Inspecting the status

data/doc/users_guide_snippets/installation.txt

@@ -63,46 +63,59 @@ If you use these packages to install Phusion Passenger then you do not need to r
 
 Packages are available for the x86 and x86_64 architectures. Our policy is to support all Ubuntu LTS releases that are still supported by Canonical, plus the latest non-LTS Ubuntu release, plus all Debian releases that are still supported by Debian.
 
+[[install_add_apt_repo]]
 ==== Adding our APT repository
 
-Packages are signed by "Phusion Automated Software Signing (auto-software-signing@phusion.nl)", fingerprint 1637 8A33 A6EF 1676 2922 526E 561F 9B9C AC40 B2F7. Install our PGP key:
-
+1. Install our PGP key. Packages are signed by "Phusion Automated Software Signing (auto-software-signing@phusion.nl)", fingerprint 1637 8A33 A6EF 1676 2922 526E 561F 9B9C AC40 B2F7.
++
 --------------------------------------------------------------
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
 --------------------------------------------------------------
 
-Our APT repository is stored on an HTTPS server so you may need to add HTTPS support for APT:
-
+2. Add HTTPS support for APT. Our APT repository is stored on an HTTPS server.
++
 --------------------------------------------------------------
 sudo apt-get install apt-transport-https
 --------------------------------------------------------------
 
-Next, create a file `/etc/apt/sources.list.d/passenger.list` and insert one of the following lines, depending on your distribution.
-
-Phusion Passenger open source:
-
+3. Create a file `/etc/apt/sources.list.d/passenger.list` and insert one of the following lines, depending on your distribution.
++
+**Open source**:::
++
+[source,sh]
 --------------------------------------------------------------
-deb https://oss-binaries.phusionpassenger.com/apt/passenger lucid main
-deb https://oss-binaries.phusionpassenger.com/apt/passenger precise main
+# Ubuntu 13.10
 deb https://oss-binaries.phusionpassenger.com/apt/passenger saucy main
-deb https://oss-binaries.phusionpassenger.com/apt/passenger squeeze main
+# Ubuntu 12.04
+deb https://oss-binaries.phusionpassenger.com/apt/passenger precise main
+# Ubuntu 10.04
+deb https://oss-binaries.phusionpassenger.com/apt/passenger lucid main
+# Debian 7
 deb https://oss-binaries.phusionpassenger.com/apt/passenger wheezy main
+# Debian 6
+deb https://oss-binaries.phusionpassenger.com/apt/passenger squeeze main
 --------------------------------------------------------------
-
-Phusion Passenger Enterprise:
-
++
+**Enterprise**:::
++
+[source,sh]
 --------------------------------------------------------------
-deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt lucid main
-deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt precise main
+# Ubuntu 13.10
 deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt saucy main
-deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt squeeze main
+# Ubuntu 12.04
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt precise main
+# Ubuntu 10.04
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt lucid main
+# Debian 7
 deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt wheezy main
+# Debian 6
+deb https://YOUR_ORDER_REFERENCE:YOUR_PASSWORD@www.phusionpassenger.com/enterprise_apt squeeze main
 --------------------------------------------------------------
-
++
 Please replace 'YOUR_ORDER_REFERENCE' and 'YOUR_PASSWORD' with your link:https://www.phusionpassenger.com/orders[Customer Area] login credentials.
 
-After creating `/etc/apt/sources.list.d/passenger.list`, run:
-
+4. Secure `passenger.list` and update your APT cache:
++
 --------------------------------------------------------------
 sudo chown root: /etc/apt/sources.list.d/passenger.list
 sudo chmod 600 /etc/apt/sources.list.d/passenger.list
@@ -113,25 +126,30 @@ sudo apt-get update
 
 **Open source**::
 +
+1. <<install_add_apt_repo,Add our APT repository.>>
 ifdef::nginx[]
-1. Install the packages:
+2. Install the packages:
 +
 --------------------------------------------------------------
 sudo apt-get install nginx-full passenger
 --------------------------------------------------------------
-2. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
-3. Restart Nginx:
+3. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
+4. Restart Nginx:
 +
 --------------------------------------------------------------
 sudo service nginx restart
 --------------------------------------------------------------
 endif::[]
 ifdef::apache[]
+2. Install the package:
++
 --------------------------------------------------------------
 sudo apt-get install libapache2-mod-passenger
 --------------------------------------------------------------
 endif::[]
 ifdef::standalone[]
+2. Install the package:
++
 --------------------------------------------------------------
 sudo apt-get install passenger
 --------------------------------------------------------------
@@ -140,14 +158,15 @@ endif::[]
 **Enterprise**::
 +
 1. Download your license key from the link:https://www.phusionpassenger.com/orders[Customer Area] and save it as `/etc/passenger-enterprise-license`.
-2. Install the packages:
+2. <<install_add_apt_repo,Add our APT repository.>>
+3. Install the packages:
 +
 ifdef::nginx[]
 --------------------------------------------------------------
 sudo apt-get install nginx-full passenger-enterprise
 --------------------------------------------------------------
-3. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
-4. Restart Nginx:
+4. Edit `/etc/nginx/nginx.conf` and uncomment `passenger_root` and `passenger_ruby`.
+5. Restart Nginx:
 +
 --------------------------------------------------------------
 sudo service nginx restart

data/doc/users_guide_snippets/tips.txt

@@ -336,12 +336,12 @@ Applications can use Out-of-Band Work as follows:
 ifdef::apache[]
 <<PassengerMaxPoolSize,PassengerMaxPoolSize>>
 and
-<<PassengerMaxInstances,PassengerMaxInstances>>
+<<PassengerMinInstances,PassengerMinInstances>>
 endif::[]
 ifdef::nginx[]
 <<PassengerMaxPoolSize,passenger_max_pool_size>>
 and
-<<PassengerMaxInstances,passenger_max_instances>>
+<<PassengerMinInstances,passenger_min_instances>>
 endif::[]
 are both larger than 1. Out-of-band work only works if there are at least 2 application processes.
 2. Request out-of-band work by outputting the `X-Passenger-Request-OOB-Work` header during a request. It does not matter what the value is. At this time, it is not possible to request out-of-band work from outside requests.

data/ext/boost/atomic/atomic.hpp

@@ -194,7 +194,7 @@ typedef atomic<std::ptrdiff_t> atomic_ptrdiff_t;
 #if !defined(__PGIC__)
 
 #if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \
-    || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \
+    || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__) && !defined(__GLIBC__)) \
     || defined(__CYGWIN__) \
     || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
     || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)

data/ext/common/ApplicationPool2/AppTypes.h

@@ -110,7 +110,7 @@ private:
 			TRACE_POINT();
 			throw RuntimeException("Not enough buffer space");
 		}
-		return fileExists(StaticString(buf, pos - buf), cstat, throttleRate);
+		return getFileType(StaticString(buf, pos - buf), cstat, throttleRate) != FT_NONEXISTANT;
 	}
 
 public:

data/ext/common/ApplicationPool2/Spawner.h

@@ -89,6 +89,7 @@
 #include <Utils/IOUtils.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/Base64.h>
+#include <Utils/ProcessMetricsCollector.h>
 
 namespace tut {
 	struct ApplicationPool2_DirectSpawnerTest;
@@ -497,6 +498,22 @@ private:
 						SpawnException::APP_STARTUP_PROTOCOL_ERROR,
 						details);
 				}
+			} else if (key == "pid") {
+				// pid: <PID>
+				pid_t pid = atoi(value);
+				ProcessMetricsCollector collector;
+				vector<pid_t> pids;
+
+				pids.push_back(pid);
+				ProcessMetricMap result = collector.collect(pids);
+				if (result[pid].uid != details.preparation->uid) {
+					throwAppSpawnException("An error occurred while starting the "
+						"web application. The PID that the loader has returned does "
+						"not have the same UID as the loader itself.",
+						SpawnException::APP_STARTUP_PROTOCOL_ERROR,
+						details);
+				}
+				details.pid = pid;
 			} else {
 				throwAppSpawnException("An error occurred while starting the "
 					"web application. It sent an unknown startup response line "

data/ext/common/Constants.h

@@ -78,7 +78,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.21"
+	#define PASSENGER_VERSION "4.0.23"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Utils/Dechunker.h

@@ -27,7 +27,8 @@ using namespace std;
  */
 class Dechunker {
 public:
-	typedef void (*Callback)(const char *data, size_t size, void *userData);
+	typedef void (*DataCallback)(const char *data, size_t size, void *userData);
+	typedef void (*Callback)(void *userData);
 	
 private:
 	static const char CR = '\x0D';
@@ -71,13 +72,21 @@ private:
 			onData(data, size, userData);
 		}
 	}
+
+	void emitEndEvent() const {
+		if (onEnd != NULL) {
+			onEnd(userData);
+		}
+	}
 	
 public:
-	Callback onData;
+	DataCallback onData;
+	Callback onEnd;
 	void *userData;
 	
 	Dechunker() {
 		onData = NULL;
+		onEnd = NULL;
 		userData = NULL;
 		reset();
 	}
@@ -198,6 +207,7 @@ public:
 			
 			case EXPECTING_FINAL_LF:
 				if (*current == LF) {
+					emitEndEvent();
 					state = DONE;
 					current++;
 				} else {