passenger 4.0.0.rc4 → 4.0.0.rc6

data/doc/Users guide Nginx.idmap.txt

@@ -32,25 +32,41 @@
 
 2.6. Upgrading from open source to Enterprise	=>	upgrading-from-open-source-to-enterprise-1a58c2b
 
-2.7. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-834ymv
+2.7. Cryptographic verification of installation files	=>	cryptographic-verification-of-installation-files-2goray
 
-2.8. Customizing the compilation process	=>	customizing-the-compilation-process-u4cdcf
+2.7.1. Synopsis	=>	synopsis-4fv6zw
 
-2.8.1. Setting the compiler	=>	setting-the-compiler-1l6dpe1
+2.7.2. Importing the Phusion Software Signing key	=>	importing-the-phusion-software-signing-key-1qfpaj4
 
-2.8.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-1jehjon
+2.7.3. Verifying the Phusion Software Signing key	=>	verifying-the-phusion-software-signing-key-i7f1vj
 
-2.8.3. Forcing location of certain command line tools	=>	forcing-location-of-certain-command-line-tools-1j93cki
+2.7.4. Verifying the gem and tarball	=>	verifying-the-gem-and-tarball-dr9466
 
-2.9. Installing as a normal Nginx module without using the installer	=>	installing-as-a-normal-nginx-module-without-using-the-installer-1kkpes5
+2.7.5. Verifying Git signatures	=>	verifying-git-signatures-dyo4fk
 
-2.10. Creating an Nginx init script	=>	creating-an-nginx-init-script-1kd8zg5
+2.7.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-1ed36d5
 
-2.11. Disabling without uninstalling	=>	disabling-without-uninstalling-1t5tqan
+2.7.7. Revocation	=>	revocation-xwvhea
 
-2.12. Uninstalling	=>	uninstalling-phusion-passenger-wuycvb
+2.8. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-834ymv
 
-2.13. Moving to a different directory	=>	moving-to-a-different-directory-gif3wo
+2.9. Customizing the compilation process	=>	customizing-the-compilation-process-u4cdcf
+
+2.9.1. Setting the compiler	=>	setting-the-compiler-1l6dpe1
+
+2.9.2. Adding additional compiler or linker flags	=>	adding-additional-compiler-or-linker-flags-1jehjon
+
+2.9.3. Forcing location of certain command line tools	=>	forcing-location-of-certain-command-line-tools-1j93cki
+
+2.10. Installing as a normal Nginx module without using the installer	=>	installing-as-a-normal-nginx-module-without-using-the-installer-1kkpes5
+
+2.11. Creating an Nginx init script	=>	creating-an-nginx-init-script-1kd8zg5
+
+2.12. Disabling without uninstalling	=>	disabling-without-uninstalling-1t5tqan
+
+2.13. Uninstalling	=>	uninstalling-phusion-passenger-wuycvb
+
+2.14. Moving to a different directory	=>	moving-to-a-different-directory-gif3wo
 
 3. Deploying a Ruby on Rails 1.x or 2.x (but NOT Rails >= 3) application	=>	deploying-a-ruby-on-rails-1-x-or-2-x-but-not-rails-3-application-b69gqa
 

data/doc/Users guide Nginx.txt

@@ -380,7 +380,7 @@ $ some_awesome_editor passenger_wsgi.py
 $ cat passenger_wsgi.py
 def application(environ, start_response):
   start_response('200 OK', [('Content-Type', 'text/plain')])
-  return ["hello world!\n"]
+  return [b"hello world!\n"]
 -------------------------------------------
 
 Finally, we deploy it by adding the following configuration options to
@@ -460,36 +460,76 @@ this option as well. Please read
 
 This required option may only occur once, in the 'http' configuration block.
 
+[[PassengerRuby]]
 === passenger_ruby <filename> ===
-This option allows one to specify the Ruby interpreter to use.
+The `passenger_ruby` option allows one to specify the Ruby interpreter to use. Similarly, the `passenger_python` option is for specifying the Python interpreter.
 
