passenger 4.0.35 → 4.0.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWQ4OWUxZjYyYTdhMGRhMDY1OTJlOTU3ZThjZjEyMGVkYWRiNjZhYQ==
+    YTQyM2E1ZmM5N2JlM2VlZjY5ZjUwZWUyZTU5NWFlZDZlZWE3NGU0Yg==
   data.tar.gz: !binary |-
-    NWEwZDc1YjViMmFjZDY5ZWQxMjFiNmI5YjlkODA5YjI5ZWEyMTBlZg==
+    YWZiMzg5YmI0MDEyOTRhZDBmZTg1ODNjZGRlMjk2MTFjNDgxNWI2Ng==
 SHA512:
   metadata.gz: !binary |-
-    Y2UxNWZhOWQ1YzExMTg2NTk2ZmJkZTAwOTVmNmM2ZDZlZmEwZmMxZGY5ZjU4
-    NjU0ZTRlY2Y5NjI5OTZlYzczYTgwN2Q3NzNjMGI0YzNjYjk2N2E4MzBmYjVl
-    NjliZmNjMjg5NWE2ZDJlZmMwZGMzNGJkY2NmYjA1YTE3NzEyM2E=
+    NDYyNjlkYTdlMjY0ZmM0ODYyODk3NmQ5NjdlZjhiMGE0NjgwMTk2ZTAzNTg1
+    ZjRkNWEwNmM5M2Y2YzBhZTFkZTllNGVkZWI4YjVlYTU3MGIyNGU3NTEyYmJi
+    ZjllODk5M2Q0ZjVjOGY4OGQxYzE2NGIzNTEyNmUzZWYzZGIzM2Q=
   data.tar.gz: !binary |-
-    NDIyOGU5NWIzY2MzMjdjMmMxODIzZDIxZDJmMzY3MDIzMjBjZTE5YjY0Njk1
-    ODg3NDRjNzdjYjdlODg1MWIyNWU2ZWMwZWQzOTJkZDNjYmRkOGQyMGEzZWY4
-    NzEzYTA0ZmI1YjA0Yzc0ZjIxMTlmOTYwN2I3ODdlNGY0NjBkYWI=
+    NTkwMTZmMzIzNWM1YTk3NTA1NTMzYmZjNGZmNjc5ZmY0MTQ2NGNiZmQxYTI2
+    MGFlNjMzZGE0YTE5NWQxNjhlYjA0NmY2NzQzNDc0NTU3ZTVmOTk0OGFmNDdl
+    YWU1MTc0Y2UxZTkxMjMyY2UxMjFlMTdjZmQ2OTg0OTEyM2Y3NzQ=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJS1wPuAAoJECrHRaUKISqMTuEIAJYnjl9V/ptBh62PSRV2tQrI
-4dLT84PC8qTGvsaubJTpPb22NVW4STTLP4yMZUIwpGDTO/5dY+2Qx8+EahgBWYHu
-8mur0fO+oNFtp9fqfSmDtJ9kpUt0YSKPXz3D87TTAzxzDqAZ8AqdYqpFwxdUFe4+
-7m/XE/wRt6ePVpyWJxx62OXx2ai97spge5Etc9M3UjEjVYbTnM7s2VuSgvSGlGMT
-2vcbcNEQOR+Q4BVox9cMn2m3IMEAiG9Mwt67sLtFpMYEopeXUMJmDLTf2iI0jIbM
-PTdo+5vVzDuIltFktw+jj2wYJVfIGt+7fU2TAfJ7xsOvPveF0ND/yENBjeSVsb0=
-=UV5j
+iQEcBAABAgAGBQJS4syLAAoJECrHRaUKISqMsVsIAIfwEwJO7MHIz8Q1ct4QuKHC
+Ll99P56zwQ/trV4PyAEDC1NB9cpbf85vzA+45hlFx6iMqN9oLA33eQVoVvKtI3qG
+lBtC4SIdWRvQZBoBhTgDjmzDzGGc3UHtc9siAaxty7a2vkGZBqKXpX/okS6DYAV0
+TfoH8ImWg/2qBVFffKLv2ApRcMcjXdh+C0rGtLOTzU4AiTrIlFytQkDBZuMtsZOp
+B2jHoLhyzzZ1ZHkUpxMDA2S9jiLbzh+MQ93/kNe1eDa6WH7Gz1Z9GXGNSwo1behJ
+b9gp40pdnIxFFuPphiRevfrcCEprGi7a2s5q3sdYF7UVNRQBbuyauXUSI4K3a24=
+=zcR9
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJS1wPuAAoJECrHRaUKISqM5AEH/3NLWyUD1WfjnUVpOTKrjcp5
-5UlYlZhB/EGxDofoYGqbDeVRfl15FG8ftTxCPfE3Vj+Qlk5+84ByNP2O5aNjf4ao
-qAvZrTzeESOgOp+YMT7fLcMDlcdgoZsZDvkI+Y5fs1L7byP0s2ntvE/zgx4sYra+
-Lw85BdkrRnvPdOVUbLy47r4mBAEGKKVl4mZam6X0lypQ/V4CwVxqix+cM4OeKt6H
-068RI/Iu+fPXGj2r1yQrpuiZFl+n1XyEHx2e5bc4kwopvpE6cBUm6OacMSLFp5rE
-E7+cGkTfWBqd8iNTekl+Jyo+I6DGMCpG/ja8p2LJ4Gq73nNO0JhJ6p2A1oZIkak=
-=6chT
+iQEcBAABAgAGBQJS4syKAAoJECrHRaUKISqM92QH/2/DJsZccgKyRyhPpBF8Bl41
+zhKzJTnxddS7Q/qd5N+NL1Xqp3+P0crS8CHHV+QNjZh6jXWBBGe+1Ftcp3TZGxpw
+EYFzDkX8bIQQ83RxwCYah2Vj/uGuy7XKlDk0kEMSNeLlVOmBWR1yi78DomFJzcXc
+wPsvwRr8ZYr3++2o61LeReEhPjNSMb+tlzb3sIDrKsAMx9B0012RGFc8t9bb2Qny
+9bTmJSKj8cwCBmyFvvM+Dh6wfse3wCHT6/rH0n7K40l85NNftidwUI0zhYUC3/8H
+Y7TcFqFBq5NzNrYlMcsyzsteePOd5HW7c6NSiGIuu6zFfLGEETWP5W5fdsps6ok=
+=4drC
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,22 @@
+Release 4.0.36
+--------------
+
+ * [Enterprise] Fixed some Mass Deployment bugs.
+ * [Enterprise] Fixed a bug that causes an application group to be put into
+   Deployment Error Resistance Mode if rolling restarting fails while
+   deployment error resistance is off. Deployment Error Resistance Mode is
+   now only activated if it's explicitly turned on.
+ * Passenger Standalone now gzips JSON responses.
+ * Fixed some cases in which Passenger Standalone does not to properly cleanup
+   its temporary files.
+
+
+Release 4.0.35
+--------------
+
+ * Fixed some unit tests.
+
+
 Release 4.0.34
 --------------
 

