passenger 4.0.45 → 4.0.46

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQxZWYyOGY1YmIzMDg1MjllZTY3YzNkZmE0ZWIwZTE2NWI5MjdjZg==
+    NTMzMjIwYzg3NGQxMTFmZDllM2ExZGU0MmUyM2E2MGFjODU0MDQyNQ==
   data.tar.gz: !binary |-
-    ODI1MDFmYzg5YWQyMjU4MzQ4MmU3MmJjNzM4MTAzN2M4OTY0M2I0MQ==
+    MTM5NmRmMWQyYzY0ZmZjNTNkMTYzYmFhZDcwZTVhNDdhZDI5YjM3MA==
 SHA512:
   metadata.gz: !binary |-
-    MjM2MDgyNzQyNDg1Yjg2MmIyMjcwMWY4MDFkYzliM2VmMTgwMmY5MGJmYmI4
-    YjdjYjMwMDI4N2ZkMDk4ZDM1YzQ3ZTNjZmVjZWJjMTdkMjg2OWFhYmM1YzU4
-    NzllOWU2ZGQzMDhkNDM2N2EyZDc3MzQ0ZDQ3ZTNkOGFmMDcwNjk=
+    YmQ4Nzg3NTVjYzhhNDcyMzJkOWU0YTgwMmRiYzYwMGM4YzJlZDJiYjBlMDcw
+    MzU3MGY2NTc4NWRlNTU4OGU1ODM3OTliNWQ4MWJhYWIyNzUxOGM3YWViMTM2
+    NTQwYjE4NmIxYjczMTc4Y2I2YjliMjEwNGRmNTM0ZjkxY2EzMDc=
   data.tar.gz: !binary |-
-    ZmJhNjExZTdmOTMwM2IyY2FjMjI5M2RkZWE5YjMxNmUxY2VjYWQ4MmY2ZDNj
-    ZTdlNjVhN2RhYTU1NGNhZmY2YjU0NTVhNTNiNzkzYTBmNzgxNTI1ZTcyMGZk
-    MjA1MzE0Mzk5NDQ3Y2EzMjE3N2I1ZDk3ZmU3ZDUwNGI2M2YxODY=
+    MGNiMGE0ODZkYjlhZjdhYmI1YmJkYjJlN2M0YmY1MjkxZjg3OWQ5ZmEyNmE2
+    NjhiY2RjZjRkZmRlZDdiMDg1MzI5YjI4M2JiNWQ2MDM3NDVkYTBjMmJlZTY3
+    YzRhNmQyZDIwZjBkNzhmYTkyMTUxY2QyZjY5MWVhYmI3ODE0YjE=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTmYzGAAoJECrHRaUKISqMhFYH/R98G3A4TabyzULioj4MnFL2
-exwefHsSLPT5GkpqHn9JEGA0FkX9R+cQhYtaMiiy63Y3w6cCzC+GnCiMlhWwLd9k
-jDUo2PdC+nuWP7DxUSrUtikHsBMY9Dw+xWAGTyjF/gahINKL72nRyMgVhLzxYXlj
-M74M8SPFFfFW8Ajy+/WF/Q68kx/1oGGeOETgJGjwEi4gI+bE129oErsTe3Ia2TO5
-yesWCGeR+AE2DnrLkUVoxAih7uZkL9bVT8exG5YytP70uo21CjwDkxJKv0P8cZn6
-rXjmCEgxh4dAfvqLz5TBK1Fc3JMQcgnXXq4QOVNXgL7Mq0jlKtz+ubYxaZJo5/M=
-=rQKT
+iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMIQsH/3NGVBMEB/WcSyQeLVw8skQZ
+ZgD6xWOeNH7im6h44UwT7zebDNuVVE2vhPhxcuv5h5D3zKeSutLV9deGbvx2KRHF
+5DhHC1M7YmirNDfxL1cD/mjHaK5XconhorcYghTwa9Co40c99pWB3DTMvt53zP4E
+udoJY26zO26PxpoZ3KQtkzp4PdTKs9VB3cq9YXuGtwjO10qUT/CJf2iXObYheSit
+zLC7b7L5qSDOg+Ty8PUQf3/vwyGp6X6+AlOcwJR8fHyWJ8TPn/xugAElUcHIsYDB
+jFb5rwDGYVmN6lpqVqVJ9+n4Ju2Sj9oBO4DCrPgTBvFXO0jfd8zK4JoCMb4H/2g=
+=EZq+
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTmYzGAAoJECrHRaUKISqMlvsH/3KowVMQS+UI3bAP2Os6mhKW
-p3N73sotyHBtWmsYyWsgp2H9JnzEIf2Z7eNhh9VLVAXSrSBSLNEUVa5JmqHGI6eb
-5f2NrHE0DawKYznK4DEtRSqH2P6iUAsP+XCGnpwoZBP0LaJzCdOPFcfUrWqlHo0z
-aOrJzsh/KS2Jr0694elf+uMmn3AKnqbPU4neGliOIeiSHM2LO36WSaBOZiagiWXK
-Eti3XYSmClE8tFOUmjdVfHJAom0UrBCTFUI6UhBPFuyq1bdUcbNcnKT9hKClphjL
-jYpx3G1iCuacbCMbF93LHxN3wh4U0f0hkW41Sirz/P7ItT4Ieet3hOg95OZkiv8=
-=Y+ZE
+iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMCdsIAKR9HnGsLlsxmpu0zMWExqVb
+dHyyHP/ckMjqEsJs1jeS0iYniI59IxCLfcMCG0lYf0tLR1OSRbnTUSuDG7JQeKfN
+sA1OZ7i8UNPbFEhmzN/xAqmxioCNY0C85vPpUk4Vff11oLRmXN/YOKHKL0ukZIJs
+eaN9U+I+KtKCLkst5afwuzNlRMxDMxKnArdoWVD16iFbltMxHH+2l2wYF/APt4JS
+NAzBGbweQ8xi/7p1+ReVDG617Imh5aUt0tNEwlSbTS4P+fHObL4FaVPcVzzDGi17
+DxNCiqErNYCjEsy+6F4CjWPgO9fZ+IcwYqAk9NaW3z3ZrlQSK9F+hB+fiCalCRA=
+=BldL
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -0,0 +1,19 @@
+# http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+
+[{*.cpp,*.c,*.h,*.hpp,*.rb,*.js}]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[{*.cpp,*.c,*.h,*.hpp}]
+insert_final_newline = true
+
+[ext/nginx/{*.c,*.h}]
+indent_style = space
+indent_size = 4

