passenger 5.0.10 → 5.0.11

data/doc/Users guide Apache.txt

@@ -906,7 +906,7 @@ include::users_guide_snippets/since_version.txt[]
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-If this option is turned on, and the user's shell is `bash`, then applications are loaded by running them with `bash -l -c`. Otherwise, they are loaded by running them directly from the `PassengerHelperAgent` process.
+If this option is turned on, and the user's shell is `bash`, then applications are loaded by running them with `bash -l -c`. Otherwise, they are loaded by running them directly from the `PassengerAgent core` process.
 
 This option may occur in the following places:
 
@@ -1443,7 +1443,7 @@ The <<PassengerMemoryLimit,PassengerMemoryLimit>> directive uses
 queries `/proc` to obtain additional memory usage information that's
 not obtainable through `ps`. You should ensure that the `ps` works
 correctly and that the `/proc` filesystem is accessible by the
-`PassengerHelperAgent` process.
+`PassengerAgent core` process.
 =====================================================
 
 [CAUTION]

data/doc/Users guide Nginx.html

@@ -1431,7 +1431,7 @@ width:100%;
 <td class="tableblock halign-left valign-top"><p class="tableblock">2.6</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Node.js</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Node.js/io.js</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">0.10</p></td>
 </tr>
 <tr>
@@ -2119,7 +2119,7 @@ kill PID_OF_FLYING_PASSENGER</pre>
 <pre>passenger-memory-stats</pre>
 </div>
 </div>
-<div class="paragraph"><p>You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerWatchdog, PassengerHelperAgent). Congratulations, Phusion Passenger is now installed and running!
+<div class="paragraph"><p>You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerAgent watchdog, PassengerAgent core). Congratulations, Phusion Passenger is now installed and running!
 At this point you may be interested in <a href="#nginx_init_script">creating an Nginx init script</a>.</p></div>
 <div class="paragraph"><p>If the output is not as expected, then please refer to the <a href="#troubleshooting">Troubleshooting</a> section.</p></div>
 </div>
@@ -2231,7 +2231,7 @@ kill PID_OF_FLYING_PASSENGER</pre>
 <pre>./bin/passenger-memory-stats</pre>
 </div>
 </div>
-<div class="paragraph"><p>You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerWatchdog, PassengerHelperAgent). Congratulations, Phusion Passenger is now installed and running!
+<div class="paragraph"><p>You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerAgent watchdog, PassengerAgent core). Congratulations, Phusion Passenger is now installed and running!
 At this point you may be interested in <a href="#nginx_init_script">creating an Nginx init script</a>.</p></div>
 <div class="paragraph"><p>If the output is not as expected, then please refer to the <a href="#troubleshooting">Troubleshooting</a> section.</p></div>
 </div>
@@ -4114,7 +4114,7 @@ In an <em>if</em> configuration scope.
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="PassengerLoadShellEnvvars"></span><h4 data-comment-topic="passenger-load-shell-envvars-on-off--fw5u4l" data-anchor="PassengerLoadShellEnvvars">7.3.14. passenger_load_shell_envvars &lt;on|off&gt;</h4>
 <div class="paragraph"><p><strong>Introduced in version 4.0.20.</strong></p></div>
 <div class="paragraph"><p>Enables or disables the loading of shell environment variables before spawning the application.</p></div>
-<div class="paragraph"><p>If this option is turned on, and the user’s shell is <span class="monospaced">bash</span>, then applications are loaded by running them with <span class="monospaced">bash -l -c</span>. Otherwise, they are loaded by running them directly from the <span class="monospaced">PassengerHelperAgent</span> process.</p></div>
+<div class="paragraph"><p>If this option is turned on, and the user’s shell is <span class="monospaced">bash</span>, then applications are loaded by running them with <span class="monospaced">bash -l -c</span>. Otherwise, they are loaded by running them directly from the <span class="monospaced">PassengerAgent core</span> process.</p></div>
 <div class="paragraph"><p>This option may occur in the following places:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -4958,7 +4958,7 @@ In an <em>if</em> configuration scope.
 queries <span class="monospaced">/proc</span> to obtain additional memory usage information that’s
 not obtainable through <span class="monospaced">ps</span>. You should ensure that the <span class="monospaced">ps</span> works
 correctly and that the <span class="monospaced">/proc</span> filesystem is accessible by the