data/build/packaging.rb

@@ -136,11 +136,13 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 		abort "*** ERROR: Please 'brew install hub' first"
 	end
 
-	if boolean_option('HOMEBREW_UPDATE', true)
-		puts "Updating Homebrew formula..."
-		Rake::Task['package:update_homebrew'].invoke
-	else
-		puts "HOMEBREW_UPDATE set to false, not updating Homebrew formula."
+	if is_open_source?
+		if boolean_option('HOMEBREW_UPDATE', true)
+			puts "Updating Homebrew formula..."
+			Rake::Task['package:update_homebrew'].invoke
+		else
+			puts "HOMEBREW_UPDATE set to false, not updating Homebrew formula."
+		end
 	end
 
 	sh "git tag -s #{git_tag} -u 0A212A8C -m 'Release #{version}'"
@@ -178,11 +180,13 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 			puts "Building OS X binaries..."
 			Rake::Task['package:build_osx_binaries'].invoke
 
-			if boolean_option('HOMEBREW_DRY_RUN', false)
-				echo "HOMEBREW_DRY_RUN set, not submitting pull request. Please find the repo in /tmp/homebrew."
-			else
-				echo "Submitting Homebrew pull request..."
-				sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
+			if boolean_option('HOMEBREW_UPDATE', true)
+				if boolean_option('HOMEBREW_DRY_RUN', false)
+					puts "HOMEBREW_DRY_RUN set, not submitting pull request. Please find the repo in /tmp/homebrew."
+				else
+					puts "Submitting Homebrew pull request..."
+					sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
+				end
 			end
 
 			puts "--------------"
@@ -208,7 +212,8 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 
 			puts "Initiating building of binaries"
 			command = "cd /srv/passenger_autobuilder/app && " +
-				"/tools/silence-unless-failed chpst -l /tmp/passenger_autobuilder.lock " +
+				"/tools/silence-unless-failed -f /tmp/passenger_autobuilder.log " +
+				"chpst -l /var/cache/passenger_ci/lock " +
 				"./autobuild-with-pbuilder #{enterprise_git_url} passenger-enterprise --tag=#{git_tag}"
 			sh "ssh psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
 

