passenger 4.0.26 → 4.0.27

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSlyZAAAoJECrHRaUKISqMPoYH/Re2+/VKPaDbGqAdn5Mkz+M6
-GDSzfoGdSnaNN361EKI4kommvEaWYQOu3YoOMa5841rAc7e+cqlmLz4BM68qoNsx
-1Cc9QIBBuO0mwoxzze/Ecqfu/xDzSWC5LveDJb+GAWyk4YTUCUf8w82OTfqf/KSV
-w0IlUApvPFW/Qpddq8g6VyYabcCcJdwa/UNVsCf4h+oTPMC8Ll3R3ZMX3Xzm0Fub
-Au33s0RiVSaGkOhzPAGrDxbajt3pFBs/Gwc4aBJr6Kd5LEynETzZVkjxpDEUVVVd
-lLjPk2hF3pKDy0ZCPPq75gzsgkgo0BZVM2s9auA1kFgIUqQnjkJS/c9FlfACaPo=
-=FcDX
+iQEcBAABAgAGBQJSoJfRAAoJECrHRaUKISqMhQQIAIwDG+KTIMX7DLZDCYYLz+rN
+WBM3NTljzYDC4FRXdek4gqfrILupsAAnrbLyEZibYb3+evJwopod2gLAvwq35BzL
+3QWaDfH1ZYiYA7QgiN1yQNfHQ8hqckxYP/0UF2DqWL/j932oO47zs9XFu7eLrdYN
+dZTAahRvdFnil+/ZlbrvBk7sJcaLpgnEe/BIarOO6012Y45O5aGzvqJOE2vQU/p2
+z7iY0fM3WUbg1n0rh2wipiPvwHCIu4Rfr0mPo9AgV5fN4trsY2s8mDf7/dNyKdIf
+dSuXU/MThKfcHD4jvod5yuxHJdP+FVpViPx61zdJMTGRVhzSo88lo7H5BpGrNzI=
+=mSss
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,11 @@
+Release 4.0.27
+--------------
+
+ * [Apache] Fixed a bug in the Apache module which could lock up the Apache
+   process or thread. This is a regression introduced in version 4.0.24.
+ * Node.js application processes now have friendly process titles.
+
+
 Release 4.0.26
 --------------
 
@@ -12,7 +20,7 @@ Release 4.0.26
 Release 4.0.25
 --------------
 