-Since version 4.0.0, this option may occur in the following places:
+In versions prior to 4.0.0, only a single Ruby version was supported for the entire Nginx instance, so `passenger_ruby` may only occur in the global server configuration. Also, the `passenger_python` option was not supported.
+
+Since version 4.0.0, the `passenger_python` option was added. Also, Phusion Passenger supports multiple Ruby or Python interpreters in the same Nginx instance. And so, since version 4.0.0, this option may occur in the following places:
 
  * In the 'http' configuration block.
  * In a 'server' configuration block.
  * In a 'location' configuration block.
  * In an 'if' configuration scope.
 
-If you want to use a different Ruby interpreter for two different applications then you should define different `passenger_ruby` directives in different 'http' blocks.
+The `passenger_ruby` in the `http` block - that is, the one that `passenger-install-nginx-module` outputs - is used for invoking certain Phusion Passenger tools that are written in Ruby, e.g. the internal helper script used by <<PassengerPreStart,passenger_pre_start>>. It is also used as the default Ruby interpreter for Ruby web apps. You don't *have* to specify a `passenger_ruby` in the `http` block though, because the default is to use the first `ruby` command found in `$PATH`.
 
-In versions prior to 4.0.0, only a single Ruby version is supported for the entire Nginx instance, so `passenger_ruby` may only occur in the 'http' configuration block.
+The `passenger_python` option works in a similar manner, but applies to Python instead.
 
-The default value is 'ruby', meaning that the Ruby interpreter will be looked up according to the `PATH` environment variable.
+You can also override `passenger_ruby` or `passenger_python` in specific contexts if you want to use a different Ruby/Python interpreter for that web app. For example:
 
-=== passenger_python <filename> ===
-:version: 4.0.0
-include::users_guide_snippets/since_version.txt[]
+------------------------------
+http {
+    passenger_root ...;
+    
+    # Use Ruby 1.8.7 by default.
+    passenger_ruby /usr/bin/ruby1.8;
+    # Use Python 2.6 by default.
+    passenger_python /usr/bin/python2.6;
 
-This option allows one to specify the Python interpreter to use. It may occur in the following places:
+    server {
+        # This Rails web app will use Ruby 1.8.7
+        listen 80;
+        server_name www.foo.com;
+        root /webapps/foo/public;
+    }
 
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
+    server {
+        # This Rails web app will use Ruby 1.9.3, as installed by RVM
+        passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3/ruby;
 
-If you want to use a different Python interpreter for two different applications then you should define different `passenger_python` directives in different 'http' blocks.
+        listen 80;
+        server_name www.bar.com;
+        root /webapps/bar/public;
+
+        # If you have a web app deployed in a sub-URI, customize
+        # passenger_ruby/passenger_python inside a `location` block.
+        # The web app under www.bar.com/blog will use JRuby 1.7.1
+        passenger_base_uri /blog;
+        location /blog {
+            passenger_ruby /usr/local/rvm/wrappers/jruby-1.7.1/ruby;
+        }
+    }
+
+    server {
+        # This Flask web app will use Python 3.0
+        passenger_python /usr/bin/python3.0;
+
+        listen 80;
+        server_name www.baz.com;
+        root /webapps/baz/public;
+    }
+}
+------------------------------
 
-The default value is 'python', meaning that the Python interpreter will be looked up according to the `PATH` environment variable.
+include::users_guide_snippets/rvm_helper_tool.txt[]
+
+=== passenger_python <filename> ===
+:version: 4.0.0
+include::users_guide_snippets/since_version.txt[]
+
+This option allows one to specify the Python interpreter to use. See <<PassengerRuby,passenger_ruby>> for more information. The default value is 'python', meaning that the Python interpreter will be looked up according to the `PATH` environment variable.
 
 [[PassengerAppRoot]]
 === passenger_app_root <path/to/root> ===
@@ -939,27 +979,15 @@ In each place, it may be specified at most once. The default value is 'on'.
 ==== passenger_max_pool_size <integer> ====
 The maximum number of <<application_process,application processes>> that may
 simultanously exist. A larger number results in higher memory usage,