data/doc/Users guide Apache.txt

@@ -822,7 +822,12 @@ Rolling restarts have a few caveat however that you should be aware of:
   been restarted. It is for this reason that you should not use rolling
   restarts in development, only in production.
 
-Please note that this option is completely unrelated to the `passenger-config restart` command. That command always initiates a blocking restart, unless `--rolling-restart` is given.
+If Passenger Enterprise could not rolling restart a process (let's call it 'A') because it is unable to spawn a new process (let's call it 'B'), then Passenger Enterprise will give up trying to rolling restart that particular process 'A'. What happens next depends on whether <<PassengerResistDeploymentErrors,deployment error resistance>> is enabled:
+
+- If deployment error resistance is disabled (the default), then Passenger Enterprise will proceed with trying to restart the remaining processes.
+- If deployment error resistance is enabled, the Passenger Enterprise will give up rolling restarting immediately. The application group will be put into Deployment Error Resistance Mode.
+
+Please note that `PassengerRollingRestarts` is completely unrelated to the `passenger-config restart-app` command. That command always initiates a blocking restart, unless `--rolling-restart` is given.
 
 This option may occur in the following places:
 
@@ -833,6 +838,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+[[PassengerResistDeploymentErrors]]
 ==== PassengerResistDeploymentErrors <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
@@ -845,7 +851,7 @@ By enabling deployment error resistance, Phusion Passenger Enterprise would inst
 
 - It passes the request to one of the existing application processes (that belong to the previous version of the application). The visitor will not see a Phusion Passenger process spawning error message.
 - It logs the error to the global web server error log file.
-- It sets an internal flag so that no processes for this application will be spawned (even when the current traffic would normally result in more processes being spawned) and no processes will be idle cleaned. Processes *could* still be shutdown because of other events, e.g. because their <<PassengerMemoryLimit,memory limit>> have been reached.
+- It sets an internal flag (Deployment Error Resistance Mode) so that no processes for this application will be spawned (even when the current traffic would normally result in more processes being spawned) and no processes will be idle cleaned. Processes *could* still be shutdown because of other events, e.g. because their <<PassengerMemoryLimit,memory limit>> have been reached. You can see whether the flag is set by invoking `passenger-status`. If you see the message "Resisting deployment error" then the flag is set.
 
 This way, visitors will suffer minimally from deployment errors. Phusion Passenger will attempt to restart the application again next time restart.txt is touched.
 

data/doc/Users guide Nginx.txt

@@ -823,7 +823,12 @@ Rolling restarts have a few caveat however that you should be aware of:
   been restarted. It is for this reason that you should not use rolling
   restarts in development, only in production.
 
-Please note that this option is completely unrelated to the `passenger-config restart` command. That command always initiates a blocking restart, unless `--rolling-restart` is given.
+If Passenger Enterprise could not rolling restart a process (let's call it 'A') because it is unable to spawn a new process (let's call it 'B'), then Passenger Enterprise will give up trying to rolling restart that particular process 'A'. What happens next depends on whether <<PassengerResistDeploymentErrors,deployment error resistance>> is enabled:
+
+- If deployment error resistance is disabled (the default), then Passenger Enterprise will proceed with trying to restart the remaining processes.
+- If deployment error resistance is enabled, the Passenger Enterprise will give up rolling restarting immediately. The application group will be put into Deployment Error Resistance Mode.
+
+Please note that `passenger_rolling_restarts` is completely unrelated to the `passenger-config restart-app` command. That command always initiates a blocking restart, unless `--rolling-restart` is given.
 
 This option may occur in the following places:
 
@@ -834,6 +839,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+[[PassengerResistDeploymentErrors]]
 ==== passenger_resist_deployment_errors <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
@@ -846,7 +852,7 @@ By enabling deployment error resistance, Phusion Passenger Enterprise would inst
 
 - It passes the request to one of the existing application processes (that belong to the previous version of the application). The visitor will not see a Phusion Passenger process spawning error message.
 - It logs the error to the global web server error log file.
-- It sets an internal flag so that no processes for this application will be spawned (even when the current traffic would normally result in more processes being spawned) and no processes will be idle cleaned. Processes *could* still be shutdown because of other events, e.g. because their <<PassengerMemoryLimit,memory limit>> have been reached.
+- It sets an internal flag so that no processes for this application will be spawned (even when the current traffic would normally result in more processes being spawned) and no processes will be idle cleaned. Processes *could* still be shutdown because of other events, e.g. because their <<PassengerMemoryLimit,memory limit>> have been reached. You can see whether the flag is set by invoking `passenger-status`. If you see the message "Resisting deployment error" then the flag is set.
 
 This way, visitors will suffer minimally from deployment errors. Phusion Passenger will attempt to restart the application again next time restart.txt is touched.
 

