passenger 2.2.1 → 2.2.2

data/doc/cxxapi/DirectoryMapper_8h-source.html

@@ -316,7 +316,7 @@
 <a name="l00295"></a>00295 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_DIRECTORY_MAPPER_H_ */</span>
 <a name="l00296"></a>00296 
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:37 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Hooks_8h-source.html

@@ -65,7 +65,7 @@
 <a name="l00044"></a>00044 <span class="preprocessor"></span>
 <a name="l00045"></a>00045 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_HOOKS_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:37 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/annotated.html

@@ -27,7 +27,7 @@
   <tr><td class="indexkey"><a class="el" href="classHooks.html">Hooks</a></td><td class="indexvalue">Apache hook functions, wrapped in a class </td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classHooks-members.html

@@ -28,7 +28,7 @@
   <tr class="memlist"><td><a class="el" href="classHooks.html#d6cca64be8a9075b4b92efdb4d9020a5">startBlockingModAutoIndex</a>(request_rec *r)</td><td><a class="el" href="classHooks.html">Hooks</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">startBlockingModDir</a>(request_rec *r)</td><td><a class="el" href="classHooks.html">Hooks</a></td><td><code> [inline]</code></td></tr>
 </table></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classHooks.html

@@ -148,7 +148,7 @@ So in <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec" titl
 <hr>The documentation for this class was generated from the following file:<ul>
 <li>Hooks.cpp</ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html

@@ -30,7 +30,7 @@
   <tr class="memlist"><td><a class="el" href="classPassenger_1_1DirectoryMapper.html#f5091e3cef3878e160e5d3b2181d82fb">getEnvironment</a>()</td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">Passenger::DirectoryMapper</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classPassenger_1_1DirectoryMapper.html#ef969f27622fb215990a870076648aa1">getPublicDirectory</a>()</td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">Passenger::DirectoryMapper</a></td><td><code> [inline]</code></td></tr>
 </table></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classPassenger_1_1DirectoryMapper.html

@@ -251,7 +251,7 @@ Returns an empty string if the document root of the HTTP request cannot be deter
 <hr>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="DirectoryMapper_8h-source.html">DirectoryMapper.h</a></ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/classes.html

@@ -28,7 +28,7 @@
 </td><td><a class="el" href="classPassenger_1_1DirectoryMapper.html">DirectoryMapper</a> (Passenger)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_H"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;H&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="classHooks.html">Hooks</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a></div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/definitions_8h-source.html

@@ -25,7 +25,7 @@
 <a name="l00004"></a>00004 <span class="comment">@defgroup Support Apache-independent support classes and function</span>
 <a name="l00005"></a>00005 <span class="comment">*/</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:37 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/files.html

@@ -29,7 +29,7 @@
   <tr><td class="indexkey"><b>Hooks.h</b> <a href="Hooks_8h-source.html">[code]</a></td><td class="indexvalue"></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/functions.html

@@ -53,7 +53,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">Hooks</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/functions_func.html

@@ -53,7 +53,7 @@
 : <a class="el" href="classHooks.html#e3091c57c95b2f8269f566099802f0ec">Hooks</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/graph_legend.html

@@ -79,7 +79,7 @@ A purple dashed arrow is used if a class is contained or used by another class.
 A yellow dashed arrow denotes a relation between a template instance and the template class it was instantiated from. The arrow is labeled with the template parameters of the instance. </li>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Configuration.html

@@ -30,10 +30,6 @@ Collaboration diagram for Apache module configuration:</div>
 </div>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__Configuration.html#ga19398896775408d6ab7fd8ce2acd992">PASSENGER_VERSION</a>&nbsp;&nbsp;&nbsp;&quot;2.2.1&quot;</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Module version number.  <a href="#ga19398896775408d6ab7fd8ce2acd992"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__Configuration.html#g92dc583c1fa5f8025149799e356a6c78">passenger_config_create_dir</a> (apr_pool_t *p, char *dirspec)</td></tr>
 
@@ -52,24 +48,6 @@ Collaboration diagram for Apache module configuration:</div>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Apache module commands array.  <a href="#g21954abbf4018583acb9d8daef3dfd95"></a><br></td></tr>
 </table>