-<span class="monospaced">PassengerHelperAgent</span> process.</p></div>
+<span class="monospaced">PassengerAgent core</span> process.</p></div>
 </td>
 </tr></table>
 </div>
@@ -7029,7 +7029,7 @@ Attached process 28303 for app /webapps/foobar.
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_blocking_and_concurrency"></span><h4 data-comment-topic="blocking-and-concurrency-g5njp1" data-anchor="_blocking_and_concurrency">10.9.3. Blocking and concurrency</h4>
 <div class="paragraph"><p>Except when otherwise documented, all hooks block in the background. That is, while your hook command is running, Phusion Passenger can still handle web requests, but the background thread which is running your hook will be blocked and won’t be able to perform any further operations. For example, if you wrote a hook script for the <span class="monospaced">attached_process</span> event, then Phusion Passenger won’t be able to attach further processes until your hook script finishes. You should therefore be careful when writing hook scripts.</p></div>
-<div class="paragraph"><p>If you have a bug in your script and it blocks, then you will be able to see that using the command <span class="monospaced">passenger-status --show=backtraces</span> which prints the backtraces of all threads in the Phusion Passenger HelperAgent. Look for the <span class="monospaced">runSingleHookScript</span> function in the backtrace. The following example shows at line 2 that Phusion Passenger is waiting for the hook script <span class="monospaced">/home/phusion/badscript.sh</span>.</p></div>
+<div class="paragraph"><p>If you have a bug in your script and it blocks, then you will be able to see that using the command <span class="monospaced">passenger-status --show=backtraces</span> which prints the backtraces of all threads in the Phusion Passenger core. Look for the <span class="monospaced">runSingleHookScript</span> function in the backtrace. The following example shows at line 2 that Phusion Passenger is waiting for the hook script <span class="monospaced">/home/phusion/badscript.sh</span>.</p></div>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>Thread 'Group process spawner: /home/phusion/webapp.test#default' (0x1062d4000):
@@ -7056,7 +7056,7 @@ Attached process 28303 for app /webapps/foobar.
 </dt>
 <dd>
 <p>
-        Called at the very beginning of Phusion Passenger’s life cycle, during the start of the Watchdog process. The first hook is called before initialization is performed (before the HelperAgent is started). Errors in the hook script cause Phusion Passenger to abort.
+        Called at the very beginning of Phusion Passenger’s life cycle, during the start of the Watchdog process. The first hook is called before initialization is performed (before the Passenger core is started). Errors in the hook script cause Phusion Passenger to abort.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -7565,13 +7565,25 @@ Phusion Passenger’s installer, build system and administration tools are writt
 <p>
 Certain internally used tools, such as the crash handler (which generates a backtrace in case Phusion Passenger crash) and the prespawn script (used to implement
 <a href="#PassengerPreStart">passenger_pre_start</a>)