- * The `PassengerEnv`/`passenger_env`/`--environment` option now also sets NODE_ENV,
+ * The `PassengerAppEnv`/`passenger_app_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.

data/doc/Users guide Apache.idmap.txt

@@ -134,15 +134,21 @@
 
 6.3.4. PassengerNodejs <filename>	=>	passengernodejs-filename--2mjb1j
 
-6.3.5. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
+6.3.5. PassengerAppEnv <string>	=>	passengerappenv-string--s3ojlc
 
-6.3.6. PassengerBaseURI <uri>	=>	passengerbaseuri-uri--97i9mm
+6.3.6. RailsEnv <string>	=>	railsenv-string--1b0xxvu
 
-6.3.7. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+6.3.7. RackEnv <string>	=>	rackenv-string--vve9py
 
-6.3.8. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.3.8. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
 
-6.3.9. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.3.9. PassengerBaseURI <uri>	=>	passengerbaseuri-uri--97i9mm
+
+6.3.10. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+
+6.3.11. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+
+6.3.12. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
 
 6.4. Process spawning options	=>	process-spawning-options-v2vscm
 
@@ -220,39 +226,31 @@
 
 6.9.3. PassengerDebugger <on|off>	=>	passengerdebugger-on-off--19you7e
 
-6.10. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
-
-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. RailsEnv <string>	=>	railsenv-string--1b0xxvu
-
-6.12. Advanced options	=>	advanced-options-1ab1jkq
+6.10. Advanced options	=>	advanced-options-1ab1jkq
 
-6.12.1. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
+6.10.1. PassengerTempDir <directory>	=>	passengertempdir-directory--68h2ng
 
-6.12.2. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
+6.10.2. PassengerUploadBufferDir <directory>	=>	passengeruploadbufferdir-directory--kdr8at
 
-6.13. Deprecated or removed options	=>	deprecated-options-pm9m57
+6.11. Deprecated or removed options	=>	deprecated-options-pm9m57
 
-6.13.1. RailsRuby	=>	railsruby-ht09ei
+6.11.1. RailsRuby	=>	railsruby-ht09ei
 
-6.13.2. RailsBaseURI and RackBaseURI	=>	railsbaseuri-uri--1txrw3k
+6.11.2. RailsBaseURI and RackBaseURI	=>	railsbaseuri-uri--1txrw3k
 
-6.13.3. RailsUserSwitching	=>	railsuserswitching-1npx8y4
+6.11.3. RailsUserSwitching	=>	railsuserswitching-1npx8y4
 
-6.13.4. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
+6.11.4. RailsDefaultUser	=>	railsdefaultuser-19j7n3m
 
-6.13.5. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
+6.11.5. RailsAllowModRewrite	=>	railsallowmodrewrite-1vkziro
 
-6.13.6. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
+6.11.6. RailsSpawnMethod	=>	railsspawnmethod-1aljgpa
 
-6.13.7. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
+6.11.7. RailsAutoDetect, RackAutoDetect and WsgiAutoDetect	=>	railsautodetect-rackautodetect-and-wsgiautodetect-1qgakzs
 
-6.13.8. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
+6.11.8. RailsAppSpawnerIdleTime	=>	railsappspawneridletime-heh41r
 
-6.13.9. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
+6.11.9. RailsFrameworkSpawnerIdleTime	=>	railsframeworkspawneridletime-adcf9k
 
 7. Troubleshooting	=>	troubleshooting-2ihihi
 

data/doc/Users guide Apache.txt

@@ -647,6 +647,39 @@ include::users_guide_snippets/since_version.txt[]
 
 This option allows one to specify the Node.js command to use. See <<PassengerRuby,PassengerRuby>> for more information. The default value is 'node', meaning that the Node.js command will be looked up according to the `PATH` environment variable.
 
+[[PassengerAppEnv]]
+==== PassengerAppEnv <string> ====
+This option sets the value of the following environment variables:
+
+ * `RAILS_ENV`
+ * `RACK_ENV`
+ * `WSGI_ENV`
+ * `NODE_ENV`
+ * `PASSENGER_APP_ENV`
+
+Some web frameworks, for example Rails and Connect.js, adjust their behavior according to the value in one of these environment variables.
+
+Phusion Passenger for Apache sets the default value to **production**. If you're developing an Rails application then you should set this to `development`.
+
+If you want to set other environment variables, please refer to <<env_vars_passenger_apps,Setting environment variables for Phusion Passenger-served apps>>.
+
+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.
+
+In each place, it may be specified at most once.
+
+[[rails_env]]
+==== RailsEnv <string> ====
+An alias for <<PassengerAppEnv,PassengerAppEnv>>.
+
+[[rack_env]]
+==== RackEnv <string> ====
+An alias for <<PassengerAppEnv,PassengerAppEnv>>.
+
 [[PassengerAppRoot]]
 ==== PassengerAppRoot <path/to/root>
 By default, Phusion Passenger assumes that the application's root directory
@@ -1638,6 +1671,9 @@ http://www.foo.com/chatroom/ajax_update_poll only.
 
 [[PassengerBufferUpload]]
 ==== PassengerBufferUpload <on|off> ====
+:version: 4.0.26
+include::users_guide_snippets/since_version.txt[]
+
 When turned on, HTTP request uploads (HTTP POST request bodies) will be buffered before sending the request to the application. Enabling upload buffering protects the application from slow clients, but will also prevent the ability to track upload progress.
 
 If you want to allow your application to track upload progress, it is recommended that you disable upload buffering for specific URIs only. For example:
@@ -1907,41 +1943,6 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
-=== Rack and Rails >= 3 specific options ===
-
-[[rack_env]]
-==== RackEnv <string> ====
-The given value will be accessible in Rack applications in the `RACK_ENV`
-environment variable. This allows one to define the environment in which
-Rack applications are run, very similar to `RAILS_ENV`.
-
-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.
-
-In each place, it may be specified at most once. The default value is 'production'.
-
-=== Classic Ruby on Rails (<= 2.x)-specific options ===
-
-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.
-
-[[rails_env]]
-==== RailsEnv <string> ====
-This option allows one to specify the default `RAILS_ENV` value.
-
-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.
-
-In each place, it may be specified at most once. The default value is 'production'.
-
 === Advanced options
 
 [[PassengerTempDir]]

data/doc/Users guide Nginx.idmap.txt

@@ -124,117 +124,117 @@
 
 6.1. passenger_root <directory>	=>	passenger-root-directory--bqvhhz
 
-6.2. passenger_ruby <filename>	=>	passenger-ruby-filename--1gnok5k
+6.2. Deployment options	=>	deployment-options-1a1vxsp
 
-6.3. passenger_python <filename>	=>	passenger-python-filename--14p554
+6.2.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
 
-6.4. passenger_nodejs <filename>	=>	passenger-nodejs-filename--16hzjsv
+6.2.2. passenger_ruby <filename>	=>	passenger-ruby-filename--1gnok5k
 
-6.5. passenger_app_root <path/to/root>	=>	passenger-app-root-path-to-root--1dbudc6
+6.2.3. passenger_python <filename>	=>	passenger-python-filename--14p554
 
-6.6. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
+6.2.4. passenger_nodejs <filename>	=>	passenger-nodejs-filename--16hzjsv
 
-6.7. passenger_load_shell_envvars <on|off>	=>	passenger-load-shell-envvars-on-off--fw5u4l
+6.2.5. passenger_app_env <string>	=>	passenger-app-env-string--qjeimp
 
-6.8. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
+6.2.6. rails_env <string>	=>	rails-env-string--jlh7v9
 
-6.9. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
+6.2.7. rack_env <string>	=>	rack-env-string--tqmrt0
 
-6.10. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
+6.2.8. passenger_app_root <path/to/root>	=>	passenger-app-root-path-to-root--1dbudc6
 
-6.11. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
+6.2.9. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
 
-6.12. Important deployment options	=>	important-deployment-options-av567
+6.2.10. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
 
-6.12.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
+6.2.11. passenger_load_shell_envvars <on|off>	=>	passenger-load-shell-envvars-on-off--fw5u4l
 
-6.12.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
+6.2.12. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
 
-6.13. Connection handling options	=>	connection-handling-options-8jgq90
+6.2.13. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
 
-6.13.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
+6.3. Connection handling options	=>	connection-handling-options-8jgq90
 
-6.13.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
+6.3.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
 
-6.13.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
+6.3.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
 
-6.13.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
+6.3.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
 
-6.13.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
+6.3.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
 
-6.13.6. passenger_buffers	=>	passenger-busy-buffers
+6.3.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
 
-6.13.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
+6.3.6. passenger_buffers	=>	passenger-busy-buffers
 
-6.13.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
+6.3.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
-6.13.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
+6.3.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
 
-6.13.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
+6.3.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
 
-6.14. Security options	=>	security-options-1bv93g4
+6.3.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
 
-6.14.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
+6.4. Security options	=>	security-options-1bv93g4
 
-6.14.2. passenger_user <username>	=>	passenger-user-username--b06ur7
+6.4.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
 
-6.14.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
+6.4.2. passenger_user <username>	=>	passenger-user-username--b06ur7
 
-6.14.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
+6.4.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
 
-6.14.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
+6.4.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
 
-6.14.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
+6.4.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
 
-6.14.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
+6.4.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
 
-6.15. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
+6.4.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
 
-6.15.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
+6.5. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
 
-6.15.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
+6.5.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
 
-6.15.3. passenger_max_instances <integer>	=>	passenger-max-instances
+6.5.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
 
-6.15.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
+6.5.3. passenger_max_instances <integer>	=>	passenger-max-instances
 
-6.15.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
+6.5.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
 
-6.15.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
+6.5.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
 
-6.15.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
+6.5.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-6.15.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
+6.5.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
 
-6.15.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
+6.5.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
 
-6.15.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
+6.5.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
 
-6.15.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
+6.5.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
 
-6.15.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
+6.5.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
 
-6.15.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
+6.5.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
 
-6.16. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
+6.5.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
 
-6.16.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
+6.6. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 
-6.16.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
+6.6.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
 
-6.16.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
+6.6.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
 
-6.17. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
+6.6.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
 
-6.17.1. rails_env <string>	=>	rails-env-string--jlh7v9
+6.7. Advanced options	=>	advanced-options-hnuhqz
 
-6.18. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
+6.7.1. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
 
-6.18.1. rack_env <string>	=>	rack-env-string--tqmrt0
+6.7.2. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
 
-6.19. Deprecated options	=>	deprecated-options-1dtzo0g
+6.8. Deprecated options	=>	deprecated-options-1dtzo0g
 
-6.19.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
+6.8.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
 
 7. Troubleshooting	=>	troubleshooting-1pt0c76
 

data/doc/Users guide Nginx.txt

@@ -511,8 +511,38 @@ This required option may only occur once, in the 'http' configuration block.
 
 NOTE: This option has no effect when you are using <<flying_passenger,Flying Passenger>>.
 
+=== Deployment options
+
+==== passenger_enabled <on|off>
+This option may be specified in the 'http' configuration block, a
+'server' configuration block, a 'location' configuration block or
+an 'if' configuration scope, to enable or disable Phusion Passenger
+for that server or that location.
+
+Phusion Passenger is disabled by default, so you must explicitly enable
+it for server blocks that you wish to serve through Phusion Passenger.
+Please see <<deploying_a_rack_app,Deploying a Rack-based Ruby application>>
+and <<deploying_a_wsgi_app,Deploying a WSGI (Python) application>>
+for examples.
+
+When using `location` blocks, you must re-specify `passenger_enabled` in each `location` block that you want to enable Phusion Passenger. This is because each `location` block has `passenger_enabled` turned off by default. For example:
+
+----------------------------
+server {
+    listen 80;
+    server_name www.foo.com;
+    root /webapps/foo/public;
+    passenger_enabled on;
+
+    location /attachments {
+        # Re-specify passenger_enabled here!
+        passenger_enabled on;
+    }
+}
+----------------------------
+
 [[PassengerRuby]]
-=== passenger_ruby <filename> ===
+==== passenger_ruby <filename>
 The `passenger_ruby` option allows one to specify the Ruby interpreter to use. Similarly, the `passenger_python` and `passenger_nodejs` options are for specifying the Python interpreter and Node.js commands, respectively.
 
 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.
@@ -581,20 +611,53 @@ http {
 
 include::users_guide_snippets/rvm_helper_tool.txt[]
 
-=== passenger_python <filename> ===
+==== 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.
 
-=== passenger_nodejs <filename> ===
+==== passenger_nodejs <filename>
 :version: 4.0.24
 include::users_guide_snippets/since_version.txt[]
 
 This option allows one to specify the Node.js command to use. See <<PassengerRuby,passenger_ruby>> for more information. The default value is 'node', meaning that the Node.js command will be looked up according to the `PATH` environment variable.
 
+[[PassengerAppEnv]]
+==== passenger_app_env <string>
+This option sets the value of the following environment variables:
+
+ * `RAILS_ENV`
+ * `RACK_ENV`
+ * `WSGI_ENV`
+ * `NODE_ENV`
+ * `PASSENGER_APP_ENV`
+
+Some web frameworks, for example Rails and Connect.js, adjust their behavior according to the value in one of these environment variables.
+
+Phusion Passenger for Nginx sets the default value to **production**. If you're developing an Rails application then you should set this to `development`.
+
+If you want to set other environment variables, please refer to <<env_vars_passenger_apps,Setting environment variables for Phusion Passenger-served apps>>.
+
+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.
+
+In each place, it may be specified at most once. The default value is 'production'.
+
+[[RailsEnv]]
+==== rails_env <string>
+An alias for <<PassengerAppEnv,passenger_app_env>>.
+
+[[RackEnv]]
+==== rack_env <string>
+An alias for <<PassengerAppEnv,passenger_app_env>>.
+
 [[PassengerAppRoot]]
-=== passenger_app_root <path/to/root> ===
+==== passenger_app_root <path/to/root>
 :version: 4.0.0
 include::users_guide_snippets/since_version.txt[]
 By default, Phusion Passenger assumes that the application's root directory
@@ -624,8 +687,28 @@ server {
 }
 -----------------------------
 
+[[PassengerBaseURI]]
+==== passenger_base_uri <uri>
+Used to specify that the given URI is an distinct application that should
+be served by Phusion Passenger. Please refer to the following sections for
+more information:
+
+ * <<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>>
+ * <<deploying_wsgi_to_sub_uri,Deploying WSGI to a sub URI>>
+ * <<deploying_rails_to_sub_uri,Deploying Rails 1 and Rails 2 to a sub URI>>
+
+It is allowed to specify this option multiple times. Do this to deploy multiple
+applications in different sub-URIs under the same virtual host.
+
+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.
+
 [[PassengerSpawnMethod]]
-=== passenger_spawn_method <string> ===
+==== passenger_spawn_method <string>
 [TIP]
 ."What spawn method should I use?"
 =========================================================
@@ -653,7 +736,7 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'smart'.
 
 [[PassengerLoadShellEnvvars]]
-=== passenger_load_shell_envvars <on|off> ===
+==== passenger_load_shell_envvars <on|off>
 :version: 4.0.20
 include::users_guide_snippets/since_version.txt[]
 
@@ -671,7 +754,7 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'on'.
 
 [[PassengerRollingRestarts]]
-=== passenger_rolling_restarts <on|off> ===
+==== passenger_rolling_restarts <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
 
@@ -711,7 +794,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
-=== passenger_resist_deployment_errors <on|off> ===
+==== passenger_resist_deployment_errors <on|off>
 :version: 3.0.0
 include::users_guide_snippets/enterprise_only.txt[]
 
@@ -738,95 +821,6 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
-[[PassengerTempDir]]
-=== passenger_temp_dir <directory> ===
-Specifies the directory that Phusion Passenger should use for storing temporary
-files. This includes things such as Unix socket files.
-
-This option may only be specified in the 'http' configuration block. The
-default temp directory that Phusion Passenger uses is '/tmp'.
-
-This option is especially useful if Nginx is not allowed to write to /tmp
-(which is the case on some systems with strict SELinux policies) or if the
-partition that /tmp lives on doesn't have enough disk space.
-
-.Command line tools
-Some Phusion Passenger command line administration tools, such as
-`passenger-status`, must know what Phusion Passenger's temp directory is
-in order to function properly. You can pass the directory through the
-`PASSENGER_TMPDIR` environment variable, or the `TMPDIR` environment variable
-(the former will be used if both are specified).
-
-For example, if you set 'passenger_temp_dir' to '/my_temp_dir', then invoke
-`passenger-status` after you've set the `PASSENGER_TMPDIR` or `TMPDIR`
-environment variable, like this:
-
-----------------------------------------------------------
-export PASSENGER_TMPDIR=/my_temp-dir
-sudo -E passenger-status
-# The -E option tells 'sudo' to preserve environment variables.
-----------------------------------------------------------
-
-:option: `--temp-dir`
-include::users_guide_snippets/alternative_for_flying_passenger.txt[]
-
-=== passenger_fly_with <socket filename>
-:version: 4.1.0
-include::users_guide_snippets/enterprise_only.txt[]
-
-Enables <<flying_passenger,Flying Passenger>> mode, and configures Nginx to connect to the Flying Passenger daemon that's listening on the given socket filename.
-
-This option may only occur once, in the 'http' configuration block. When not set, Flying Passenger is not enabled.
-
-=== Important deployment options ===
-==== passenger_enabled <on|off> ====
-This option may be specified in the 'http' configuration block, a
-'server' configuration block, a 'location' configuration block or
-an 'if' configuration scope, to enable or disable Phusion Passenger
-for that server or that location.
-
-Phusion Passenger is disabled by default, so you must explicitly enable
-it for server blocks that you wish to serve through Phusion Passenger.
-Please see <<deploying_a_rack_app,Deploying a Rack-based Ruby application>>
-and <<deploying_a_wsgi_app,Deploying a WSGI (Python) application>>
-for examples.
-
-When using `location` blocks, you must re-specify `passenger_enabled` in each `location` block that you want to enable Phusion Passenger. This is because each `location` block has `passenger_enabled` turned off by default. For example:
-
-----------------------------
-server {
-    listen 80;
-    server_name www.foo.com;
-    root /webapps/foo/public;
-    passenger_enabled on;
-
-    location /attachments {
-        # Re-specify passenger_enabled here!
-        passenger_enabled on;
-    }
-}
-----------------------------
-
-[[PassengerBaseURI]]
-==== passenger_base_uri <uri> ====
-Used to specify that the given URI is an distinct application that should
-be served by Phusion Passenger. Please refer to the following sections for
-more information:
-
- * <<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>>
- * <<deploying_wsgi_to_sub_uri,Deploying WSGI to a sub URI>>
- * <<deploying_rails_to_sub_uri,Deploying Rails 1 and Rails 2 to a sub URI>>
-
-It is allowed to specify this option multiple times. Do this to deploy multiple
-applications in different sub-URIs under the same virtual host.
-
-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.
-
 === Connection handling options ===
 
 ==== passenger_ignore_client_abort <on|off> ====
@@ -1790,33 +1784,47 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'off'.
 
 
-=== Ruby on Rails-specific options ===
-[[RailsEnv]]
-==== rails_env <string> ====
-This option allows one to specify the default `RAILS_ENV` value.
+=== Advanced options
 
-This option may occur in the following places:
+[[PassengerTempDir]]
+==== passenger_temp_dir <directory>
+Specifies the directory that Phusion Passenger should use for storing temporary
+files. This includes things such as Unix socket files.
 
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
+This option may only be specified in the 'http' configuration block. The
+default temp directory that Phusion Passenger uses is '/tmp'.
 
-In each place, it may be specified at most once. The default value is 'production'.
+This option is especially useful if Nginx is not allowed to write to /tmp
+(which is the case on some systems with strict SELinux policies) or if the
+partition that /tmp lives on doesn't have enough disk space.
 
-=== Rack and Rails >= 3 specific options ===
-[[RackEnv]]
-==== rack_env <string> ====
-This option allows one to specify the default `RACK_ENV` value.
+.Command line tools
+Some Phusion Passenger command line administration tools, such as
+`passenger-status`, must know what Phusion Passenger's temp directory is
+in order to function properly. You can pass the directory through the
+`PASSENGER_TMPDIR` environment variable, or the `TMPDIR` environment variable
+(the former will be used if both are specified).
 
-This option may occur in the following places:
+For example, if you set 'passenger_temp_dir' to '/my_temp_dir', then invoke
+`passenger-status` after you've set the `PASSENGER_TMPDIR` or `TMPDIR`
+environment variable, like this:
 
- * In the 'http' configuration block.
- * In a 'server' configuration block.
- * In a 'location' configuration block.
- * In an 'if' configuration scope.
+----------------------------------------------------------
+export PASSENGER_TMPDIR=/my_temp-dir
+sudo -E passenger-status
+# The -E option tells 'sudo' to preserve environment variables.
+----------------------------------------------------------
 
-In each place, it may be specified at most once. The default value is 'production'.
+:option: `--temp-dir`
+include::users_guide_snippets/alternative_for_flying_passenger.txt[]
+
+==== passenger_fly_with <socket filename>
+:version: 4.1.0
+include::users_guide_snippets/enterprise_only.txt[]
+
+Enables <<flying_passenger,Flying Passenger>> mode, and configures Nginx to connect to the Flying Passenger daemon that's listening on the given socket filename.
+
+This option may only occur once, in the 'http' configuration block. When not set, Flying Passenger is not enabled.
 
 
 === Deprecated options ===

data/doc/Users guide Standalone.txt

@@ -38,7 +38,7 @@ Most configuration is done by customizing the arguments passed to the `passenger
 `--port NUMBER`::
 	The port number that Phusion Passenger Standalone should listen on. If not given, port 3000 is assumed.
 `--environment NAME`::