-<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga19398896775408d6ab7fd8ce2acd992"></a><!-- doxytag: member="Configuration.h::PASSENGER_VERSION" ref="ga19398896775408d6ab7fd8ce2acd992" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">#define PASSENGER_VERSION&nbsp;&nbsp;&nbsp;&quot;2.2.1&quot;          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Module version number. 
-<p>
-
-</div>
-</div><p>
 <hr><h2>Function Documentation</h2>
 <a class="anchor" name="g92dc583c1fa5f8025149799e356a6c78"></a><!-- doxytag: member="Configuration.h::passenger_config_create_dir" ref="g92dc583c1fa5f8025149799e356a6c78" args="(apr_pool_t *p, char *dirspec)" -->
 <div class="memitem">
@@ -226,7 +204,7 @@ Apache module commands array.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Core.html

@@ -41,7 +41,7 @@ Collaboration diagram for Core Apache-related classes and functions:</div>
 
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Hooks.html

@@ -32,7 +32,7 @@ Collaboration diagram for Apache hooks:</div>
 <tr><td></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/group__Support.html

@@ -20,7 +20,7 @@
 <tr><td></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/main.html

@@ -19,7 +19,7 @@
 <h1>Passenger Documentation</h1>
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:37 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/modules.html

@@ -25,7 +25,7 @@
 <li><a class="el" href="group__Support.html">Apache-independent support classes and function</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sat Apr 18 20:08:25 2009 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 26 13:02:38 2009 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/users_guide_snippets/rackup_specifications.txt

@@ -53,9 +53,11 @@ run Merb::Rack::Application.new
 
 ==== Ramaze ====
 ------------------------------------------------------
-require "start"
+require "rubygems"
+require "ramaze"
 Ramaze.trait[:essentials].delete Ramaze::Adapter
-Ramaze.start :force => true
+require "start"
+Ramaze.start!
 run Ramaze::Adapter::Base
 ------------------------------------------------------
 

data/ext/apache2/Configuration.h