data/doc/Users guide Standalone.idmap.txt

@@ -80,6 +80,10 @@
 
 5.1. Starting Passenger Standalone at system boot	=>	starting-passenger-standalone-at-system-boot-jpem2b
 
+5.2. Sharing the same port between multiple Passenger Standalone instances	=>	sharing-the-same-port-between-multiple-passenger-standalone-instances-3lcmc5
+
+5.3. Installing Passenger Standalone behind Nginx	=>	installing-passenger-standalone-behind-nginx-1xylsfk
+
 6. Mass deployment	=>	mass-deployment-1xqriy4
 
 7. Troubleshooting	=>	troubleshooting-o7g75o

data/doc/Users guide Standalone.txt

@@ -144,6 +144,192 @@ cd /path-to-your-webapp
 passenger start --daemonize --port 80 --user someusername
 ------------------------------------------
 
+To stop Passenger Standalone, run:
+
+[source,sh]
+------------------------------------------
+cd /path-to-your-webapp
+
+# If you use RVM, use 'rvmsudo' instead of 'sudo'
+sudo passenger stop
+------------------------------------------
+
+
+[[sharing_port]]
+=== Sharing the same port between multiple Passenger Standalone instances
+
+If you have multiple applications on your server then it is desirable to have all of them listen on the same port (e.g. port 80), with the HTTP request's host name determining which Passenger Standalone instance should handle the request. There are three ways to achieve this.
+
+ 1. The first way is to use the <<mass_deployment,Mass deployment>> feature, which allows Passenger Standalone to directly host multiple applications at the same time. Please refer to that section to learn more.
+ 2. The second way is to run multiple Passenger Standalone instances -- one for each application -- and to put all of them behind a *reverse proxy* or *load balancer*. The reverse proxy/load balancer can for example be Nginx, Apache or HAProxy. The reverse proxy/load balancer listens on port 80, determines which Passenger Standalone instance should handle the request, and forwards the request to that instance.
+ 3. The third way is to use link:Users%20guide%20Nginx.html[Phusion Passenger for Nginx] or link:Users%20guide%20Apache.html[Phusion Passenger for Apache]. These are two modes of Phusion Passenger that are distinct from the Standalone mode, which this document describes. In the Nginx and Apache modes, Phusion Passenger integrates directly into Nginx and Apache, and makes it very easy to host multiple applications directly on Nginx or Apache.
++
+Compared method 2 -- putting Passenger Standalone behind a reverse proxy or load balancer -- the Nginx or Apache modes are easier to use and require less configuration. On the other hand, the Nginx modes requires reinstalling or recompiling Nginx, while the Apache mode requires that the Phusion Passenger Apache module is installed.
+
+**The rest of this subsection describes method 2.**
+
+[float]
+==== Step 1: starting all applications
+
+Putting Passenger Standalone behind a reverse proxy requires three steps. First, you must start all Passenger Standalone instances that you want. Each one must be listening on a different port, because two applications can't listen on the same port. Suppose that you have two applications, `/webapps/foo` and `/webapps/bar`. Here's how you may start them:
+
+[source,sh]
+------------------------------
+# Start foo on port 4000
+cd /webapps/foo
+passenger start --daemonize --address 127.0.0.1 --port 4000
+
+# Start bar on port 4010
+cd /webapps/bar
+passenger start --daemonize --address 127.0.0.1 --port 4010
+------------------------------
+
+Notice the fact that we pass `--address 127.0.0.1`, which tells Passenger Standalone to only listen for requests that originate from the local machine. This is because the reverse proxy/load balancer, not Passenger Standalone, is supposed to be responsible for receiving external HTTP requests. The reverse proxy/load balancer will be running on the same machine only, so limiting Passenger Standalone in this manner improves security.
+
+[float]
+==== Step 2: install and configure the reverse proxy/load balancer
+
+The next step is to **install a reverse proxy/load balancer**, and to **configure** it to do the following:
+
+ * To listen on port 80.
+ * To forward requests to either 'foo' or 'bar', depending on the request's HTTP host name.
+
+You can use any reverse proxy/load balancer you want, but we're going to show an example using link:http://www.nginx.org/[Nginx] because it's a pretty popular choice. Install Nginx as follows:
+
+|======================================================================
+| Debian, Ubuntu | `sudo apt-get update` +
+`sudo apt-get install nginx-extras`
+| Red Hat, CentOS, ScientificLinux, Amazon Linux | Enable link:http://fedoraproject.org/wiki/EPEL[EPEL], then run as root: +
+`yum install nginx`
+| Mac OS X (Homebrew) | `brew install nginx`
+| Other operating systems | Install Nginx from link:http://www.nginx.org/[the Nginx website].
+|======================================================================
+
+Open the Nginx configuration file:
+
+|======================================================================
+| Debian, Ubuntu | `/etc/nginx/nginx.conf`
+| Red Hat, CentOS, ScientificLinux, Amazon Linux | `/etc/nginx/nginx.conf`
+| Mac OS X (Homebrew) | `/usr/local/etc/nginx/nginx.conf`
+| Other operating systems | It depends on how you installed Nginx, but it's usually `$PREFIX/conf/nginx.conf`, where `$PREFIX` is the prefix you installed Nginx to.
+|======================================================================
+
+Add virtual host entries for your applications foo and bar. While making the virtual host entries, you must determine what host names foo and bar should respond to. Let's say that foo should respond to 'www.foo.com' and bar should respond to 'www.bar.com'. Then the following entries will tell Nginx to listen on port 80, and to handle requests for the domains 'www.foo.com' and 'www.bar.com' differently.
+
+--------------------------
+http {
+    ...
+
+    # These are some "magic" Nginx configuration options that aid in making
+    # WebSockets work properly with Passenger Standalone. Please learn more
+    # at http://nginx.org/en/docs/http/websocket.html
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    server {
+        listen 80;
+        server_name www.foo.com;
+
+        # Tells Nginx to serve static assets from this directory.
+        root /webapps/foo/public;
+
+        location / {
+            # Tells Nginx to forward all requests for www.foo.com
+            # to the Passenger Standalone instance listening on port 4000.
+            proxy_pass http://127.0.0.1:4000;
+
+            # These are "magic" Nginx configuration options that
+            # should be present in order to make the reverse proxying
+            # work properly. Also contains some options that make WebSockets
+            # work properly with Passenger Standalone. Please learn more at
+            # http://nginx.org/en/docs/http/ngx_http_proxy_module.html
+            proxy_http_version 1.1;
+            proxy_set_header Host $http_host;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_buffering off;
+        }
+    }
+
+    # We handle bar in a similar manner.
+    server {
+        listen 80;
+        server_name www.bar.com;
+
+        root /webapps/bar/public;
+
+        location / {
+            # bar is listening on port 4010 instead of 4000, we
+            # change the URL here.
+            proxy_pass http://127.0.0.1:4010;
+
+            proxy_http_version 1.1;
+            proxy_set_header Host $http_host;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_buffering off;
+        }
+    }
+}
+--------------------------
+
+Once you're done editing the Nginx configuration file, restart Nginx:
+
+|======================================================================
+| Debian, Ubuntu | `sudo /etc/init.d/nginx restart`
+| Red Hat, CentOS, ScientificLinux, Amazon Linux | `sudo service nginx restart`
+| Mac OS X (Homebrew) | 1. Run `sudo kill $(cat /usr/local/var/run/nginx.pid)` +
+ 2. You you installed the Nginx launchd plist that Homebrew provides (see `brew info nginx` to learn more), then you don't have to do anything, and launchd will automatically restart Nginx. Otherwise, you have to manually start Nginx again: `sudo /usr/local/bin/nginx`.
+| Other operating systems | It depends on how you installed Nginx, but it's usually as follows:
+
+ 1. Lookup the PID of the Nginx master process using `ps aux`. +
+ 2. Run `sudo kill <PID>` +
+ 3. Start Nginx again: `sudo $PREFIX/sbin/nginx`, where `$PREFIX` is the prefix you installed Nginx to.
+|======================================================================
+
+[float]
+==== Step 3: testing
+
+Nginx should now be listening on port 80, and should forward requests to foo and bar respectively. Let's test it out by accessing http://www.foo.com and http://www.bar.com. But first, we need to ensure that any requests to 'www.foo.com' and 'www.bar.com', that originate from the local machine, actually end up at the local host, and not at the IP address specified in the DNS records. To do this, edit `/etc/hosts` and add:
+
+--------------------------------
+127.0.0.1  www.foo.com www.bar.com
+--------------------------------
+
+Now visit http://www.foo.com and http://www.bar.com, and verify that it works.
+
+[float]
+==== Step 4: making all apps start at system boot
+
+Once you restart the server, the reverse proxy/load balancer will no longer be able to serve 'www.foo.com' or 'www.bar.com' because the Passenger Standalone instances that host them are no longer running. You must therefore configure the system to start Passenger Standalone at system boot. Please refer to <<starting_at_system_boot,Starting Passenger Standalone at system boot>> for more information.
+
+For example, you can put this in `/etc/rc.local` to make the system start foo and bar at system boot:
+
+[source,sh]
+-----------------------------------
+# If you installed Phusion Passenger from tarball, add its `bin` directory to PATH.
+#export PATH=/path-to-passenger/bin:$PATH
+
+cd /webapps/foo
+passenger start --daemonize --port 4000 --user someusername1
+
+cd /webapps/bar
+passenger start --daemonize --port 4010 --user someusername2
+-----------------------------------
+
+[float]
+==== Step 5: wrapping up
+
+Edit `/etc/hosts` and remove the entry that you added in step 3.
+
+
+=== Installing Passenger Standalone behind Nginx
+
+This is described in <<sharing_port,Sharing the same port between multiple Passenger Standalone instances>>.
+
+
 
 [[mass_deployment]]
 == Mass deployment