-	Customizes the value of the `RAILS_ENV`, `RACK_ENV`, `WSGI_ENV`, `NODE_ENV` and `PASSENGER_ENV` environment variables. Some web frameworks, for example Rails and Connect.js, adjust their behavior according to the environment. The default value is 'development'.
+	Customizes the value of the `RAILS_ENV`, `RACK_ENV`, `WSGI_ENV`, `NODE_ENV` and `PASSENGER_APP_ENV` environment variables. Some web frameworks, for example Rails and Connect.js, adjust their behavior according to the environment. The default value is 'development'.
 `--max-pool-size NUMBER`::
 	The maximum number of application processes to run. The maximum number that you can run depends on the amount of memory your server has. The article link:http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/[Tuning Phusion Passenger's concurrency settings] explains how you can infer a good number for this option.
 `--min-instances NUMBER`::

data/ext/apache2/Configuration.cpp

@@ -189,7 +189,6 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	
 	#include "CreateDirConfig.cpp"
 
-	config->environment = NULL;
 	config->appRoot = NULL;
 	config->spawnMethod = DirConfig::SM_UNSET;
 	config->maxPreloaderIdleTime = -1;
@@ -219,7 +218,6 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 		config->baseURIs.insert(*it);
 	}
 	
-	MERGE_STR_CONFIG(environment);
 	MERGE_STR_CONFIG(appRoot);
 	MERGE_STRING_CONFIG(appGroupName);
 	config->spawnMethod = (add->spawnMethod == DirConfig::SM_UNSET) ? base->spawnMethod : add->spawnMethod;