-but improved ability to handle concurrent HTTP clients.
+but improves the ability to handle concurrent HTTP requests.
 
-The optimal value depends on your system's hardware and the server's average
-load. You should experiment with different values. But generally speaking,
-the value should be at least equal to the number of CPUs (or CPU cores) that
-you have. If your system has 2 GB of RAM, then we recommend a value of '15'.
-If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
-is also running other services such as MySQL, then we recommend a value of '2'.
+The optimal value depends on your system's hardware and your workload. You can learn more at the Phusion article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's conurrency settings].
 
-If you find that your server is unable to handle the load on your Rails/Rack websites
-(i.e. running out of memory) then you should lower this value. (Though if your
-sites are really that popular, then you should strongly consider upgrading your
-hardware or getting more servers.)
+If you find that your server is running out of memory then you should lower this value.
 
 This option may only occur once, in the 'http' configuration block.
 The default value is '6'.
 
-TIP: We strongly recommend you to <<reducing_memory_usage,use Ruby Enterprise
-Edition>>. This allows you to reduce the memory usage of your Ruby on Rails applications
-by about 33%, and it's not hard to install.
-
 [[PassengerMinInstances]]
 ==== passenger_min_instances <integer> ====
 This specifies the minimum number of application processes that should exist for a

data/doc/Users guide Standalone.html

@@ -1198,7 +1198,7 @@ use the <span class="monospaced">-p</span> option, e.g.:</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-03-03 11:14:55 CET
+Last updated 2013-03-06 12:16:21 CET
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/users_guide_snippets/installation.txt

@@ -406,9 +406,26 @@ YUM repositories with RPMs are maintained by link:https://github.com/erikogan/pa
 If you use YUM to install Phusion Passenger then you do not need to run `passenger-install-apache2-module` or `passenger-install-nginx-module`. The YUM packages contain all the binaries that you need. You also don't need to modify any Apache or Nginx configuration to get them to load Phusion Passenger, the packages provide configuration snippets for you as well.
 
 [float]
-==== Step 1: Install the release package
+==== Step 1: Import the Stealthy Monkeys Consulting's GPG key
 
-The easiest way to install Phusion Passenger and keep it up to date is to install the passenger-release package from the link:http://passenger.stealthymonkeys.com/[main repository].
+---------------------------------------------
+rpm --import http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc
+---------------------------------------------
+
+[float]
+==== Step 2: Install the release package
+
+Install the passenger-release package from the link:http://passenger.stealthymonkeys.com/[main repository].
+
+Fedora Core 17:
+---------------------------------------------
+yum install http://passenger.stealthymonkeys.com/fedora/17/passenger-release.noarch.rpm
+---------------------------------------------
+
+Fedora Core 16:
+---------------------------------------------
+yum install http://passenger.stealthymonkeys.com/fedora/16/passenger-release.noarch.rpm
+---------------------------------------------
 
 Fedora Core 15:
 ---------------------------------------------
@@ -420,18 +437,18 @@ Fedora Core 14:
 yum install http://passenger.stealthymonkeys.com/fedora/14/passenger-release.noarch.rpm
 ---------------------------------------------
 