data/doc/users_guide_snippets/installation.txt

@@ -750,7 +750,7 @@ 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`. 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].
+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.
 
 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:
 
@@ -773,6 +773,7 @@ passenger-config --root
 
 After having modified the Nginx configuration file, restart Nginx.
 
+
 [[nginx_init_script]]
 === Creating an Nginx init script
 

data/ext/common/ApplicationPool2/Group.h

@@ -63,7 +63,8 @@ using namespace oxt;
  * so only access within ApplicationPool lock.
  */
 class Group: public boost::enable_shared_from_this<Group> {
-private:
+// Actually private, but marked public so that unit tests can access the fields.
+public:
 	friend class Pool;
 	friend class SuperGroup;
 	

data/ext/common/ApplicationPool2/Options.h

@@ -146,7 +146,7 @@ private:
 	}
 	
 public:
-	/*********** Spawn options that should be set manually ***********
+	/*********** Spawn options that should be set by the caller ***********
 	 * These are the options that are relevant while spawning an application
 	 * process. These options are only used during spawning.
 	 */
@@ -297,7 +297,7 @@ public:
 	bool raiseInternalError;
 	
 	
-	/*********** Per-group pool options that should be set manually ***********
+	/*********** Per-group pool options that should be set by the caller ***********
 	 * These options dictate how Pool will manage processes, routing, etc. within
 	 * a single Group. These options are not process-specific, only group-specific.
 	 */
@@ -348,7 +348,11 @@ public:
 	/*-----------------*/
 	
 	
-	/*********** Per-request options that should be set manually ***********/
+	/*********** Per-request pool options that should be set by the caller ***********
+	 * These options also dictate how Pool will manage processes, etc. Unlike the
+	 * per-group options, these options are customizable on a per-request basis.
+	 * Their effects also don't persist longer than a single request.
+	 */
 	
 	/** Current request host name. */
 	StaticString hostName;
@@ -576,6 +580,8 @@ public:
 			appendKeyValue4(vec, "analytics",          analytics);
 
 			appendKeyValue (vec, "group_secret",       groupSecret);
+
+			/*********************************/
 		}
 		if (fields & PER_GROUP_POOL_OPTIONS) {
 			appendKeyValue3(vec, "min_processes",       minProcesses);

data/ext/common/Constants.h

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

data/ext/common/agents/HelperAgent/Main.cpp

@@ -30,6 +30,7 @@
 #include <cstring>
 #include <cassert>
 #include <cerrno>
+#include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <pwd.h>
@@ -372,6 +373,8 @@ private:
 				"privilege to that of user '") + username +
 				"': cannot set user ID", e);
 		}
+
+		setenv("HOME", userEntry->pw_dir, 1);
 	}
 	
 	void onSigquit(ev::sig &signal, int revents) {
@@ -551,7 +554,7 @@ public:
 		poolLoop.start("Pool event loop", 0);
 		requestLoop.start("Request event loop", 0);
 
-		
+
 		/* Wait until the watchdog closes the feedback fd (meaning it
 		 * was killed) or until we receive an exit message.
 		 */

data/ext/common/agents/LoggingAgent/Main.cpp

@@ -34,6 +34,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
+#include <stdlib.h>
 #include <signal.h>
 
 #include <agents/Base.h>
@@ -205,6 +206,8 @@ lowerPrivilege(const string &username, const struct passwd *user, gid_t gid) {
 			"': cannot set user ID: " << strerror(e) <<
 			" (" << e << ")");
 	}
+
+	setenv("HOME", user->pw_dir, 1);
 }
 
 static void

data/ext/common/agents/TempDirToucher.c

@@ -45,13 +45,17 @@ static char *dir;
 /**
  * When Passenger Standalone is started with --daemonize, then it will
  * pass --cleanup to this tool so that this tool is responsible
- * for cleaning up the Standalone temp dir.
+ * for cleaning up the Standalone temp dir. This is because Passenger
+ * Standalone may be started in daemonize mode, which makes it exit asap
+ * in order to conserve memory. Passenger Standalone can therefore not
+ * be responsible for cleaning up the temp dir.
  */
 static int shouldCleanup = 0;
 static int shouldDaemonize = 0;
 static const char *pidFile = NULL;
 static const char *logFile = NULL;
 static int terminationPipe[2];
+static sig_atomic_t shouldIgnoreNextTermSignal = 0;
 
 
 static void
@@ -148,10 +152,19 @@ initialize(int argc, char *argv[]) {
 
 static void
 exitHandler(int signo) {
-	int ret = write(terminationPipe[1], "x", 1);
-	// We can't do anything about failures, so ignore
-	// compiler warnings about not using the result.
-	(void) ret;
+	if (shouldIgnoreNextTermSignal) {
+		shouldIgnoreNextTermSignal = 0;
+	} else {
+		int ret = write(terminationPipe[1], "x", 1);
+		// We can't do anything about failures, so ignore
+		// compiler warnings about not using the result.
+		(void) ret;
+	}
+}
+
+static void
+ignoreNextTermSignalHandler(int signo) {
+	shouldIgnoreNextTermSignal = 1;
 }
 
 static void
@@ -163,6 +176,10 @@ installSignalHandlers() {
 	sigemptyset(&action.sa_mask);
 	sigaction(SIGINT, &action, NULL);
 	sigaction(SIGTERM, &action, NULL);
+
+	action.sa_handler = ignoreNextTermSignalHandler;
+	action.sa_flags = SA_RESTART;
+	sigaction(SIGHUP, &action, NULL);
 }
 
 static void

data/ext/common/agents/Watchdog/Main.cpp

@@ -303,6 +303,19 @@ readCleanupPids(const WorkingObjectsPtr &wo) {
 	return result;
 }
 
+static void
+killCleanupPids(const vector<pid_t> &cleanupPids) {
+	foreach (pid_t pid, cleanupPids) {
+		P_DEBUG("Sending SIGTERM to cleanup PID " << pid);
+		kill(pid, SIGTERM);
+	}
+}
+
+static void
+killCleanupPids(const WorkingObjectsPtr &wo) {
+	killCleanupPids(readCleanupPids(wo));
+}
+
 static void
 cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers, char *argv[]) {
 	this_thread::disable_interruption di;
@@ -389,10 +402,8 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 			wo->serverInstanceDir->destroy();
 
 			// Notify given PIDs about our shutdown.
-			foreach (pid_t pid, cleanupPids) {
-				P_DEBUG("Sending SIGTERM to cleanup PID " << pid);
-				kill(pid, SIGTERM);
-			}
+			killCleanupPids(cleanupPids);
+
 			strcpy(argv[0], "PassengerWatchdog (cleaning up 6...)");
 			_exit(0);
 		} catch (const std::exception &e) {
@@ -418,7 +429,7 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 }
 
 static void
-forceAllAgentsShutdown(vector<AgentWatcherPtr> &watchers) {
+forceAllAgentsShutdown(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 	vector<AgentWatcherPtr>::iterator it;
 	
 	for (it = watchers.begin(); it != watchers.end(); it++) {
@@ -428,6 +439,7 @@ forceAllAgentsShutdown(vector<AgentWatcherPtr> &watchers) {
 	for (it = watchers.begin(); it != watchers.end(); it++) {
 		(*it)->forceShutdown();
 	}
+	killCleanupPids(wo);
 }
 
 static string
@@ -640,7 +652,7 @@ startAgents(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 				"Watchdog startup error",
 				e.what(),
 				NULL);
-			forceAllAgentsShutdown(watchers);
+			forceAllAgentsShutdown(wo, watchers);
 			exit(1);
 		}
 		// Allow other exceptions to propagate and crash the watchdog.
@@ -657,7 +669,7 @@ beginWatchingAgents(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watche
 				"Watchdog startup error",
 				e.what(),
 				NULL);
-			forceAllAgentsShutdown(watchers);
+			forceAllAgentsShutdown(wo, watchers);
 			exit(1);
 		}
 		// Allow other exceptions to propagate and crash the watchdog.
@@ -701,6 +713,9 @@ main(int argc, char *argv[]) {
 			"Watchdog startup error",
 			e.what(),
 			NULL);
+		if (wo != NULL) {
+			killCleanupPids(wo);
+		}
 		return 1;
 	}
 	// Allow other exceptions to propagate and crash the watchdog.
@@ -736,7 +751,7 @@ main(int argc, char *argv[]) {
 			cleanupAgentsInBackground(wo, watchers, argv);
 		} else {
 			UPDATE_TRACE_POINT();
-			forceAllAgentsShutdown(watchers);
+			forceAllAgentsShutdown(wo, watchers);
 		}
 		UPDATE_TRACE_POINT();
 		runHookScriptAndThrowOnError("after_watchdog_shutdown");

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.35'
+	VERSION_STRING = '4.0.36'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/standalone/command.rb

@@ -183,12 +183,17 @@ private
 	def write_nginx_config_file
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		PhusionPassenger.require_passenger_lib 'utils/tmpio'
-		@temp_dir = PhusionPassenger::Utils.mktmpdir(
+		# @temp_dir may already be set because we're redeploying
+		# using Mass Deployment.
+		@temp_dir ||= PhusionPassenger::Utils.mktmpdir(
 			"passenger-standalone.")
 		@config_filename = "#{@temp_dir}/config"
 		location_config_filename = "#{@temp_dir}/locations.ini"
 		File.chmod(0755, @temp_dir)
-		Dir.mkdir("#{@temp_dir}/logs")
+		begin
+			Dir.mkdir("#{@temp_dir}/logs")
+		rescue Errno::EEXIST
+		end
 
 		locations_ini_fields =
 			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS +

data/lib/phusion_passenger/standalone/start_command.rb

@@ -422,11 +422,7 @@ private
 	end
 
 	def should_wait_until_nginx_has_exited?
-		return !@options[:daemonize]
-	end
-
-	def should_cleanup_temp_dir?
-		return @temp_dir && !@options[:daemonize]
+		return !@options[:daemonize] || @app_finder.multi_mode?
 	end
 
 	# Returns the URL that Nginx will be listening on.

data/resources/templates/standalone/config.erb

@@ -68,7 +68,8 @@ http {
     gzip_comp_level 3;
     gzip_min_length 150;
     gzip_proxied any;
-    gzip_types text/plain text/css application/javascript application/x-javascript;
+    gzip_types text/plain text/css text/json text/javascript \
+        application/javascript application/x-javascript application/json;
     
     <% if @apps.size > 1 %>
     # Default server entry.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.35
+  version: 4.0.36
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJS1wPuAAoJECrHRaUKISqM130H/RcdfuwqkBuAm/WJRN5MN9Kq
-K9Kycbogcvi2+E6xuktEed/9nnK5MiiWM1FcG+4P7SoUaGflVZkztIzmJ4oBX3dB
-bOe4Wx30ta/tD81fX1OUk8CfBFXsUuDFqKhdpRb170hes7l5j4GOTxTAOqigDklo
-mRSpmAZGLWTYoXOkGTXAHLYhHa2K7gZUL4OM1WuP0khB64vNdEN6/IEu0KLjeIuE
-2uSJavuadNE2sOwitqqOPxoDcV/y4xK5JTNXZ0OYsBG/Gc04fgjAZjcD+OJ254Vd
-w60GXyhfA0QXapzRAoGEJKrJMP6/G9Faj6WrY4rIZgIlNzNv+XndIowp6f8IBdQ=
-=n4Ch
+iQEcBAABAgAGBQJS4syKAAoJECrHRaUKISqMpZoH/iwKVIdh40yt8z9zma0e7w8R
+olvsvhYmjAtX+Jigosb5hXPr3pF4ZOtuuAJlyrU/JZkcseOFqmigGf2Junl6mN03
+v7E6RbiTJSAsEZZpOEqhSiqDINlolChmWtXWKi1D6tV1RtFzwR+xclsks3m+Dm7O
+mB9y1pCwW3EQvZr4dKpS4f22z/QBiDm9ieC1NVpfEy0u9d2N+W7Wty0ExNzP1jjP
+STWpMcV1G8hUbZ2ZJ2epObCQeHGLT3SKoD9q2WV8p6+m7+eo9MxeJgqjcKob7Hb5
+2pwmBFkwzmlV4FblJ42rFcs5W/BUL2U3tUpYTQJ2zeO7oQRhoulhsmLZnG8j44o=
+=JXVh
 -----END PGP SIGNATURE-----