data/CHANGELOG

@@ -1,3 +1,50 @@
+Release 4.0.46
+--------------
+
+ * Further improved Node.js and Socket.io compatibility.
+ * Sticky session cookies have been made more reliable.
+ * Fixed WebSocket upgrade issues on Firefox. Closes GH-1232.
+ * The Python application loader now inserts the application root into `sys.path`.
+   The fact that this was not done previously caused a lot of confusion amongst
+   Python users, who wondered why their `passenger_wsgi.py` could not import any
+   modules from the same directory.
+ * Fixed a compatibility problem with Django, which could cause Django apps to
+   freeze indefinitely. Closes GH-1215.
+ * Logging of application spawning errors has been much improved. Full details
+   about the error, such as environment variables, are saved to a private log file.
+   In the past, these details were only viewable in the browser. This change also
+   fixes a bug on Phusion Passenger Enterprise, where enabling Deployment Error
+   Resistance causes error messages to get lost. Closes GH-1021 and GH-1175.
+ * Fixed a regression in Node.js support. When a Node.js app is deployed on
+   a HTTPS host, the `X-Forwarded-Proto` header wasn't set in 4.0.45.
+   Closes GH-1231.
+ * Passenger Standalone no longer, by default, loads shell startup files before
+   loading the application. This is because Passenger Standalone is often invoked
+   from the shell anyway. Indeed, loading shell startup files again can interfere
+   with any environment variables already set in the invoking shell. You can
+   still tell Passenger Standalone to load shell startup files by passing
+   `--load-shell-envvars`. Passenger for Apache and Passenger for Nginx still
+   load shell startup files by default.
+ * Passenger Standalone now works properly when the HOME environment variable
+   isn't set. Closes GH-713.
+ * Passenger Standalone's `package-runtime` command has been removed. It has
+   been broken for a while and has nowadays been obsolete by our automatic
+   [binary generation system](https://github.com/phusion/passenger_autobuilder).
+   Closes GH-1133.
+ * The `passenger_startup_file` option now also works on Python apps. Closes GH-1233.
+ * If you are a [Union Station](https://www.unionstationapp.com) customer, then
+   Phusion Passenger will now also log application spawning errors to Union Station.
+   This data isn't shown in the Union Station interface yet, but it will be
+   implemented in the future.
+ * Fixed compilation problems on OmniOS and OpenIndiana. Closes GH-1212.
+ * Fixed compilation problems when Nginx is configured with OpenResty.
+   Thanks to Yichun Zhang. Closes GH-1226.
+ * Fixed Nginx HTTP POST failures on ARM platforms. Thanks to nocelic for the fix.
+   Closes GH-1151.
+ * Documentation contributions by Tim Bishop and Tugdual de Kerviler.
+ * Minor Nginx bug fix by Feng Gu. Closes GH-1235.
+
+
 Release 4.0.45
 --------------
 

data/CONTRIBUTING.md

@@ -9,6 +9,7 @@
  * [Contributing code](#contrib_code)
    * [Developer QuickStart](#dev_quickstart)
    * [Design and Architecture](#design_and_architecture)
+   * [Code Walkthrough](#code_walkthrough)
    * [Compilation and build system](#build_system)
    * [Running the unit tests](#unit_tests)
    * [Directory structure](#dir_structure)
@@ -97,6 +98,13 @@ We provide an easy and convenient development environment that contributors can
 
 Phusion Passenger's design and architecture is documented in detail in the [Design & Architecture](https://www.phusionpassenger.com/documentation/Design%20and%20Architecture.html) document.
 
+<a name="code_walkthrough"></a>
+### Code Walkthrough
+
+<a href="http://vimeo.com/phusionnl/review/98027409/03ba678684"><img src="http://blog.phusion.nl/wp-content/uploads/2014/06/code_walkthrough.png"></a>
+
+We have [a video](http://vimeo.com/phusionnl/review/98027409/03ba678684) which walks you through the Phusion Passenger codebase, showing you step-by-step how things fit together. It complements the [Design & Architecture](https://www.phusionpassenger.com/documentation/Design%20and%20Architecture.html) document.
+
 <a name="build_system"></a>
 ### Compilation and build system
 
@@ -112,7 +120,7 @@ It is recommended that you install ccache and set the `USE_CCACHE=1` environment
 <a name="unit_tests"></a>
 ### Running the unit tests
 
-The tests depend on the Phusion Passenger developer tools. Make sure they're installed:
+The tests depend on the Phusion Passenger developer tools. If you're not using our [Vagrant environment](https://github.com/phusion/passenger/blob/master/doc/DeveloperQuickstart.md), you need to make sure they're installed:
 
     rake test:install_deps
 

data/CONTRIBUTORS

@@ -65,10 +65,14 @@ Ryan Schwartz
 Ryo Onodera
 Saimon Moore
 Sam Pohlenz
+Sean Wilkinson
 Sebastian Delmont
 Slippy Douglas
+Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)
+Tugdual de Kerviler
 W. Andrew Loe III
 Weyert de Boer
+Yichun Zhang
 亀田 義裕

data/Vagrantfile

@@ -1,4 +1,6 @@
-# This Vagrantfile sets up an Ubuntu VM, for the purpose of developing Phusion Passenger.
+# This Vagrantfile sets up an Ubuntu VM, for the purpose of developing Phusion Passenger itself.
+# It is NOT for setting up a Vagrant VM for the purpose of developing your own app. See:
+# https://github.com/phusion/passenger/issues/1230#issuecomment-48337881
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
@@ -11,6 +13,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vbox.box"
   config.ssh.forward_agent = true
 
+  # Use NFS to mount /vagrant because our unit tests expect a
+  # POSIX compliant filesystem.
+  config.vm.synced_folder ".", "/vagrant", :type => "nfs"
+
   # Passenger Standalone and 'rails server'
   config.vm.network :forwarded_port, :host => 3000, :guest => 3000
   config.vm.network :forwarded_port, :host => 3001, :guest => 3001
@@ -33,9 +39,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, :host => 8110, :guest => 8110
 
   config.vm.provider :virtualbox do |vb, override|
-    # VirtualBox shared folders are WAAAAY too slow
     override.vm.network :private_network, :type => "dhcp"
-    override.vm.synced_folder ".", "/vagrant", :type => "nfs"
     vb.cpus   = CPUS
     vb.memory = MEMORY
   end

data/build/agents.rb

@@ -84,6 +84,7 @@ dependencies = [
 	'ext/common/ApplicationPool2/SpawnerFactory.h',
 	'ext/common/ApplicationPool2/SmartSpawner.h',
 	'ext/common/ApplicationPool2/DirectSpawner.h',
+	'ext/common/ApplicationPool2/ErrorRenderer.h',
 	LIBBOOST_OXT,
 	helper_agent_libs.link_objects,
 	LIBEV_TARGET,

data/build/misc.rb

@@ -94,9 +94,9 @@ task :changelog_as_html do
 			end
 			
 			# Auto-link to issue tracker.
-			text.gsub!(/(bug|issue) #(\d+)/i) do
+			text.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
 				url = "https://github.com/phusion/passenger/issues/#{$2}"
-				%Q(<{a href="#{url}"}>#{$1} ##{$2}<{/a}>)
+				%Q(<{a href="#{url}"}>#{$1}#{$2}<{/a}>)
 			end
 			
 			text.strip!
@@ -117,9 +117,9 @@ task :changelog_as_markdown do
 	contents, items = extract_latest_news_contents_and_items
 
 	# Auto-link to issue tracker.
-	contents.gsub!(/(bug|issue) #(\d+)/i) do
+	contents.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
 		url = "https://github.com/phusion/passenger/issues/#{$2}"
-		%Q([#{$1} ##{$2}](#{url}))
+		%Q([#{$1}#{$2}](#{url}))
 	end
 
 	puts contents
@@ -139,6 +139,8 @@ task :contributors do
 	entries.push "Goffert van Gool (Phusion)"
 	entries.delete "Gokulnath"
 	entries.push "Gokulnath Manakkattil"
+	entries.push "Sean Wilkinson"
+	entries.push "Yichun Zhang"
 	File.open("CONTRIBUTORS", "w") do |f|
 		f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
 	end

data/dev/vagrant/bashrc

@@ -15,6 +15,8 @@ export CCACHE_COMPRESS=1
 # Tell Phusion Passenger Standalone to run in debug mode.
 export PASSENGER_DEBUG=1
 
+export PASSENGER_VAGRANT_ENVIRONMENT=1
+
 alias ls='ls -Fh --color'
 alias dir='ls -l'
 alias free='free -m'

data/doc/Design and Architecture.txt

@@ -2,10 +2,12 @@
 
 image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
-This guide describes Phusion Passenger's design and architecture in detail. With this guide, we hope that contributors can quickly find their way around the Phusion Passenger codebase.
+This guide describes link:https://www.phusionpassenger.com/[Phusion Passenger]'s design and architecture in detail. With this guide, we hope that contributors can quickly find their way around the Phusion Passenger codebase.
 
 The guide assumes that you're familiar with using Phusion Passenger and with Nginx or Apache, and that you've read the link:https://github.com/phusion/passenger/blob/master/CONTRIBUTING.md[Contributors Guide] and the link:https://github.com/phusion/passenger/blob/master/doc/DeveloperQuickstart.md[Developer QuickStart].
 
+image:images/code_walkthrough.jpg[link="http://vimeo.com/phusionnl/review/98027409/03ba678684"] +
+'You should also watch the complementary video: link:http://vimeo.com/phusionnl/review/98027409/03ba678684[Phusion Passenger Code Walkthrough]'
 
 == Introduction
 
@@ -191,9 +193,9 @@ If the ApplicationPool replied with an exception, the RequestHandler sends back
 
 ==== I/O model
 
-The RequestHandler uses the **evented I/O model**. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the `select()`, `poll()`, `epoll()` and `kqueue()` system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API, link:http://software.schmorp.de/pkg/libev.html[libev] and link:http://software.schmorp.de/pkg/libeio.html[libeio].
+The RequestHandler uses the **evented I/O model**. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the `select()`, `poll()`, `epoll()` and `kqueue()` system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API: link:http://software.schmorp.de/pkg/libev.html[libev] and link:http://software.schmorp.de/pkg/libeio.html[libeio].
 
-The evented I/O model is also used in Nginx. It is in contrast to the single-threaded multi-process model which handles 1 client per process (used by Apache with the prefork MPM), or the multi-threaded model which handles 1 client per thread (used by Apache with the worker MPM). You can learn more about evented I/O and the different I/O models using these resources:
+The evented I/O model is also used in Nginx. It is in contrast to the single-threaded multi-process model which handles 1 client per process (used by Apache with the prefork MPM), or the multi-threaded model which handles 1 client per thread (used by Apache with the worker MPM). You can learn more about evented I/O and the different I/O models through these resources:
 
  * link:http://www.slideshare.net/marc.seeger/seeger-aysnc-io[Event-Driven I/O: A hands-on introduction] -- Marc Seeger, 2010
  * link:http://stackoverflow.com/questions/5807246/event-driven-io-and-blocking-vs-nonblocking[Event Driven IO And Blocking vs NonBlocking] -- Stack Overflow
@@ -211,11 +213,11 @@ The ApplicationPool subsystem is responsible for:
  * Enforcing resource limits. Ensuring that not too many processes are spawned, ensuring that processes that use too much memory are shut down, etc.
  * Restarting processes on demand (e.g. when the timestamp of `restart.txt` has changed).
  * Restarting processes that have crashed.
- * Queuing requests and limiting concurrency. Each process tells the ApplicationPool how many concurrent requests it can handle. If more concurrent requests come in than the processes say they can handle, then the excess requests are queued within the ApplicationPool subsystem. Similarly, if requests come in while a process is being spawned, then those requests are queued until the process is done spawning.
+ * Queuing requests and limiting concurrency. Each process tells the ApplicationPool how many concurrent requests it can handle. If more concurrent requests come in than the processes says it can handle, then the excess requests are queued within the ApplicationPool subsystem. Similarly, if requests come in while a process is being spawned, then those requests are queued until the process is done spawning.
 
 The main interface into the subsystem is the Pool class, with its `asyncGet()` method. The RequestHandler calls something like `pool->asyncGet(options, callback)` inside its `checkoutSession()` method. `asyncGet()` replies with a Session, or an exception.
 
-Pool is the core of the subsystem. It contains high-level process management logic but not the low-level details of spawning processes. The code is further divided into the following classes, each of which contain the core code managing its respective domain:
+The Pool class is the core of the subsystem. It contains high-level process management logic but not low-level details, such as the details of spawning processes. The code is further divided into the following classes, each of which contain the core code managing its respective domain:
 
 **SuperGroup**::
 	A logical collection of different applications. It's designed to be able to contain one or more Groups, but currently it always contains exactly 1 Group.
@@ -478,13 +480,13 @@ Information about the supported application types, startup files, loaders and pr
 [[instance_state_and_communication]]
 == Instance state and communication
 
-Every time you start Phusion Passenger, you've created a new *instance*. Every instance consists of multiple processes that work together (Watchdog, HelperAgent, LoggingAgent, application processes). All those processes have to work together and have to be able to communicate with each other. Those processes must also *not* communicate with the processes belonging to other instances. For example, if you start Apache+Passenger *and Nginx+Passenger, then we don't want the HelperAgent that's started from Apache to use LoggingAgent that's started from Nginx.
+Every time you start Phusion Passenger, you've created a new *instance*. Every instance consists of multiple processes that work together (Watchdog, HelperAgent, LoggingAgent, application processes). All those processes have to be able to communicate with each other. Those processes must also *not* communicate with the processes belonging to other instances. For example, if you start Apache+Passenger *and* Nginx+Passenger, then we don't want the HelperAgent that's started from Apache to use LoggingAgent that's started from Nginx.
 
 Clearly, the processes can't listen on a specific TCP port for communication. Nor can they listen on a fixed Unix domain socket filename.
 
 That is where the 'server instance directory' comes in. Every Phusion Passenger instance has its own, unique temporary directory. That directory is removed when the instance halts. The directory contains Unix domain socket files that the processes listen on. Every Phusion Passenger related process knows where its own server instance directory is, and thus, knows how to communicate with other processes belonging to the same instance. The server instance directory is implemented in `ext/common/ServerInstanceDir.h`.
 
-Administration tools such as `passenger-status` query information using server instance directories. First, they check which server instance directories exist on the system. If they find only one, then they query the sockets inside that sole server instance directory. Otherwise, they abort with an error and asks the user to specifically select the instance to query.
+Administration tools such as `passenger-status` query information using server instance directories. First, they check which server instance directories exist on the system. If they find only one, then they query the sockets inside that sole server instance directory. Otherwise, they abort with an error and ask the user to specifically select the instance to query.
 
 
 [appendix]

data/doc/Users guide Apache.idmap.txt

@@ -120,6 +120,8 @@
 
 5.4. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--na7pmf
 
+5.5. Sample passenger_wsgi.py for Django	=>	sample-passenger-wsgi-py-for-django-slb9m8
+
 6. Deploying a Node.js application	=>	deploying-a-node-js-application-882ecy
 
 7. Deploying a Meteor application	=>	deploying-a-meteor-application-mxfmir

data/doc/Users guide Apache.txt

@@ -380,7 +380,7 @@ So '/webapps/wsgiapp' must, at minimum, look like this:
 ----------------------
 /webapps/wsgiapp
   |
-  +-- config.ru
+  +-- passenger_wsgi.py
   |
   +-- public/
   |
@@ -540,6 +540,19 @@ command line:
 touch /webapps/wsgiapp/tmp/restart.txt
 -------------------------------------------
 
+=== Sample `passenger_wsgi.py` for Django
+
+For Django applications, `passenger_wsgi.py` should look like this:
+
+[code,python]
+-------------------------------------------
+import myproject.wsgi
+application = myproject.wsgi.application
+-------------------------------------------
+
+Replace `myproject` with your project's module name.
+
+
 == Deploying a Node.js application
 
 Please refer to link:https://github.com/phusion/passenger/wiki/Phusion-Passenger%3A-Node.js-tutorial[the Node.js tutorial].
@@ -557,10 +570,17 @@ Nevertheless, the system administrator may be interested in changing
 Phusion Passenger's behavior. Phusion Passenger's Apache module supports the
 following configuration options:
 
+[[PassengerRoot]]
 === PassengerRoot <directory> ===
 The location to the Phusion Passenger root directory. This configuration option
 is essential to Phusion Passenger, and allows Phusion Passenger to locate its own
-data files. The correct value is given by the installer.
+data files. If you do not set this option, or if you set this option to the wrong value, then Phusion Passenger will make Apache abort with an error.
+
+While installing Phusion Passenger, you have been told to set this option in your Apache configuration file, and you have been told what value to set it to. So under normal conditions, you don't have ask yourself what value to set for this option. But in case you lost the value (e.g. because you accidentally removed the Apache configuration file, and you are trying to reconstruct it), or in case you didn't follow the installation instructions correctly, then here's how you can find out the correct value:
+
+ * If you installed Phusion Passenger through <<install_on_debian_ubuntu,our APT repository>>, then the value can be obtained by running `/usr/bin/passenger-config --root`.
+ * If you installed Phusion Passenger through RubyGems, then the value can be obtained by running `passenger-config --root`.
+ * If you installed Phusion Passenger through the source tarball, then the value is the path to the Phusion Passenger directory. For example, if you extracted the tarball's contents to `/opt/passenger/passenger-x.x.x`, then `passenger_root` must be `/opt/passenger/passenger-x.x.x`.
 
 If you've moved Phusion Passenger to a different directory then you need to update
 this option as well. Please read
@@ -1971,7 +1991,7 @@ In each place, it may be specified at most once. The default value is '100'.
 
 [[PassengerStickySessions]]
 ==== PassengerStickySessions <on|off>
-:version: 4.0.55
+:version: 4.0.45
 include::users_guide_snippets/since_version.txt[]
 
 When sticky sessions are enabled, all requests that a client sends will be routed to the same originating application process, whenever possible. When sticky sessions are disabled, requests may be distributed over multiple processes, and may not necessarily be routed to the originating process, in order to balance traffic over multiple CPU cores. Because of this, sticky sessions should only be enabled in specific circumstances.
@@ -2002,7 +2022,7 @@ In each place, it may be specified at most once. The default value is `off`.
 
 [[PassengerStickySessionsCookieName]]
 ==== PassengerStickySessionsCookieName
-:version: 4.0.55
+:version: 4.0.45
 include::users_guide_snippets/since_version.txt[]
 
 Sets the name of the <<PassengerStickySessions,sticky sessions>> cookie.

data/doc/Users guide Nginx.idmap.txt

@@ -30,6 +30,8 @@
 
 2.3.2. Installing packages	=>	installing-packages-j9glez
 
+2.3.3. Inserting passenger_root into nginx.conf	=>	inserting-passenger-root-into-nginx-conf--1pmj19o
+
 2.4. Installing or upgrading on Red Hat, Fedora, CentOS or ScientificLinux	=>	installing-or-upgrading-on-red-hat-fedora-centos-or-scientificlinux-1uus5a1
 
 2.5. Generic installation, upgrade and downgrade method: via RubyGems	=>	generic-installation-upgrade-and-downgrade-method-via-rubygems-76uol7
@@ -120,6 +122,8 @@
 
 5.4. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--10zdh2k
 
+5.5. Sample passenger_wsgi.py for Django	=>	sample-passenger-wsgi-py-for-django-1cvndls
+
 6. Deploying a Node.js application	=>	deploying-a-node-js-application-15wbczd
 
 7. Deploying a Meteor application	=>	deploying-a-meteor-application-1b51wl9

data/doc/Users guide Nginx.txt

@@ -350,7 +350,7 @@ So '/webapps/wsgiapp' must, at minimum, look like this:
 ----------------------
 /webapps/wsgiapp
   |
-  +-- config.ru
+  +-- passenger_wsgi.py
   |
   +-- public/
   |
@@ -496,6 +496,18 @@ command line:
 touch /webapps/wsgiapp/tmp/restart.txt
 -------------------------------------------
 
+=== Sample `passenger_wsgi.py` for Django
+
+For Django applications, `passenger_wsgi.py` should look like this:
+
+[code,python]
+-------------------------------------------
+import myproject.wsgi
+application = myproject.wsgi.application
+-------------------------------------------
+
+Replace `myproject` with your project's module name.
+
 
 == Deploying a Node.js application
 
@@ -514,10 +526,17 @@ Nevertheless, the system administrator may be interested in changing
 Phusion Passenger's behavior. Phusion Passenger supports the following configuration
 options in the Nginx configuration file:
 
+[[PassengerRoot]]
 === passenger_root <directory> ===
 The location to the Phusion Passenger root directory. This configuration option
 is essential to Phusion Passenger, and allows Phusion Passenger to locate its own
-data files. The correct value is given by the installer.
+data files. If you do not set this option, then Phusion Passenger will disable itself, and Nginx will behave as if Phusion Passenger was never installed. If you set this option to the wrong value, then Phusion Passenger will make Nginx abort with an error.
+
+While installing Phusion Passenger, you have been told to set this option in your Nginx configuration file, and you have been told what value to set it to. So under normal conditions, you don't have ask yourself what value to set for this option. But in case you lost the value (e.g. because you accidentally removed the Nginx configuration file, and you are trying to reconstruct it), or in case you didn't follow the installation instructions correctly, then here's how you can find out the correct value:
+
+ * If you installed Phusion Passenger through <<install_on_debian_ubuntu,our APT repository>>, then follow the instructions in <<inserting_passenger_root_for_apt,Inserting `passenger_root` into nginx.conf>>.
+ * If you installed Phusion Passenger through RubyGems, then the value can be obtained by running `passenger-config --root`.
+ * If you installed Phusion Passenger through the source tarball, then the value is the path to the Phusion Passenger directory. For example, if you extracted the tarball's contents to `/opt/passenger/passenger-x.x.x`, then `passenger_root` must be `/opt/passenger/passenger-x.x.x`.
 
 If you've moved Phusion Passenger to a different directory then you need to update
 this option as well. Please read
@@ -1737,7 +1756,7 @@ In each place, it may be specified at most once. The default value is '503'.
 
 [[PassengerStickySessions]]
 ==== passenger_sticky_sessions <on|off>
-:version: 4.0.55
+:version: 4.0.45
 include::users_guide_snippets/since_version.txt[]
 
 When sticky sessions are enabled, all requests that a client sends will be routed to the same originating application process, whenever possible. When sticky sessions are disabled, requests may be distributed over multiple processes, and may not necessarily be routed to the originating process, in order to balance traffic over multiple CPU cores. Because of this, sticky sessions should only be enabled in specific circumstances.
@@ -1768,7 +1787,7 @@ In each place, it may be specified at most once. The default value is `off`.
 
 [[PassengerStickySessionsCookieName]]
 ==== passenger_sticky_sessions_cookie_name
-:version: 4.0.55
+:version: 4.0.45
 include::users_guide_snippets/since_version.txt[]
 
 Sets the name of the <<PassengerStickySessions,sticky sessions>> cookie.