-RHEL 5 / CentOS 5 / ScientificLinux 5: (Note: these packages depend on link:http://fedoraproject.org/wiki/EPEL[EPEL].)
+RHEL 6 / CentOS 6 / ScientificLinux 6: (Note: these packages depend on link:http://fedoraproject.org/wiki/EPEL[EPEL].)
 ---------------------------------------------
-rpm -Uvh http://passenger.stealthymonkeys.com/rhel/5/passenger-release.noarch.rpm
+yum install http://passenger.stealthymonkeys.com/rhel/6/passenger-release.noarch.rpm
 ---------------------------------------------
 
-RHEL 6 / CentOS 6 / ScientificLinux 6:
+RHEL 5 / CentOS 5 / ScientificLinux 5: (Note: these packages depend on link:http://fedoraproject.org/wiki/EPEL[EPEL].)
 ---------------------------------------------
-yum install http://passenger.stealthymonkeys.com/rhel/6/passenger-release.noarch.rpm
+rpm -Uvh http://passenger.stealthymonkeys.com/rhel/5/passenger-release.noarch.rpm
 ---------------------------------------------
 
 [float]
-==== Step 2: Use YUM
+==== Step 3: Install the right Phusion Passenger package
 
 From there you can use link:http://prefetch.net/articles/yum.html[YUM] to install packages. For example, try one of these:
 
@@ -471,6 +488,98 @@ Customers who have bought Phusion Passenger Enterprise can upgrade their open so
 The uninstallation is necessary because the Enterprise Ruby gem has a different gem name ('passenger-enterprise-server' instead of 'passenger'), but the same administration command names (e.g. `passenger-status`). Uninstalling the open source version avoids any conflicts.
 
 
+=== Cryptographic verification of installation files
+
+==== Synopsis
+
+We digitally sign various files with our GPG key so that you can check whether they're legit, i.e. whether they really came from Phusion and haven't been tampered with by a third party. We apply signing since the open source version 4.0.0 RC 4, or the Enterprise version 4.0.0 RC 1.
+
+==== Importing the Phusion Software Signing key
+
+Phusion's GPG key for signing software is as follows:
+
+  Phusion Software Signing (software-signing@phusion.nl)
+  Short key ID: 0x0A212A8C
+  Long key ID: 0x2AC745A50A212A8C
+  Fingerprint: D5F0 8514 2693 9232 F437  AB72 2AC7 45A5 0A21 2A8C
+
+This key is stored at link:http://www.phusion.nl/about/gpg[the Phusion website] and at the key servers link:http://pool.sks-keyservers.net/pks/lookup?op=get&search=0x2AC745A50A212A8C[sks-keyservers.net] and link:http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2AC745A50A212A8C[keyserver.ubuntu.com]. You can import it to your keyring with one of these command:
+
+-------------------------------------------------------------------------
+gpg --keyserver pool.sks-keyservers.net --search-keys 0x2AC745A50A212A8C
+# -OR-
+gpg --keyserver keyserver.ubuntu.com --search-keys 0x2AC745A50A212A8C
+-------------------------------------------------------------------------
+
+The Phusion Software Signing key is only used for signing software. It's never used for signing emails or for encrypting files, so please be suspicious if you encounter usage of this key outside the context of signing software, and alert us at support@phusion.nl. Include "notspam" in the message to bypass our spam filter.
+
+The email address software-signing@phusion.nl redirects to info@phusion.nl so it's safe to send email there.
+
+==== Verifying the Phusion Software Signing key
+
+The Phusion Software Signing key is also *signed by the Phusion founders*. Their keys are as follows:
+
+  Hongli Lai (hongli@phusion.nl)
+  Short key ID: 4B6F4332
+  Long key ID: 06A131094B6F4332
+  Fingerprint: 64E8 0420 FC6A 499F 9E1F  81FA 06A1 3109 4B6F 4332
+
+  Ninh Bui (ninh@phusion.nl)
+  Short key ID: 6FAF3782
+  Long key ID: BA8DA3F46FAF3782
+  Fingerprint: 353A 398C 49AF 5CD5 74A0  656C BA8D A3F4 6FAF 3782
+
+Both keys are stored at both sks-servers.net and keyserver.ubuntu.com. Import them with:
+
+------------------------------------------
+gpg --keyserver pool.sks-servers.net --search-keys 0x06A131094B6F4332
+gpg --keyserver pool.sks-servers.net --search-keys 0xBA8DA3F46FAF3782
+# -OR-
+gpg --keyserver keyserver.ubuntu.com --search-keys 0x06A131094B6F4332
+gpg --keyserver keyserver.ubuntu.com --search-keys 0xBA8DA3F46FAF3782
+------------------------------------------
+
+==== Verifying the gem and tarball
+
+You can find the open source version's gem and tarball GPG signatures at https://www.phusionpassenger.com/signatures/. The Enterprise version's GPG signatures can be found in the link:https://www.phusionpassenger.com/orders[Customer Area]. All signatures have the '.asc' extension. Once you have imported our key, you can verify the validity of a file against its signature as follows:
+
+-----------------------------------------
+$ gpg --verify passenger-x.x.x.tar.gz.asc passenger-x.x.x.tar.gz
+gpg: Signature made Mon Mar 11 09:45:46 2013 CET using RSA key ID 0A212A8C
+gpg: Good signature from "Phusion Software Signing <software-signing@phusion.nl>"
+-----------------------------------------
+
+==== Verifying Git signatures
+
+Tags in the link:https://github.com/FooBarWidget/passenger[Git repository for the open source version] are also tagged. You can verify a Git tag as follows:
+
+-------------------------------------------------------
+$ git tag --verify release-x.x.x
+object d886f34b5705e4314feccaf0d77b9a38416e15e0
+type commit
+tag release-4.0.0.rc5
+tagger Hongli Lai (Phusion) <hongli@phusion.nl> 1362993117 +0100
+
+This is a tag message.
+gpg: Signature made Mon Mar 11 10:12:02 2013 CET using RSA key ID 0A212A8C
+gpg: Good signature from "Phusion Software Signing <software-signing@phusion.nl>"
+-------------------------------------------------------
+
+==== Verifying DEB and RPM packages
+
+The DEB and RPM packages are signed with the signatures of the respective packagers. Phusion does not provide signatures for them.
+
+==== Revocation
+
+In the event our key is compromised, we will revoke the key and upload the revocation information to sks-servers.net and keyserver.ubuntu.com. However your system will not know about the revocation until you update the keys from the keyservers. You should update your keys regularly (e.g. once a week) by invoking:
+
+-------------------------------------------------------
+gpg --refresh-keys --keyserver pool.sks-servers.net
+# -OR-
+gpg --refresh-keys --keyserver keyserver.ubuntu.com
+-------------------------------------------------------
+
+
 === Non-interactive, automatic, headless installs or upgrades
 
 ifdef::apache[]
@@ -586,7 +695,8 @@ If you installed Nginx with one of the generic installation methods then you won
 
 If you prefer to use an init script then please refer to the following resources:
 
-- link:http://wiki.nginx.org/Nginx-init-ubuntu[Init script for Ubuntu]
+- link:http://wiki.nginx.org/Nginx-init-ubuntu[Init script for Ubuntu 8.04-9.10]
+- link:http://library.linode.com/web-servers/nginx/installation/ubuntu-12.04-precise-pangolin#sph_create-an-init-script-to-manage-nginx[Init script for Ubuntu 12.04]
 - link:http://wiki.nginx.org/RedHatNginxInitScript[Init script for Red Hat, Fedora and CentOS]
 
 When using one of those init scripts, please make sure that the paths inside the init script are correct. In particular, the paths to the Nginx binary, to the PID file and to the configuration file must match the actual locations of your Nginx installation.
@@ -620,8 +730,8 @@ NameVirtualHosts *:80
 
 LoadModule passenger_module /somewhere/passenger-x.x.x/ext/apache2/mod_passenger.so
 
-PassengerRuby /usr/bin/ruby
 PassengerRoot /somewhere/passenger/x.x.x
+PassengerDefaultRuby /usr/bin/ruby
 PassengerMaxPoolSize 10
 
 <VirtualHost *:80>
@@ -640,8 +750,8 @@ NameVirtualHosts *:80
 
 # LoadModule passenger_module /somewhere/passenger-x.x.x/ext/apache2/mod_passenger.so
 
-# PassengerRuby /usr/bin/ruby
 # PassengerRoot /somewhere/passenger/x.x.x
+# PassengerDefaultRuby /usr/bin/ruby
 # PassengerMaxPoolSize 10
 
 <VirtualHost *:80>
@@ -715,7 +825,7 @@ done this, you need to remove the Phusion Passenger files.
 - If you installed Phusion Passenger through APT or YUM, then use them to uninstall Phusion Passenger.
 
 ifdef::nginx[]
-Nginx does not have to be recompiled. Altough it contains Phusion Passenger code, it will not do anything when Phusion Passenger is disabled.
+Nginx does not have to be recompiled. Altough it contains Phusion Passenger code, it will not do anything when all Phusion Passenger configuration directives are removed.
 endif::[]
 
 

data/doc/users_guide_snippets/rvm_helper_tool.txt

@@ -0,0 +1,56 @@
+.RVM helper tool
+
+Phusion Passenger provides the `passenger-config --ruby-command` tool for figuring out the correct command for invoking a specific Ruby interpreter. This is especially useful for RVM users. Suppose that you have both Ruby 1.8.7 and Ruby 1.9.3 installed through RVM, and you want to know the correct commands for each Ruby interpreter.
+
+For this purpose we'll want to invoke `passenger-config` using its full path, because each time you `rvm use` a different Ruby interpreter, RVM changes `$PATH`. If you did not install Phusion Passenger through the generic tarball installation method, then here's how you can figure out where `passenger-config` is:
+
+------------------------------
+$ which passenger-config
+/opt/passenger/bin/passenger-config
+------------------------------
+
+Now, switch to all the RVM Ruby interpreters you want to use. In each interpreter, invoke `passenger-config --ruby-command`. For Ruby 1.8.7:
+
+------------------------------
+$ rvm use 1.8.7
+$ /opt/passenger/bin/passenger-config --ruby-command
+passenger-config was invoked through the following Ruby interpreter:
+  Command: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  Version: ruby 1.8.7 (2012-02-08 patchlevel 358) [universal-darwin12.0]
+  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby /opt/passenger/bin/passenger start
+
+The following Ruby interpreter was found first in $PATH:
+  Command: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  Version: ruby 1.8.7 (2012-02-08 patchlevel 358) [universal-darwin12.0]
+  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby
+  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.8.7-p358/ruby /opt/passenger/bin/passenger start
+
+## Notes for RVM users
+Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'.
+------------------------------
+
+Then, for Ruby 1.9.3:
+
+------------------------------
+$ rvm use 1.9.3
+$ /opt/passenger/bin/passenger-config --ruby-command
+passenger-config was invoked through the following Ruby interpreter:
+  Command: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  Version: ruby 1.9.3p392 (2013-02-22 revision 39386) [x86_64-darwin12.2.1]
+  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby /opt/passenger/bin/passenger start
+
+The following Ruby interpreter was found first in $PATH:
+  Command: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  Version: ruby 1.9.3p392 (2013-02-22 revision 39386) [x86_64-darwin12.2.1]
+  To use in Apache: PassengerRuby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  To use in Nginx : passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby
+  To use with Standalone: /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby /opt/passenger/bin/passenger start
+
+## Notes for RVM users
+Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'.
+------------------------------

data/ext/apache2/Bucket.cpp

@@ -83,7 +83,7 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 		 * non-blocking read request, we can prevent ap_content_length_filter
 		 * from buffering all data.
 		 */
-		//return APR_EAGAIN;
+		return APR_EAGAIN;
 	}
 	
 	buf = (char *) apr_bucket_alloc(APR_BUCKET_BUFF_SIZE, bucket->list);

data/ext/apache2/Configuration.cpp

@@ -266,6 +266,7 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
  *************************************************/
 
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_root, root)
+DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_default_ruby, defaultRuby)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_log_level, logLevel, unsigned int, 0)
 DEFINE_SERVER_STR_CONFIG_SETTER(cmd_passenger_debug_log_file, debugLogFile)
 DEFINE_SERVER_INT_CONFIG_SETTER(cmd_passenger_max_pool_size, maxPoolSize, unsigned int, 1)
@@ -466,10 +467,15 @@ const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The Passenger root folder."),
+	AP_INIT_TAKE1("PassengerDefaultRuby",
+		(Take1Func) cmd_passenger_default_ruby,
+		NULL,
+		RSRC_CONF,
+		"The default Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		OR_OPTIONS | ACCESS_CONF,
 		"The Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerPython",
 		(Take1Func) cmd_passenger_python,