passenger 4.0.24 → 4.0.25

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJShLLBAAoJECrHRaUKISqM1uUH/RdBRvtxskGHHdZszBUNQvXT
-SfE8B2oFFPLQwLEv/xLrkT+38lZZmRSFUsTdC5oeddByz8mKEKmD8pTQ2KbqpeEO
-isWz9EClNxKdKrLEUiSBP/sHFM6V4uaMbzZ5h85gwrINEidNG+ovBoxLOErraiDV
-0iX26Sc3QpSD9sWrY+ZtrZIs8wWjzRq0cpRh4QtMe19K2fzUe3TBlcsJDY4bcI3L
-4lE/Ufwm+5yh8I5IgvTNkxxmA05FDJN7Jh8h/jwHbKxWX4/CqNADqaKvfO9VqXYd
-jffewfennXjyGYJ5K3GvBZ5G5UUOXK+UDTSoRtYrDt3ctP6ylXGOLe5m05JznR0=
-=o6KQ
+iQEcBAABAgAGBQJSi8RJAAoJECrHRaUKISqMCSIIAI+VKk4qgW9zhjSUAZ7HsZbT
+jyB8LsJqSdcoenACclHob+RozCcvXFW2BLZp6tx6QrQV2HQ2nolNAFdVBO8SfgOf
+WC4AAeYby/GBCiRZHFN69zCxmp/WAgP/9GAsSAwJDhW/0qDjx36RWE+Z8Elq4wd/
+H31gpnOma9DD5rWSpFxYuqpT7MR6Ino4Bf1QnwpVo6tHpe2PO5wHA8fSiBwG+uyX
+VnCKWkpjqadczpdqHI//AftXo7LtLmDGFY/jA7LtISk4WPuH3PHAhXnblAxvFV4+
+bhZGqZionb1bq/OcWeB68Pa2IalxLLkZzi3NR08jnfjJuUuspQpvSQ5VQh78DCc=
+=aoKj
 -----END PGP SIGNATURE-----

data/INSTALL.md

@@ -2,6 +2,6 @@
 
 Please read README.md for installation instructions.
 
-If you're having trouble installing Phusion Passenger, please read the file `doc/Users guide Apache.html` or `doc/Users guide Nginx.html`, depending on whether you want to install Phusion Passenger for Apache or for Nginx.
+If you're having trouble installing Phusion Passenger, please refer to [the manual](http://www.modrails.com/documentation/Users%20guide.html).
 