@@ -280,7 +278,6 @@ cmd_passenger_pre_start(cmd_parms *cmd, void *pcfg, const char *arg) {
 
 #include "ConfigurationSetters.cpp"
 
-DEFINE_DIR_STR_CONFIG_SETTER(cmd_environment, environment)
 DEFINE_DIR_INT_CONFIG_SETTER(cmd_passenger_stat_throttle_rate, statThrottleRate, unsigned long, 0)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_root, appRoot)
 DEFINE_DIR_STR_CONFIG_SETTER(cmd_passenger_app_group_name, appGroupName)
@@ -633,20 +630,6 @@ const command_rec passenger_commands[] = {
 		OR_ALL,
 		"The number of threads that Phusion Passenger should spawn per application."),
 
-	// Rails-specific settings.
-	AP_INIT_TAKE1("RailsEnv",
-		(Take1Func) cmd_environment,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The environment under which a Rails app must run."),
-	
-	// Rack-specific settings.
-	AP_INIT_TAKE1("RackEnv",
-		(Take1Func) cmd_environment,
-		NULL,
-		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
-		"The environment under which a Rack app must run."),
-	
 	// Backwards compatibility options.
 	AP_INIT_TAKE1("RailsRuby",
 		(Take1Func) cmd_passenger_ruby,

data/ext/apache2/Configuration.hpp

@@ -70,10 +70,6 @@ struct DirConfig {
 
 	std::set<std::string> baseURIs;
 	
-	/** The environment (RAILS_ENV/RACK_ENV/WSGI_ENV) under which
-	 * applications should operate. */
-	const char *environment;
-	
 	/** The path to the application's root (for example: RAILS_ROOT
 	 * for Rails applications, directory containing 'config.ru'
 	 * for Rack applications). If this value is NULL, the default
@@ -155,14 +151,6 @@ struct DirConfig {
 		return enabled != DISABLED;
 	}
 	
-	StaticString getEnvironment() const {
-		if (environment != NULL) {
-			return environment;
-		} else {
-			return "production";
-		}
-	}
-	
 	StaticString getAppGroupName(const StaticString &appRoot) const {
 		if (appGroupName.empty()) {
 			return appRoot;

data/ext/apache2/ConfigurationCommands.cpp

@@ -39,96 +39,133 @@
 
 
 
+	
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The Ruby interpreter to use."),
 
+	
 	AP_INIT_TAKE1("PassengerPython",
 		(Take1Func) cmd_passenger_python,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The Python interpreter to use."),
 
+	
 	AP_INIT_TAKE1("PassengerNodejs",
 		(Take1Func) cmd_passenger_nodejs,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"The Node.js command to use."),
 
+	
+	AP_INIT_TAKE1("PassengerAppEnv",
+		(Take1Func) cmd_passenger_app_env,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"The environment under which applications are run."),
+
+	
+	AP_INIT_TAKE1("RailsEnv",
+		(Take1Func) cmd_passenger_app_env,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"The environment under which applications are run."),
+
+	
+	AP_INIT_TAKE1("RackEnv",
+		(Take1Func) cmd_passenger_app_env,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"The environment under which applications are run."),
+
+	
 	AP_INIT_TAKE1("PassengerMinInstances",
 		(Take1Func) cmd_passenger_min_instances,
 		NULL,
 		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
 		"The minimum number of application instances to keep when cleaning idle instances."),
 
+	
 	AP_INIT_TAKE1("PassengerUser",
 		(Take1Func) cmd_passenger_user,
 		NULL,
 		ACCESS_CONF | RSRC_CONF,
 		"The user that Ruby applications must run as."),
 
+	
 	AP_INIT_TAKE1("PassengerGroup",
 		(Take1Func) cmd_passenger_group,
 		NULL,
 		ACCESS_CONF | RSRC_CONF,
 		"The group that Ruby applications must run as."),
 
+	
 	AP_INIT_FLAG("PassengerErrorOverride",
 		(FlagFunc) cmd_passenger_error_override,
 		NULL,
 		OR_ALL,
 		"Allow Apache to handle error response."),
 
+	
 	AP_INIT_TAKE1("PassengerMaxRequests",
 		(Take1Func) cmd_passenger_max_requests,
 		NULL,
 		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
 		"The maximum number of requests that an application instance may process."),
 
+	
 	AP_INIT_TAKE1("PassengerStartTimeout",
 		(Take1Func) cmd_passenger_start_timeout,
 		NULL,
 		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
 		"A timeout for application startup."),
 
+	
 	AP_INIT_FLAG("PassengerHighPerformance",
 		(FlagFunc) cmd_passenger_high_performance,
 		NULL,
 		OR_ALL,
 		"Enable or disable Passenger's high performance mode."),
 
+	
 	AP_INIT_FLAG("PassengerEnabled",
 		(FlagFunc) cmd_passenger_enabled,
 		NULL,
 		OR_ALL,
 		"Enable or disable Phusion Passenger."),
 
+	
 	AP_INIT_TAKE1("PassengerMaxRequestQueueSize",
 		(Take1Func) cmd_passenger_max_request_queue_size,
 		NULL,
 		OR_ALL,
 		"The maximum number of queued requests."),
 
+	
 	AP_INIT_FLAG("PassengerLoadShellEnvvars",
 		(FlagFunc) cmd_passenger_load_shell_envvars,
 		NULL,
 		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
 		"Whether to load environment variables from the shell before running the application."),
 
+	
 	AP_INIT_FLAG("PassengerBufferUpload",
 		(FlagFunc) cmd_passenger_buffer_upload,
 		NULL,
 		OR_ALL,
 		"Whether to buffer file uploads."),
 
+	
 	AP_INIT_TAKE1("PassengerAppType",
 		(Take1Func) cmd_passenger_app_type,
 		NULL,
 		OR_ALL,
 		"Force specific application type."),
 
+	
 	AP_INIT_TAKE1("PassengerStartupFile",
 		(Take1Func) cmd_passenger_startup_file,
 		NULL,

data/ext/apache2/ConfigurationCommands.cpp.erb

@@ -39,6 +39,18 @@
 <%
 require 'phusion_passenger/apache2/config_options'
 
+def resolve_possible_alias(option)
+	if option[:alias_for]
+		the_alias = APACHE2_DIRECTORY_CONFIGURATION_OPTIONS.find do |o|
+			o[:name] == option[:alias_for]
+		end.dup
+		the_alias[:aliased_for] = option[:name]
+		return the_alias
+	else
+		return option
+	end
+end
+
 def macro_for(option)
 	case option[:type]
 	when :string, :integer
@@ -83,6 +95,7 @@ end
 %>
 
 <% for option in APACHE2_DIRECTORY_CONFIGURATION_OPTIONS %>
+	<% option = resolve_possible_alias(option) %>
 	<%= macro_for(option) %>(<%= name_for(option) %>,
 		(<%= function_type_for(option) %>) <%= function_for(option) %>,
 		NULL,

data/ext/apache2/ConfigurationFields.hpp

@@ -56,6 +56,8 @@
 	int minInstances;
 	/** A timeout for application startup. */
 	int startTimeout;
+	/** The environment under which applications are run. */
+	const char *appEnv;
 	/** Force specific application type. */
 	const char *appType;
 	/** The group that Ruby applications must run as. */

data/ext/apache2/ConfigurationSetters.cpp

@@ -63,6 +63,14 @@
 		}
 	
 	
+		static const char *
+		cmd_passenger_app_env(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->appEnv = arg;
+			return NULL;
+		}
+	
+	
 		static const char *
 		cmd_passenger_min_instances(cmd_parms *cmd, void *pcfg, const char *arg) {
 			DirConfig *config = (DirConfig *) pcfg;

data/ext/apache2/CreateDirConfig.cpp

@@ -41,6 +41,7 @@
 			config->ruby = NULL;
 				config->python = NULL;
 				config->nodejs = NULL;
+				config->appEnv = NULL;
 				config->minInstances = UNSET_INT_VALUE;
 				config->user = NULL;
 				config->group = NULL;

data/ext/apache2/Hooks.cpp

@@ -696,7 +696,7 @@ private:
 					int originalStatus = r->status;
 					r->status = HTTP_OK;
 					return originalStatus;
-				} if (ap_pass_brigade(r->output_filters, bb) == APR_SUCCESS) {
+				} else if (ap_pass_brigade(r->output_filters, bb) == APR_SUCCESS) {
 					apr_brigade_cleanup(bb);
 				}
 				return OK;
@@ -951,7 +951,6 @@ private:
 		addHeader(output, "PASSENGER_APP_ROOT", mapper.getAppRoot());
 		addHeader(output, "PASSENGER_APP_GROUP_NAME", config->getAppGroupName(mapper.getAppRoot()));
 		#include "SetHeaders.cpp"
-		addHeader(output, "PASSENGER_ENV", config->getEnvironment());
 		addHeader(output, "PASSENGER_SPAWN_METHOD", config->getSpawnMethodString());
 		addHeader(r, output, "PASSENGER_MAX_REQUEST_QUEUE_SIZE", config->maxRequestQueueSize);
 		addHeader(output, "PASSENGER_APP_TYPE", mapper.getApplicationTypeName());

data/ext/apache2/MergeDirConfig.cpp

@@ -61,6 +61,13 @@
 	
 
 	
+		config->appEnv =
+			(add->appEnv == NULL) ?
+			base->appEnv :
+			add->appEnv;
+	
+
+	
 		config->minInstances =
 			(add->minInstances == UNSET_INT_VALUE) ?
 			base->minInstances :

data/ext/apache2/SetHeaders.cpp

@@ -52,6 +52,10 @@
 	
 
 	
+		addHeader(output, "PASSENGER_APP_ENV", config->appEnv);
+	
+
+	
 		addHeader(r, output, "PASSENGER_MIN_INSTANCES", config->minInstances);
 	
 

data/ext/common/ApplicationPool2/Spawner.h

@@ -1005,7 +1005,7 @@ protected:
 		appendNullTerminatedKeyValue(result, "RACK_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "WSGI_ENV", options.environment);
 		appendNullTerminatedKeyValue(result, "NODE_ENV", options.environment);
-		appendNullTerminatedKeyValue(result, "PASSENGER_ENV", options.environment);
+		appendNullTerminatedKeyValue(result, "PASSENGER_APP_ENV", options.environment);
 		if (!options.baseURI.empty() && options.baseURI != "/") {
 			appendNullTerminatedKeyValue(result,
 				"RAILS_RELATIVE_URL_ROOT",

data/ext/common/Constants.h

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

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1715,7 +1715,7 @@ private:
 		options.defaultGroup = this->options.defaultGroup;
 		fillPoolOption(client, options.appGroupName, "PASSENGER_APP_GROUP_NAME");
 		fillPoolOption(client, options.appType, "PASSENGER_APP_TYPE");
-		fillPoolOption(client, options.environment, "PASSENGER_ENV");
+		fillPoolOption(client, options.environment, "PASSENGER_APP_ENV");
 		fillPoolOption(client, options.ruby, "PASSENGER_RUBY");
 		fillPoolOption(client, options.python, "PASSENGER_PYTHON");
 		fillPoolOption(client, options.nodejs, "PASSENGER_NODEJS");

data/ext/nginx/CacheLocationConfig.c

@@ -66,7 +66,7 @@ u_char int_buf[32], *end, *buf, *pos;
 
 	
 		if (conf->environment.data != NULL) {
-			len += 14;
+			len += 18;
 			len += conf->environment.len + 1;
 		}
 	
@@ -282,8 +282,8 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->environment.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_ENV",
-				14);
+				"PASSENGER_APP_ENV",
+				18);
 			pos = ngx_copy(pos,
 				conf->environment.data,
 				conf->environment.len);

data/helper-scripts/node-loader.js

@@ -79,6 +79,7 @@ function setupEnvironment(options) {
 	PhusionPassenger.configure = configure;
 	PhusionPassenger._requestHandler = new RequestHandler(loadApplication);
 	PhusionPassenger._appInstalled = false;
+	process.title = 'Passenger NodeApp: ' + options.app_root;
 	http.Server.prototype.originalListen = http.Server.prototype.listen;
 	http.Server.prototype.listen = installServer;
 

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.26'
+	VERSION_STRING = '4.0.27'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/apache2/config_options.rb

@@ -66,6 +66,23 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 		:type => :string,
 		:desc => "The Node.js command to use."
 	},
+	{
+		:name => "PassengerAppEnv",
+		:type => :string,
+		:desc => "The environment under which applications are run."
+	},
+	{
+		:name => "RailsEnv",
+		:type => :string,
+		:desc => "The environment under which applications are run.",
+		:alias_for => "PassengerAppEnv"
+	},
+	{
+		:name => "RackEnv",
+		:type => :string,
+		:desc => "The environment under which applications are run.",
+		:alias_for => "PassengerAppEnv"
+	},
 	{
 		:name => "PassengerMinInstances",
 		:type => :integer,

data/lib/phusion_passenger/nginx/config_options.rb

@@ -107,8 +107,7 @@ LOCATION_CONFIGURATION_OPTIONS = [
 	{
 		:name  => 'passenger_app_env',
 		:type  => :string,
-		:field => 'environment',
-		:header => 'PASSENGER_ENV'
+		:field => 'environment'
 	},
 	{
 		:name  => 'passenger_friendly_error_pages',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.26
+  version: 4.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-05 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
 
-iQEcBAABAgAGBQJSlyZAAAoJECrHRaUKISqMzmAIAKh3MngqbrFZ+mTHye4dMU9r
-3lIBO9lZSnqR+bM0PkhCwQBhDerzw6nt0u2jovzLRpvEtpayjxNgrbYlYwBqV2CX
-sbKzRIU/RW9qT+lJIzeNc8H+0xR6OJXWOOZb4tTgm8KYPG1yX0RO/wKXFhNCG+rF
-Eo7AwFghaq7bIeBYPPb/bUsh7bRbYzoTkXvktTG3eY37e0js94i6H17mrA6VJB7h
-oviBXFclSrv6DkX8Z+VqUeS6PZnYBwKTJLG5GkF5cEvaHbkWr+enjsJ17cNkQKZ8
-dsk5oBakxI3f0Ef3J7qcQvX5QdQadRpNWRuK0txL5UAwTXKgdFc1OL0QN0nF368=
-=ozSM
+iQEcBAABAgAGBQJSoJfRAAoJECrHRaUKISqM/j0IAJbxv5UWZxTICe0kyJOinOR3
+biccIqm1CN9UPHv9RavwralUWLnhXYXeHY3YoXTvl0yXwnoYkO2zDHc/pUn+CXj0
+XZYb8+7Nj/iwoYZJiFRTOQnb7CE1d244dEEwE5JL/eSu6H53DIboJtY8Ako2yWBa
+zZu4Ijq6Zz8Cv5PIp1+lVa3n4ZSBN5+/rqFYhO9CYwOlI04++CxM36f1LUGh0BkT
+ujwIa11aOXjO4HKi1bqRF1dhkK/T7iLy7ZMRWK5G5f+SGVZ78fCN7Fr2w7OfsPPo
+xwsiB/cZj/y/+b0ir8AF7icuGuxS9Ixbw7Ru1GvivDY4kghug7X3Vnhx987HKOg=
+=NuX6
 -----END PGP SIGNATURE-----