+are written in Ruby as well.
+</p>
+</li>
+<li>
+<p>
+Ruby web application support is implemented in Ruby.
+</p>
+</li>
+<li>
+<p>
+If you use <a href="#flying_passenger">Flying Passenger</a>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C++ core.
+</p>
+</li>
+<li>
+<p>
+If you use <a href="Users%20guide%20Standalone.html">Phusion Passenger Standalone</a>, then the frontend (the <span class="monospaced">passenger</span> command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C++ core.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>are written in Ruby as well.
- * Ruby web application support is implemented in Ruby.
- * If you use <a href="#flying_passenger">Flying Passenger</a>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C<span class="monospaced"> core.
- * If you use <a href="Users%20guide%20Standalone.html">Phusion Passenger Standalone</a>, then the frontend (the <span class="monospaced">passenger</span> command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C</span> core.</p></div>
 <div class="paragraph"><p>Other than the aforementioned aspects, Phusion Passenger does not use Ruby during normal operation. For example, if you run Python WSGI web applications on Phusion Passenger, then there will be (almost) no Ruby code running on the system.</p></div>
 </div>
 <div class="sect3">
@@ -8339,7 +8351,7 @@ NOTE: Make sure your <span class="monospaced">~/.bashrc</span> is actually inclu
 </div>
 <div class="paragraph"><p>On Debian and Ubuntu, with an Apache installed through apt, Apache environment variables are defined in the file <span class="monospaced">/etc/apache2/envvars</span>. This is a shell script so environment variables must be specified with the shell syntax.</p></div>
 <div class="paragraph"><p>On Red Hat, Fedora, CentOS and ScientificLinux, with an Apache installed through YUM, Apache environment variables are defined in <span class="monospaced">/etc/sysconfig/httpd</span>.</p></div>
-<div class="paragraph"><p>On OS X they are defined in <span class="monospaced">/System/Library/LaunchDaemons/org.apache.httpd.plist</span>, as explained <a href="/System/Library/LaunchDaemons/org.apache.httpd.plist">here on Stack Overflow</a>.</p></div>
+<div class="paragraph"><p>On OS X they are defined in <span class="monospaced">/System/Library/LaunchDaemons/org.apache.httpd.plist</span>, as explained <a href="http://stackoverflow.com/questions/6833939/path-environment-variable-for-apache2-on-mac">here on Stack Overflow</a>.</p></div>
 <div class="paragraph"><p>On other systems, or if you did not install Apache through the system’s package manager, the configuration file for environment variables is specific to the vendor that supplied Apache. There may not even be such a configuration file. You should contact the vendor for support.</p></div>
 </div>
 <div class="sect3">

data/doc/Users guide Nginx.txt

@@ -880,7 +880,7 @@ include::users_guide_snippets/since_version.txt[]
 
 Enables or disables the loading of shell environment variables before spawning the application.
 
-If this option is turned on, and the user's shell is `bash`, then applications are loaded by running them with `bash -l -c`. Otherwise, they are loaded by running them directly from the `PassengerHelperAgent` process.
+If this option is turned on, and the user's shell is `bash`, then applications are loaded by running them with `bash -l -c`. Otherwise, they are loaded by running them directly from the `PassengerAgent core` process.
 
 This option may occur in the following places:
 
@@ -1421,7 +1421,7 @@ The <<PassengerMemoryLimit,passenger_memory_limit>> directive uses the
 queries `/proc` to obtain additional memory usage information that's
 not obtainable through `ps`. You should ensure that the `ps` works
 correctly and that the `/proc` filesystem is accessible by the
-`PassengerHelperAgent` process.
+`PassengerAgent core` process.
 =====================================================
 
 [CAUTION]

data/doc/Users guide Standalone.html

@@ -1276,7 +1276,7 @@ width:100%;
 <td class="tableblock halign-left valign-top"><p class="tableblock">2.6</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Node.js</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Node.js/io.js</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">0.10</p></td>
 </tr>
 <tr>
@@ -2996,13 +2996,25 @@ Phusion Passenger’s installer, build system and administration tools are writt
 <p>
 Certain internally used tools, such as the crash handler (which generates a backtrace in case Phusion Passenger crash) and the prespawn script (used to implement
 <a href="#PassengerPreStart">passenger_pre_start</a>)
+are written in Ruby as well.
+</p>
+</li>
+<li>
+<p>
+Ruby web application support is implemented in Ruby.
+</p>
+</li>
+<li>
+<p>
+If you use <a href="#flying_passenger">Flying Passenger</a>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C++ core.
+</p>
+</li>
+<li>
+<p>
+If you use <a href="Users%20guide%20Standalone.html">Phusion Passenger Standalone</a>, then the frontend (the <span class="monospaced">passenger</span> command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C++ core.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>are written in Ruby as well.
- * Ruby web application support is implemented in Ruby.
- * If you use <a href="#flying_passenger">Flying Passenger</a>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C<span class="monospaced"> core.
- * If you use <a href="Users%20guide%20Standalone.html">Phusion Passenger Standalone</a>, then the frontend (the <span class="monospaced">passenger</span> command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C</span> core.</p></div>
 <div class="paragraph"><p>Other than the aforementioned aspects, Phusion Passenger does not use Ruby during normal operation. For example, if you run Python WSGI web applications on Phusion Passenger, then there will be (almost) no Ruby code running on the system.</p></div>
 </div>
 <div class="sect3">
@@ -3381,7 +3393,7 @@ NOTE: Make sure your <span class="monospaced">~/.bashrc</span> is actually inclu
 </div>
 <div class="paragraph"><p>On Debian and Ubuntu, with an Apache installed through apt, Apache environment variables are defined in the file <span class="monospaced">/etc/apache2/envvars</span>. This is a shell script so environment variables must be specified with the shell syntax.</p></div>
 <div class="paragraph"><p>On Red Hat, Fedora, CentOS and ScientificLinux, with an Apache installed through YUM, Apache environment variables are defined in <span class="monospaced">/etc/sysconfig/httpd</span>.</p></div>
-<div class="paragraph"><p>On OS X they are defined in <span class="monospaced">/System/Library/LaunchDaemons/org.apache.httpd.plist</span>, as explained <a href="/System/Library/LaunchDaemons/org.apache.httpd.plist">here on Stack Overflow</a>.</p></div>
+<div class="paragraph"><p>On OS X they are defined in <span class="monospaced">/System/Library/LaunchDaemons/org.apache.httpd.plist</span>, as explained <a href="http://stackoverflow.com/questions/6833939/path-environment-variable-for-apache2-on-mac">here on Stack Overflow</a>.</p></div>
 <div class="paragraph"><p>On other systems, or if you did not install Apache through the system’s package manager, the configuration file for environment variables is specific to the vendor that supplied Apache. There may not even be such a configuration file. You should contact the vendor for support.</p></div>
 </div>
 <div class="sect3">

data/doc/images/passenger_architecture.svg

@@ -13,7 +13,7 @@
    height="300"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="passenger_architecture.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
@@ -77,14 +77,14 @@
      inkscape:cy="197.81434"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:window-width="1345"
-     inkscape:window-height="860"
-     inkscape:window-x="-1"
+     inkscape:window-width="1359"
+     inkscape:window-height="856"
+     inkscape:window-x="81"
      inkscape:window-y="0"
      height="255px"
      width="690px"
      showgrid="false"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -206,13 +206,14 @@
         <text
            xml:space="preserve"
            style="font-size:19.99363899px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-           x="337.47308"
-           y="122.29496"
+           x="342.47308"
+           y="120.29496"
            id="text2170"><tspan
              sodipodi:role="line"
              id="tspan2172"
-             x="337.47308"
-             y="122.29496">Helper agent</tspan></text>
+             x="342.47308"
+             y="120.29496"
+             style="font-size:16px">Passenger core</tspan></text>
       </g>
     </g>
     <g

data/doc/users_guide_snippets/environment_variables.txt

@@ -177,7 +177,7 @@ On Debian and Ubuntu, with an Apache installed through apt, Apache environment v
 
 On Red Hat, Fedora, CentOS and ScientificLinux, with an Apache installed through YUM, Apache environment variables are defined in `/etc/sysconfig/httpd`.
 
-On OS X they are defined in `/System/Library/LaunchDaemons/org.apache.httpd.plist`, as explained link:/System/Library/LaunchDaemons/org.apache.httpd.plist[here on Stack Overflow].
+On OS X they are defined in `/System/Library/LaunchDaemons/org.apache.httpd.plist`, as explained link:http://stackoverflow.com/questions/6833939/path-environment-variable-for-apache2-on-mac[here on Stack Overflow].
 
 On other systems, or if you did not install Apache through the system's package manager, the configuration file for environment variables is specific to the vendor that supplied Apache. There may not even be such a configuration file. You should contact the vendor for support.
 

data/doc/users_guide_snippets/installation/verify_running_epilogue.txt

@@ -1,4 +1,4 @@
-You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerWatchdog, PassengerHelperAgent). Congratulations, Phusion Passenger is now installed and running!
+You should see the web server processes as well as a number of Phusion Passenger processes (e.g. PassengerAgent watchdog, PassengerAgent core). Congratulations, Phusion Passenger is now installed and running!
 ifdef::nginx[]
 At this point you may be interested in <<nginx_init_script,creating an Nginx init script>>.
 endif::[]

data/doc/users_guide_snippets/support_information.txt

@@ -40,7 +40,7 @@ Supported languages and frameworks:
 | Rubinius            | 2.2.0
 | Ruby on Rails       | 2.3
 | Python              | 2.6
-| Node.js             | 0.10
+| Node.js/io.js       | 0.10
 | Meteor              | 0.6
 |==================================================
 

data/doc/users_guide_snippets/tips.txt

@@ -489,7 +489,7 @@ Here are some of the environment variables which are passed to all hooks, unless
 
 Except when otherwise documented, all hooks block in the background. That is, while your hook command is running, Phusion Passenger can still handle web requests, but the background thread which is running your hook will be blocked and won't be able to perform any further operations. For example, if you wrote a hook script for the `attached_process` event, then Phusion Passenger won't be able to attach further processes until your hook script finishes. You should therefore be careful when writing hook scripts.
 
-If you have a bug in your script and it blocks, then you will be able to see that using the command `passenger-status --show=backtraces` which prints the backtraces of all threads in the Phusion Passenger HelperAgent. Look for the `runSingleHookScript` function in the backtrace. The following example shows at line 2 that Phusion Passenger is waiting for the hook script `/home/phusion/badscript.sh`.
+If you have a bug in your script and it blocks, then you will be able to see that using the command `passenger-status --show=backtraces` which prints the backtraces of all threads in the Phusion Passenger core. Look for the `runSingleHookScript` function in the backtrace. The following example shows at line 2 that Phusion Passenger is waiting for the hook script `/home/phusion/badscript.sh`.
 
 ---------------------------------------------------------------------------------------------------
 Thread 'Group process spawner: /home/phusion/webapp.test#default' (0x1062d4000):
@@ -511,7 +511,7 @@ Because hooks are inherently tied to the implementation of Phusion Passenger, th
 ==== Available hooks
 
 `before_watchdog_initialization`::
-	Called at the very beginning of Phusion Passenger's life cycle, during the start of the Watchdog process. The first hook is called before initialization is performed (before the HelperAgent is started). Errors in the hook script cause Phusion Passenger to abort.
+	Called at the very beginning of Phusion Passenger's life cycle, during the start of the Watchdog process. The first hook is called before initialization is performed (before the Passenger core is started). Errors in the hook script cause Phusion Passenger to abort.
 `after_watchdog_initialization`::
 	Like `before_watchdog_initialization`, but called after initialization of all Phusion Passenger agent processes. Errors in the hook script cause Phusion Passenger to abort.
 `before_watchdog_shutdown`::	

data/doc/users_guide_snippets/under_the_hood/relationship_with_ruby.txt

@@ -16,8 +16,8 @@ endif::[]
 ifdef::standalone[]
 <<PassengerPreStart,passenger_pre_start>>)
 endif::[]
-
 are written in Ruby as well.
+
  * Ruby web application support is implemented in Ruby.
  * If you use <<flying_passenger,Flying Passenger>>, then the Flying Passenger daemon is written in Ruby. The daemon is a small (less than 500 lines of code) and offloads most tasks to the C++ core.
  * If you use link:Users%20guide%20Standalone.html[Phusion Passenger Standalone], then the frontend (the `passenger` command) is written in Ruby. The frontend is small (less than 1500 lines of code) and offloads most tasks to the C++ core.

data/ext/apache2/Bucket.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -51,7 +51,7 @@ struct PassengerBucketState {
 	 */
 	int errorCode;
 
-	/** Connection to the helper agent. */
+	/** Connection to the Passenger core. */
 	FileDescriptor connection;
 
 	PassengerBucketState(const FileDescriptor &conn) {
@@ -75,9 +75,9 @@ typedef boost::shared_ptr<PassengerBucketState> PassengerBucketStatePtr;
  *   to read less data than can actually be read.
  *
  * PassengerBucket is like apr_bucket_pipe, but:
- * - It also holds a reference to the helper agent connection. When a read
- *   error has occured or when end-of-stream has been reached this connection
- *   will be closed.
+ * - It also holds a reference to the connection with the Passenger core.
+ *   When a read error has occured or when end-of-stream has been reached
+ *   this connection will be closed.
  * - It ignores the APR_NONBLOCK_READ flag because that's known to cause
  *   strange I/O problems.
  * - It can store its current state in a PassengerBucketState data structure.

data/ext/apache2/Configuration.cpp

@@ -38,7 +38,7 @@
 #include "Configuration.hpp"
 #include "Utils.h"
 #include "Constants.h"
-#include <agents/LoggingAgent/FilterSupport.h>
+#include <agent/UstRouter/FilterSupport.h>
 
 /* The APR headers must come after the Passenger headers. See Hooks.cpp
  * to learn why.

data/ext/apache2/Configuration.hpp

@@ -61,10 +61,9 @@ using namespace std;
  * Use the getter methods to query information, because those will return
  * the default value if the value is not specified.
  */
-struct DirConfig {
-	enum Threeway { ENABLED, DISABLED, UNSET };
+#include "ConfigurationFields.hpp"
 
-	#include "ConfigurationFields.hpp"
+struct DirConfig : GeneratedDirConfigPart {
 
 	std::set<std::string> baseURIs;
 

data/ext/apache2/ConfigurationFields.hpp

@@ -36,6 +36,8 @@
  *   rake ext/apache2/ConfigurationFields.hpp
  */
 
+struct GeneratedDirConfigPart {
+	enum Threeway { ENABLED, DISABLED, UNSET };
 
 
 	/** Whether to buffer file uploads. */
@@ -93,3 +95,4 @@
 	/** The user that Ruby applications must run as. */
 	const char *user;
 
+};

data/ext/apache2/ConfigurationFields.hpp.erb

@@ -36,6 +36,8 @@
  *   rake ext/apache2/ConfigurationFields.hpp
  */
 
+struct GeneratedDirConfigPart {
+	enum Threeway { ENABLED, DISABLED, UNSET };
 <%
 require 'phusion_passenger/apache2/config_options'
 
@@ -92,3 +94,4 @@ end
 	/** <%= definition[3] %> */
 	<%= definition[0] %>;
 <% end %>
+};

data/ext/apache2/Hooks.cpp

@@ -254,43 +254,43 @@ private:
 		}
 	}
 
-	StaticString getServerAddress() const {
-		return agentsStarter.getServerAddress();
+	StaticString getCoreAddress() const {
+		return agentsStarter.getCoreAddress();
 	}
 
-	StaticString getServerPassword() const {
-		return agentsStarter.getServerPassword();
+	StaticString getCorePassword() const {
+		return agentsStarter.getCorePassword();
 	}
 
 	/**
-	 * Connect to the helper agent. If it looks like the helper agent crashed,
-	 * wait and retry for a short period of time until the helper agent has been
-	 * restarted.
+	 * Connect to the Passenger core. If it looks like the core crashed,
+	 * wait and retry for a short period of time until the core has been
+	 * restarted by the watchdog.
 	 */
 	FileDescriptor connectToInternalServer() {
 		TRACE_POINT();
 		FileDescriptor conn;
 
 		try {
-			conn.assign(connectToServer(getServerAddress(), __FILE__, __LINE__), NULL, 0);
+			conn.assign(connectToServer(getCoreAddress(), __FILE__, __LINE__), NULL, 0);
 		} catch (const SystemException &e) {
 			if (e.code() == EPIPE || e.code() == ECONNREFUSED || e.code() == ENOENT) {
 				UPDATE_TRACE_POINT();
 				bool connected = false;
 
-				// Maybe the helper agent crashed. First wait 50 ms.
+				// Maybe the core crashed. First wait 50 ms.
 				usleep(50000);
 
-				// Then try to reconnect to the helper agent for the
+				// Then try to reconnect to the core for the
 				// next 5 seconds.
 				time_t deadline = time(NULL) + 5;
 				while (!connected && time(NULL) < deadline) {
 					try {
-						conn.assign(connectToServer(getServerAddress(), __FILE__, __LINE__), NULL, 0);
+						conn.assign(connectToServer(getCoreAddress(), __FILE__, __LINE__), NULL, 0);
 						connected = true;
 					} catch (const SystemException &e) {
 						if (e.code() == EPIPE || e.code() == ECONNREFUSED || e.code() == ENOENT) {
-							// Looks like the helper agent hasn't been
+							// Looks like the core hasn't been
 							// restarted yet. Wait between 20 and 100 ms.
 							usleep(20000 + rand() % 80000);
 							// Don't care about thread-safety of rand()
@@ -302,8 +302,8 @@ private:
 
 				if (!connected) {
 					UPDATE_TRACE_POINT();
-					throw IOException("Cannot connect to the helper agent at " +
-						getServerAddress());
+					throw IOException("Cannot connect to the Passenger core at " +
+						getCoreAddress());
 				}
 			} else {
 				throw;
@@ -312,6 +312,19 @@ private:
 		return conn;
 	}
 
+	vector<string> getConfigFiles(server_rec *s) const {
+		server_rec *server;
+		vector<string> result;
+
+		for (server = s; server != NULL; server = server->next) {
+			if (server->defn_name != NULL) {
+				result.push_back(server->defn_name);
+			}
+		}
+
+		return result;
+	}
+
 	bool hasModRewrite() {
 		if (m_hasModRewrite == UNKNOWN) {
 			if (ap_find_linked_module("mod_rewrite.c")) {
@@ -499,7 +512,7 @@ private:
 
 	/**
 	 * Most of the high-level logic for forwarding a request to the
-	 * HelperAgent is contained in this method.
+	 * Passenger core is contained in this method.
 	 */
 	int handleRequest(request_rec *r) {
 		/********** Step 1: preparation work **********/
@@ -573,7 +586,7 @@ private:
 
 
 			/********** Step 3: forwarding the request and request body
-			                    to the HelperAgent **********/
+			                    to the Passenger core **********/
 
 			int ret;
 			bool bodyIsChunked = false;
@@ -587,7 +600,7 @@ private:
 			}
 
 
-			/********** Step 4: forwarding the response from the HelperAgent
+			/********** Step 4: forwarding the response from the Passenger core
 			                    back to the HTTP client **********/
 
 			UPDATE_TRACE_POINT();
@@ -672,7 +685,7 @@ private:
 				}
 				return OK;
 			} else {
-				// HelperAgent sent an empty response, or an invalid response.
+				// Passenger core sent an empty response, or an invalid response.
 				apr_brigade_cleanup(bb);
 				apr_table_setn(r->err_headers_out, "Status", "500 Internal Server Error");
 				return HTTP_INTERNAL_SERVER_ERROR;
@@ -926,7 +939,7 @@ private:
 		// Add secure headers.
 
 		result.append("!~: ", sizeof("!~: ") - 1);
-		result.append(getServerPassword().data(), getServerPassword().size());
+		result.append(getCorePassword().data(), getCorePassword().size());
 		result.append("\r\n!~DOCUMENT_ROOT: ", sizeof("\r\n!~DOCUMENT_ROOT: ") - 1);
 		result.append(ap_document_root(r));
 		result.append("\r\n", 2);
@@ -1222,7 +1235,7 @@ private:
 			}
 		} catch (const SystemException &e) {
 			if (e.code() == EPIPE || e.code() == ECONNRESET) {
-				// The HelperAgent stopped reading the body, probably
+				// The Passenger core stopped reading the body, probably
 				// because the application already sent EOF.
 				return;
 			} else {
@@ -1239,7 +1252,14 @@ public:
 		serverConfig.finalize();
 		Passenger::setLogLevel(serverConfig.logLevel);
 		if (serverConfig.logFile != NULL) {
-			Passenger::setLogFile(serverConfig.logFile);
+			int errcode;
+			if (!Passenger::setLogFileWithoutRedirectingStderr(serverConfig.logFile, &errcode)) {
+				fprintf(stderr,
+					"ERROR: cannot open log file %s: %s (errno=%d)\n",
+					serverConfig.logFile,
+					strerror(errcode),
+					errcode);
+			}
 		}
 		if (serverConfig.fileDescriptorLogFile != NULL) {
 			Passenger::setFileDescriptorLogFile(serverConfig.fileDescriptorLogFile);
@@ -1268,6 +1288,7 @@ public:
 		VariantMap params;
 		params
 			.setPid ("web_server_pid", getpid())
+			.setStrSet("web_server_config_files", getConfigFiles(s))
 			.set    ("server_software", webServerDesc)
 			.setBool("multi_app", true)
 			.setBool("load_shell_envvars", true)
@@ -1295,19 +1316,6 @@ public:
 		serverConfig.ctl.addTo(params);
 
 		agentsStarter.start(serverConfig.root, params);
-
-		// Store some relevant information in the generation directory.
-		string instanceDir = agentsStarter.getInstanceDir();
-		server_rec *server;
-		string configFiles;
-
-		for (server = s; server != NULL; server = server->next) {
-			if (server->defn_name != NULL) {
-				configFiles.append(server->defn_name);
-				configFiles.append(1, '\n');
-			}
-		}
-		createFile(instanceDir + "/config_files.txt", configFiles);
 	}
 
 	void childInit(apr_pool_t *pchild, server_rec *s) {