-Documentation and support resources are also available on [the website](https://www.phusionpassenger.com/support).
+Documentation and support resources are also available on [the website](https://www.phusionpassenger.com/documentation_and_support).

data/NEWS

@@ -1,3 +1,15 @@
+Release 4.0.25
+--------------
+
+ * The `PassengerEnv`/`passenger_env`/`--environment` option now also sets NODE_ENV,
+   so that Node.js frameworks like Connect can properly respond to the environment.
+ * Fixed a bug in our Debian/Ubuntu packages causing `passenger-install-nginx-module`
+   not to be able to compile Nginx.
+ * Arbitrary Node.js application structures are now supported.
+ * [Nginx] Introduced the `passenger_restart_dir` option.
+ * [Nginx] Upgraded preferred Nginx version to 1.4.4 because of CVE-2013-4547.
+
+
 Release 4.0.24
 --------------
 

data/README.md

@@ -1,10 +1,20 @@
 # Phusion Passenger: a fast and robust web server and application server for Ruby, Python and Node.js
 
-[Phusion Passenger](https://www.phusionpassenger.com/) 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.
+[Phusion Passenger™](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It takes a lot of complexity out of deploying web apps, adds powerful enterprise-grade features that are useful in production, and makes administration much easier and less complex. Phusion Passenger supports Ruby, Python, Node.js and Meteor, and is being used by high-profile companies such as **Apple, Pixar, New York Times, AirBnB, Juniper** etc as well as [over 350.000 websites](http://trends.builtwith.com/Web-Server/Phusion-Passenger).
 
-## Regular installation
+What makes it so fast and reliable is its **C++** core, its **zero-copy** architecture, its **watchdog** system and its **hybrid** evented, multi-threaded and multi-process design.
 
-You can install either Phusion Passenger for Apache or for Nginx. Basically, installation involves running one of these commands:
+**Learn more:** [Website](https://www.phusionpassenger.com/) | [Documentation](https://www.phusionpassenger.com/documentation_and_support) | [Support resources](https://www.phusionpassenger.com/documentation_and_support) | [Github](https://github.com/phusion/passenger) | [Twitter](https://twitter.com/phusion_nl) | [Blog](http://blog.phusion.nl/)
+
+<center><img src="http://blog.phusion.nl/wp-content/uploads/2012/07/Passenger_chair_256x256.jpg" width="160" height="160" alt="Phusion Passenger"></center>
+
+## Installation
+
+Please follow [the installation instructions on the website](https://www.phusionpassenger.com/download).
+
+### Installing the source directly from git
+
+If you mean to install the latest version of Passenger directly from this git repository, then you should run one of the following commands. Installing from the git repository is basically the same as the tarball installation method, as [described in the manual](http://modrails.com/documentation/Users%20guide.html#installation).
 
     ./bin/passenger-install-apache2-module
 
@@ -17,11 +27,9 @@ You can install either Phusion Passenger for Apache or for Nginx. Basically, ins
     # From your application directory
     ~/path-to-passenger/bin/passenger start
 
-That's it. :) However on some systems installation may require some more steps. You may have to run `sudo` or `rvmsudo`, and you may have to relax permissions on some directories, etc. Detailed fool-proof installation instructions can be found in [the documentation](http://www.modrails.com/documentation/Users%20guide.html).
-
 For troubleshooting, configuration and tips, please also refer to the above documentation. For further support, please refer to [the Phusion Passenger support page](https://www.phusionpassenger.com/support).
 
-## Installing as a gem
+Ruby users can also build a gem from the Git repository and install the gem.
 
     gem build passenger.gemspec
     gem install passenger-x.x.x.gem

data/build/packaging.rb

@@ -388,7 +388,9 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	# Headers necessary for building the Nginx module
 	sh "mkdir -p #{fake_include_dir}"
 	# Infer headers that the Nginx module needs
-	headers = []
+	headers = [
+		["ext/common/Exceptions.h", "Exceptions.h"]
+	]
 	Dir["ext/nginx/*.[ch]"].each do |filename|
 		File.read(filename).split("\n").grep(%r{#include "common/(.+)"}) do |match|
 			headers << ["ext/common/#{$1}", $1]

data/doc/Users guide Apache.idmap.txt

@@ -114,7 +114,9 @@
 
 5.2. Deploying to a virtual host’s root	=>	deploying-to-a-virtual-host-s-root-zzo4v7
 
-5.3. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--na7pmf
+5.3. Deploying to a sub URI	=>	deploying-to-a-sub-uri-ayqz96
+
+5.4. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--na7pmf
 
 6. Configuring Phusion Passenger	=>	configuring-phusion-passenger-11oztoe
 
@@ -134,11 +136,13 @@
 
 6.3.5. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
 
-6.3.6. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+6.3.6. PassengerBaseURI <uri>	=>	passengerbaseuri-uri--97i9mm
+
+6.3.7. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
 
-6.3.7. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.3.8. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
 
-6.3.8. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.3.9. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
 
 6.4. Process spawning options	=>	process-spawning-options-v2vscm
 
@@ -216,15 +220,11 @@
 
 6.10. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
 
-6.10.1. RackBaseURI <uri>	=>	rackbaseuri-uri--1to24pj
-
-6.10.2. RackEnv <string>	=>	rackenv-string--vve9py
+6.10.1. RackEnv <string>	=>	rackenv-string--vve9py
 
 6.11. Classic Ruby on Rails (⇐ 2.x)-specific options	=>	ruby-on-rails-specific-options-1t10wfu
 
-6.11.1. RailsBaseURI <uri>	=>	railsbaseuri-uri--1txrw3k
-
-6.11.2. RailsEnv <string>	=>	railsenv-string--1b0xxvu
+6.11.1. RailsEnv <string>	=>	railsenv-string--1b0xxvu
 
 6.12. Advanced options	=>	advanced-options-1ab1jkq
 
@@ -236,19 +236,21 @@
 
 6.13.1. RailsRuby	=>	railsruby-ht09ei
 
-6.13.2. RailsUserSwitching	=>	railsuserswitching-1npx8y4
+6.13.2. RailsBaseURI and RackBaseURI	=>	railsbaseuri-uri--1txrw3k
+
+6.13.3. RailsUserSwitching	=>	railsuserswitching-1npx8y4
 
-6.13.3. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
+6.13.4. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
 
-6.13.4. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
+6.13.5. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
 
-6.13.5. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
+6.13.6. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
 
-6.13.6. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
+6.13.7. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
 
-6.13.7. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+6.13.8. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
 
-6.13.8. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
+6.13.9. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
 
 7. Troubleshooting	=>	troubleshooting-2ihihi
 

data/doc/Users guide Apache.txt

@@ -86,22 +86,21 @@ Suppose that you already have a virtual host:
 </VirtualHost>
 -------------------------------------------
 
-And you want your Ruby on Rails application to be accessible from the URL
-'http://www.phusion.nl/rails'.
+And you want your Rails application, located in `/websites/rails`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
 
-To do this, make a symlink in the virtual host's document root, and have it
-point to your Ruby on Rails application's 'public' folder. For example:
--------------------------------------------
-ln -s /webapps/mycook/public /websites/phusion/rails
--------------------------------------------
+To do this, you need to perform the following:
 
-Next, add a <<RailsBaseURI,RailsBaseURI>> option to the virtual host configuration,
-and also make sure that:
+ 1. Set `Alias {SUBURI} {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}`.
+ 2. Create a `<Location /{SUBURI}>` block.
+ 3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
+ 4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
+ 5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
+ 6. Inside the Directory block, set `Allow from all`.
+ 7. Inside the Directory block, disable MultiViews.
 
-- The Apache per-directory permissions allow access to this folder.
-- MultiViews is disabled for this folder.
+Here is an example:
 
-For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.phusion.nl
@@ -110,13 +109,20 @@ For example:
         Allow from all
     </Directory>
     
-    RailsBaseURI /rails                   # <-- These lines have
-    <Directory /websites/phusion/rails>   # <-- been added.
-        Options -MultiViews               # <--
-    </Directory>                          # <--
+    # These have been added:
+    Alias /subapp /websites/rails/public
+    <Location /subapp>
+        PassengerBaseURI /subapp
+        PassengerAppRoot /websites/rails
+    </Location>
+    <Directory /websites/rails/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 -------------------------------------------
-Then restart Apache. The application has now been deployed.
+
+Then restart Apache. The application has now been deployed to the sub-URI.
 
 NOTE: If you're deploying to a sub-URI then please make sure that your view
 templates correctly handles references to sub-URI static assets! Otherwise
@@ -124,20 +130,6 @@ you may find broken links to images, CSS files, JavaScripts, etc. Please read
 <<sub_uri_deployment_uri_fix,How to fix broken images/CSS/JavaScript URIs in sub-URI deployments>>
 for more information.
 
-[TIP]
-======================================
-You can deploy multiple Rails applications under a virtual host, by specifying
-<<RailsBaseURI,RailsBaseURI>> multiple times. For example:
----------------------------------
-<VirtualHost *:80>
-    ....
-    RailsBaseURI /app1
-    RailsBaseURI /app2
-    RailsBaseURI /app3
-</VirtualHost>
----------------------------------
-======================================
-
 === Redeploying (restarting the Ruby on Rails application) ===
 
 Deploying a new version of a Ruby on Rails application is as simple as
@@ -294,22 +286,21 @@ Suppose that you already have a virtual host:
 </VirtualHost>
 -------------------------------------------
 
-And you want your Rack application to be accessible from the URL
-'http://www.phusion.nl/rack'.
+And you want your Rack application, located in `/websites/rack`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
 
-To do this, make a symlink in the virtual host's document root, and have it
-point to your Rack application's 'public' folder. For example:
--------------------------------------------
-ln -s /webapps/rackapp/public /websites/phusion/rack
--------------------------------------------
+To do this, you need to perform the following:
 
-Next, add a <<RackBaseURI,RackBaseURI>> option to the virtual host configuration,
-and also make sure that:
+ 1. Set `Alias {SUBURI} {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}`.
+ 2. Create a `<Location /{SUBURI}>` block.
+ 3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
+ 4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
+ 5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
+ 6. Inside the Directory block, set `Allow from all`.
+ 7. Inside the Directory block, disable MultiViews.
 
-- The Apache per-directory permissions allow access to this folder.
-- MultiViews is disabled for this folder.
+Here is an example:
 
-For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.phusion.nl
@@ -317,28 +308,21 @@ For example:
     <Directory /websites/phusion>
         Allow from all
     </Directory>
-
-    RackBaseURI /rack                     # <-- These lines have
-    <Directory /websites/phusion/rack>    # <-- been added.
-        Options -MultiViews               # <--
-    </Directory>                          # <--
+    
+    # These have been added:
+    Alias /subapp /websites/rack/public
+    <Location /subapp>
+        PassengerBaseURI /subapp
+        PassengerAppRoot /websites/rack
+    </Location>
+    <Directory /websites/rack/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 -------------------------------------------
-Then restart Apache. The application has now been deployed.
 
-[TIP]
-======================================
-You can deploy multiple Rack applications under a virtual host, by specifying
-<<RackBaseURI,RackBaseURI>> multiple times. For example:
----------------------------------
-<VirtualHost *:80>
-    ....
-    RackBaseURI /app1
-    RackBaseURI /app2
-    RackBaseURI /app3
-</VirtualHost>
----------------------------------
-======================================
+Then restart Apache. The application has now been deployed to the sub-URI.
 
 === Redeploying (restarting the Rack application) ===
 
@@ -451,6 +435,59 @@ following folders are readable and executable by Apache:
 
 Then restart Apache. The application has now been deployed.
 
+[[deploying_python_to_sub_uri]]
+=== Deploying to a sub URI ===
+
+Suppose that you already have a virtual host:
+
+-------------------------------------------
+<VirtualHost *:80>
+    ServerName www.phusion.nl
+    DocumentRoot /websites/phusion
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
+</VirtualHost>
+-------------------------------------------
+
+And you want your Python application, located in `/websites/python`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
+
+To do this, you need to perform the following:
+
+ 1. Set `Alias {SUBURI} {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}`.
+ 2. Create a `<Location /{SUBURI}>` block.
+ 3. Inside the Location block, set `PassengerBaseURI /{SUBURI}`.
+ 4. Inside the Location block, set `PassengerAppRoot {PATH TO YOUR APPLICATION ROOT}`.
+ 5. Create a `<Directory {PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY}>` block.
+ 6. Inside the Directory block, set `Allow from all`.
+ 7. Inside the Directory block, disable MultiViews.
+
+Here is an example:
+
+-------------------------------------------
+<VirtualHost *:80>
+    ServerName www.phusion.nl
+    DocumentRoot /websites/phusion
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
+    
+    # These have been added:
+    Alias /subapp /websites/python/public
+    <Location /subapp>
+        PassengerBaseURI /subapp
+        PassengerAppRoot /websites/python
+    </Location>
+    <Directory /websites/python/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
+</VirtualHost>
+-------------------------------------------
+
+Then restart Apache. The application has now been deployed to the sub-URI.
+
 === Redeploying (restarting the WSGI application) ===
 
 Deploying a new version of a WSGI application is as simple as
@@ -575,10 +612,17 @@ PassengerNodejs /usr/bin/node;
     # If you have a web app deployed in a sub-URI, customize
     # PassengerRuby/PassengerPython inside a <Location> block.
     # The web app under www.bar.com/blog will use JRuby 1.7.1
-    RackBaseURI /blog
+    Alias /blog /websites/blog/public
     <Location /blog>
+        PassengerBaseURI /blog
+        PassengerAppRoot /websites/blog
+
         PassengerRuby /usr/local/rvm/wrappers/jruby-1.7.1/ruby
     </Location>
+    <Directory /websites/blog/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 
 <VirtualHost *:80>
@@ -630,6 +674,22 @@ Example:
 </VirtualHost>
 -----------------------------
 
+[[PassengerBaseURI]]
+==== PassengerBaseURI <uri> ====
+Used to specify that the given URI is a Phusion Passenger-served application. Please refer
+to the following sections for examples:
+
+ * <<deploying_rails_to_sub_uri,Deploying Rails 1.x and 2.x to a sub URI>>
+ * <<deploying_rack_to_sub_uri,Deploying Rack (including Rails >= 3) to a sub URI>>
+ * <<deploying_python_to_sub_uri,Deploying Python to a sub URI>>
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess', if `AllowOverride Options` is on.
+
 ==== PassengerRestartDir <directory>
 As described in the deployment chapters of this document, Phusion Passenger
 checks the file 'tmp/restart.txt' in the applications'
@@ -1358,7 +1418,16 @@ Suppose that you have a web application deployed in a sub-URI '/store', like thi
 <VirtualHost *:80>
    ServerName myblog.com
    DocumentRoot /webapps/wordpress
-   RailsBaseURI /store
+
+   Alias /store /websites/store/public
+    <Location /store>
+        PassengerBaseURI /store
+        PassengerAppRoot /websites/store
+    </Location>
+    <Directory /websites/store/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 ---------------------------
 
@@ -1369,7 +1438,16 @@ like this:
 <VirtualHost *:80>
    ServerName myblog.com
    DocumentRoot /webapps/wordpress
-   RailsBaseURI /store
+
+   Alias /store /websites/store/public
+    <Location /store>
+        PassengerBaseURI /store
+        PassengerAppRoot /websites/store
+    </Location>
+    <Directory /websites/store/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 
 PassengerPreStart http://myblog.com/store    # <----- added
@@ -1809,21 +1887,6 @@ In each place, it may be specified at most once. The default value is 'off'.
 
 === Rack and Rails >= 3 specific options ===
 
-[[RackBaseURI]]
-==== RackBaseURI <uri> ====
-Used to specify that the given URI is a Rack application. See
-<<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>> for an example.
-
-It is allowed to specify this option multiple times. Do this to deploy multiple
-Rack applications in different sub-URIs under the same virtual host.
-
-This option may occur in the following places:
-
- * In the global server configuration.
- * In a virtual host configuration block.
- * In a `<Directory>` or `<Location>` block.
- * In '.htaccess', if `AllowOverride Options` is on.
-
 [[rack_env]]
 ==== RackEnv <string> ====
 The given value will be accessible in Rack applications in the `RACK_ENV`
@@ -1844,21 +1907,6 @@ In each place, it may be specified at most once. The default value is 'productio
 These options only have effect on classic Ruby on Rails 1.x and 2.x applications.
 Ruby on Rails >= 3.x applications are considered Rack applications.
 
-[[RailsBaseURI]]
-==== RailsBaseURI <uri> ====
-Used to specify that the given URI is a Rails application. See
-<<deploying_rails_to_sub_uri,Deploying Rails to a sub URI>> for an example.
-
-It is allowed to specify this option multiple times. Do this to deploy multiple
-Rails applications in different sub-URIs under the same virtual host.
-
-This option may occur in the following places:
-
- * In the global server configuration.
- * In a virtual host configuration block.
- * In a `<Directory>` or `<Location>` block.
- * In '.htaccess', if `AllowOverride Options` is on.
-
 [[rails_env]]
 ==== RailsEnv <string> ====
 This option allows one to specify the default `RAILS_ENV` value.
@@ -1942,6 +1990,9 @@ compatibility reasons.
 ==== RailsRuby ====
 Deprecated in favor of <<PassengerRuby,PassengerRuby>>.
 
+==== RailsBaseURI and RackBaseURI ====
+Deprecated in favor of <<PassengerBaseURI,PassengerBaseURI>>.
+
 ==== RailsUserSwitching ====
 Deprecated in favor of <<PassengerUserSwitching,PassengerUserSwitching>>.