@@ -45,9 +45,6 @@
  * @{
  */
 
-/** Module version number. */
-#define PASSENGER_VERSION "2.2.1"
-
 #ifdef __cplusplus
 	#include <set>
 	#include <string>

data/ext/apache2/Hooks.cpp

@@ -39,6 +39,7 @@
 #include "ApplicationPoolServer.h"
 #include "MessageChannel.h"
 #include "DirectoryMapper.h"
+#include "Version.h"
 
 /* The Apache/APR headers *must* come after the Boost headers, otherwise
  * compilation will fail on OpenBSD.
@@ -644,7 +645,9 @@ private:
 		addHeader(headers, "REQUEST_METHOD",  r->method);
 		addHeader(headers, "REQUEST_URI",     r->unparsed_uri);
 		addHeader(headers, "QUERY_STRING",    r->args ? r->args : "");
-		if (strcmp(baseURI, "/") != 0) {
+		if (strcmp(baseURI, "/") == 0) {
+			addHeader(headers, "SCRIPT_NAME", "");
+		} else {
 			addHeader(headers, "SCRIPT_NAME", baseURI);
 		}
 		addHeader(headers, "HTTPS",           lookupEnv(r, "HTTPS"));
@@ -696,7 +699,7 @@ private:
 		 *
 		 *   "SSL_CLIENT_CERT\0\0"
 		 *
-		 * The data in the buffer will be processed by the RequestHandler class,
+		 * The data in the buffer will be processed by the AbstractRequestHandler class,
 		 * which is implemented in Ruby. But it uses Hash[*data.split("\0")] to
 		 * unserialize the data. Unfortunately String#split will not transform
 		 * the trailing "\0\0" into an empty string:
@@ -821,7 +824,6 @@ public:
 		 * the second time.
 		 */
 		unsetenv("TMPDIR");
-		unsetenv("PASSENGER_INSTANCE_TEMP_DIR");
 		createPassengerTempDir(config->getTempDir(), config->userSwitching,
 			config->getDefaultUser(), unixd_config.user_id,
 			unixd_config.group_id);

data/ext/common/ApplicationPoolServer.h

@@ -594,6 +594,7 @@ private:
 				m_logFile.c_str(),
 				m_rubyCommand.c_str(),
 				m_user.c_str(),
+				getPassengerTempDir().c_str(),
 				(char *) 0);
 			int e = errno;
 			fprintf(stderr, "*** Passenger ERROR (%s:%d):\n"

data/ext/common/ApplicationPoolServerExecutable.cpp

@@ -208,8 +208,11 @@ public:
 	       const string &spawnServerCommand,
 	       const string &logFile,
 	       const string &rubyCommand,
-	       const string &user)
+	       const string &user,
+	       const string &passengerTempDir)
 	{
+		setPassengerTempDir(passengerTempDir);
+		
 		pool = ptr(new StandardApplicationPool(spawnServerCommand,
 			logFile, rubyCommand, user));
 		Passenger::setLogLevel(logLevel);
@@ -595,7 +598,7 @@ main(int argc, char *argv[]) {
 	try {
 		exeFile = argv[0];
 		Server server(SERVER_SOCKET_FD, atoi(argv[1]),
-			argv[2], argv[3], argv[4], argv[5]);
+			argv[2], argv[3], argv[4], argv[5], argv[6]);
 		return server.start();
 	} catch (const tracable_exception &e) {
 		P_ERROR("*** Fatal error: " << e.what() << "\n" << e.backtrace());

data/ext/common/SpawnManager.h

@@ -217,6 +217,7 @@ private:
 			execlp(rubyCommand.c_str(),
 				rubyCommand.c_str(),
 				spawnServerCommand.c_str(),
+				getPassengerTempDir().c_str(),
 				// The spawn server changes the process names of the subservers
 				// that it starts, for better usability. However, the process name length
 				// (as shown by ps) is limited. Here, we try to expand that limit by

data/ext/common/Utils.cpp

@@ -33,6 +33,8 @@
 
 namespace Passenger {
 
+static string passengerTempDir;
+
 int
 atoi(const string &s) {
 	return ::atoi(s.c_str());
@@ -292,38 +294,35 @@ getSystemTempDir() {
 }
 
 string
-getPassengerTempDir(bool bypassCache, const string &systemTempDir) {
-	if (bypassCache) {
-		goto calculateResult;
+getPassengerTempDir(bool bypassCache, const string &parentDir) {
+	if (!bypassCache && !passengerTempDir.empty()) {
+		return passengerTempDir;
 	} else {
-		const char *tmp = getenv("PASSENGER_INSTANCE_TEMP_DIR");
-		if (tmp != NULL && *tmp != '\0') {
-			return tmp;
+		string theParentDir;
+		char buffer[PATH_MAX];
+		
+		if (parentDir.empty()) {
+			theParentDir = getSystemTempDir();
 		} else {
-			goto calculateResult;
+			theParentDir = parentDir;
 		}
+		snprintf(buffer, sizeof(buffer), "%s/passenger.%lu",
+			theParentDir.c_str(), (unsigned long) getpid());
+		buffer[sizeof(buffer) - 1] = '\0';
+		passengerTempDir = buffer;
+		return passengerTempDir;
 	}
+}
 
-	calculateResult:
-	const char *temp_dir;
-	char buffer[PATH_MAX];
-	
-	if (systemTempDir.empty()) {
-		temp_dir = getSystemTempDir();
-	} else {
-		temp_dir = systemTempDir.c_str();
-	}
-	snprintf(buffer, sizeof(buffer), "%s/passenger.%lu",
-		temp_dir, (unsigned long) getpid());
-	buffer[sizeof(buffer) - 1] = '\0';
-	setenv("PASSENGER_INSTANCE_TEMP_DIR", buffer, 1);
-	return buffer;
+void
+setPassengerTempDir(const string &dir) {
+	passengerTempDir = dir;
 }
 
 void
-createPassengerTempDir(const string &systemTempDir, bool userSwitching,
+createPassengerTempDir(const string &parentDir, bool userSwitching,
                        const string &lowestUser, uid_t workerUid, gid_t workerGid) {
-	string tmpDir(getPassengerTempDir(false, systemTempDir));
+	string tmpDir(getPassengerTempDir(false, parentDir));
 	uid_t lowestUid;
 	gid_t lowestGid;
 	

data/ext/common/Utils.h

@@ -270,27 +270,37 @@ const char *getSystemTempDir();
  * temporary files are to be stored. This directory is unique for this instance
  * of the web server in which Phusion Passenger is running.
  *
- * If the environment variable PASSENGER_INSTANCE_TEMP_DIR is set, then that value
- * will be returned. If this environment variable is not set, then it will be set
- * with the return value.
- *
- * To bypass the usage of the PASSENGER_INSTANCE_TEMP_DIR environment variable,
- * set 'bypassCache' to true.
- *
- * @param bypassCache Whether PASSENGER_INSTANCE_TEMP_DIR should be bypassed.
- * @param systemTempDir The directory under which the Phusion Passenger-specific
- *                      temp directory should be located. If set to the empty string,
- *                      then the return value of getSystemTempDir() will be used.
+ * The calculated value will be stored in an internal variable, so that subsequent
+ * calls will return the same value. To bypass the usage of this internal variable,
+ * set <tt>bypassCache</tt> to true. In this case, the value of the internal
+ * variable will be set to the newly calculated value.
+ *
+ * @param bypassCache Whether the value of the internal variable should be bypassed.
+ * @param parentDir The directory under which the Phusion Passenger-specific
+ *                  temp directory should be located. If set to the empty string,
+ *                  then the return value of getSystemTempDir() will be used.
+ *                  This argument only has effect if the value of the internal
+ *                  variable is not consulted.
  * @ensure !result.empty()
  * @ingroup Support
  */
-string getPassengerTempDir(bool bypassCache = false, const string &systemTempDir = "");
+string getPassengerTempDir(bool bypassCache = false, const string &parentDir = "");
+
+/**
+ * Force subsequent calls to <tt>getPassengerTempDir(false, ...)</tt> to return the given value.
+ * <tt>dir</tt> is not created automatically if it doesn't exist.
+ *
+ * <tt>dir</tt> may also be an empty string, in which case it will cause the next
+ * call to <tt>getPassengerTempDir()</tt> to re-calculate the temp directory's path.
+ */
+void setPassengerTempDir(const string &dir);
 
-/* Create a temp directory under <em>systemTempDir</em>, for storing Phusion
- * Passenger-specific temp files, such as temporarily buffered uploads,
- * sockets for backend processes, etc. This call also sets the
- * PASSENGER_INSTANCE_TEMP_DIR environment variable, which allows subprocesses
- * to find this temp directory.
+/* Create a temporary directory for storing Phusion Passenger-specific temp files,
+ * such as temporarily buffered uploads, sockets for backend processes, etc.
+ * The directory that will be created is the one returned by
+ * <tt>getPassengerTempDir(false, parentDir)</tt>. This call stores the path to
+ * this temp directory in an internal variable, so that subsequent calls to
+ * getPassengerTempDir() will return the same path.
  *
  * The created temp directory will have several subdirectories:
  * - webserver_private - for storing the web server's buffered uploads.
@@ -315,9 +325,10 @@ string getPassengerTempDir(bool bypassCache = false, const string &systemTempDir
  *       will set directory permissions and owners/groups, which may require
  *       root privileges.
  *
- * @param systemTempDir The directory under which the Phusion Passenger-specific
- *                      temp directory should be created. You should normally
- *                      specify the return value of getSystemTempDir().
+ * @param parentDir The directory under which the Phusion Passenger-specific
+ *                  temp directory should be created. This argument may be the
+ *                  empty string, in which case getSystemTempDir() will be used
+ *                  as the parent directory.
  * @param userSwitching Whether user switching is turned on.
  * @param lowestUser The user that the spawn manager and the pool server will
  *                   run as, if user switching is turned off.
@@ -331,7 +342,7 @@ string getPassengerTempDir(bool bypassCache = false, const string &systemTempDir
  * @throws SystemException Something went wrong.
  * @throws FileSystemException Something went wrong.
  */
-void createPassengerTempDir(const string &systemTempDir, bool userSwitching,
+void createPassengerTempDir(const string &parentDir, bool userSwitching,
                             const string &lowestUser,
                             uid_t workerUid, gid_t workerGid);