passenger 1.0.3 → 1.0.4

data/doc/cxxapi/structPassenger_1_1AnythingToString-members.html

@@ -21,7 +21,7 @@
   </ul>
 </div>
 <h1>Passenger::AnythingToString&lt; T &gt; Member List</h1>This is the complete list of members for <a class="el" href="structPassenger_1_1AnythingToString.html">Passenger::AnythingToString&lt; T &gt;</a>, including all inherited members.<p><table>
-</table><hr size="1"><address style="text-align: right;"><small>Generated on Wed Apr 30 00:07:02 2008 for Passenger by&nbsp;
+</table><hr size="1"><address style="text-align: right;"><small>Generated on Thu May 1 20:23:47 2008 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.3 </small></address>
 </body>

data/doc/cxxapi/structPassenger_1_1AnythingToString.html

@@ -37,7 +37,7 @@ Do not use directly. <table border="0" cellpadding="0" cellspacing="0">
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li><a class="el" href="Utils_8h-source.html">Utils.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Wed Apr 30 00:07:02 2008 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Thu May 1 20:23:47 2008 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.3 </small></address>
 </body>

data/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html

@@ -21,7 +21,7 @@
   </ul>
 </div>
 <h1>Passenger::AnythingToString&lt; vector&lt; string &gt; &gt; Member List</h1>This is the complete list of members for <a class="el" href="structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html">Passenger::AnythingToString&lt; vector&lt; string &gt; &gt;</a>, including all inherited members.<p><table>
-</table><hr size="1"><address style="text-align: right;"><small>Generated on Wed Apr 30 00:07:02 2008 for Passenger by&nbsp;
+</table><hr size="1"><address style="text-align: right;"><small>Generated on Thu May 1 20:23:47 2008 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.3 </small></address>
 </body>

data/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html

@@ -37,7 +37,7 @@ Do not use directly. <table border="0" cellpadding="0" cellspacing="0">
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li><a class="el" href="Utils_8h-source.html">Utils.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Wed Apr 30 00:07:02 2008 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Thu May 1 20:23:47 2008 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.3 </small></address>
 </body>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Wed, 30 Apr 2008 00:06:55 +0200
+Thu, 01 May 2008 20:23:41 +0200

data/doc/rdoc/files/DEVELOPERS_TXT.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Apr 28 11:44:32 +0200 2008</td>
+            <td>Thu May 01 20:10:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/ext/passenger/native_support_c.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Apr 28 23:34:04 +0200 2008</td>
+            <td>Thu May 01 10:46:21 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/application_spawner_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Wed Apr 30 00:05:27 +0200 2008</td>
+            <td>Thu May 01 10:46:21 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/dependencies_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Apr 28 23:34:04 +0200 2008</td>
+            <td>Thu May 01 20:10:04 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/request_handler_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Tue Apr 29 22:50:15 +0200 2008</td>
+            <td>Thu May 01 10:46:21 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/doc/rdoc/files/lib/passenger/spawn_manager_rb.html

@@ -63,7 +63,7 @@
           </tr>
           <tr>
             <td>Modified:</td>
-            <td>Mon Apr 28 23:34:04 +0200 2008</td>
+            <td>Thu May 01 10:46:21 +0200 2008</td>
           </tr>
         </table>
       </td></tr>

data/ext/apache2/Configuration.h

@@ -29,7 +29,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "1.0.3"
+#define PASSENGER_VERSION "1.0.4"
 
 #ifdef __cplusplus
 	#include <set>

data/ext/apache2/Hooks.cpp

@@ -555,6 +555,8 @@ destroy_hooks(void *arg) {
 static int
 init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) {
 	/*
+	 * HISTORICAL NOTE:
+	 *
 	 * The Apache initialization process has the following properties:
 	 *
 	 * 1. Apache on Unix calls the post_config hook twice, once before detach() and once
@@ -564,79 +566,63 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	 * 3. On Unix, if the -X commandline option is given (the 'DEBUG' config is set),
 	 *    detach() will not be called.
 	 *
-	 * The Passenger initialization process is pretty expensive because a spawn server has
-	 * to be started, so we'll want to avoid initializing twice because of property #2.
-	 *
-	 * The most straightforward solution is to initialize Passenger the second time
-	 * post_config is called. But unfortunately, that doesn't work if the Passenger
-	 * module is loaded after a graceful restart. There also doesn't seem to be any
-	 * good hooks that we can use to avoid double initialization.
-	 *
-	 * So as a hack, we check whether Apache has already been daemonized, by checking
-	 * whether ppid() returns 1. This doesn't work with Apache 2.0.x though: ppid()
-	 * doesn't return 1. So Apache 2.0.x users will just have to live with the double
-	 * initialization overhead.
+	 * Because of property #2, the post_config hook is called twice. We initially tried
+	 * to avoid this with all kinds of hacks and workarounds, but none of them are
+	 * universal, i.e. it works for some people but not for others. So we got rid of the
+	 * hacks, and now we always initialize in the post_config hook.
 	 */
-	bool passengerShouldBeInitialized;
-	
-	#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 2) || AP_SERVER_MAJORVERSION_NUMBER > 2
-		passengerShouldBeInitialized = getppid() == 1 || ap_exists_config_define("DEBUG");
-	#else
-		passengerShouldBeInitialized = true;
-	#endif
-	if (passengerShouldBeInitialized) {
-		try {
-			hooks = new Hooks(pconf, plog, ptemp, s);
-			apr_pool_cleanup_register(pconf, NULL,
-				destroy_hooks,
-				apr_pool_cleanup_null);
-			return OK;
-		} catch (const thread_resource_error &e) {
-			struct rlimit lim;
-			string pthread_threads_max;
-			
-			lim.rlim_cur = 0;
-			lim.rlim_max = 0;
-			getrlimit(RLIMIT_NPROC, &lim);
-			#ifdef PTHREAD_THREADS_MAX
-				pthread_threads_max = toString(PTHREAD_THREADS_MAX);
-			#else
-				pthread_threads_max = "unknown";
-			#endif
-			
-			ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-				"*** Passenger could not be initialize because a "
-				"threading resource could not be allocated or initialized. "
-				"The error message is:");
-			fprintf(stderr,
-				"  %s\n\n"
-				"System settings:\n"
-				"  RLIMIT_NPROC: soft = %d, hard = %d\n"
-				"  PTHREAD_THREADS_MAX: %s\n"
-				"\n",
-				e.what(),
-				(int) lim.rlim_cur, (int) lim.rlim_max,
-				pthread_threads_max.c_str());
-			
-			fprintf(stderr, "Output of 'uname -a' follows:\n");
-			fflush(stderr);
-			system("uname -a >&2");
-			
-			fprintf(stderr, "\nOutput of 'ulimit -a' follows:\n");
-			fflush(stderr);
-			system("ulimit -a >&2");
-			
-			return DECLINED;
-			
-		} catch (const exception &e) {
-			ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-				"*** Passenger could not be initialized because of this error: %s",
-				e.what());
-			hooks = NULL;
-			return DECLINED;
-		}
-	} else {
+	if (hooks != NULL) {
+		delete hooks;
+	}
+	try {
+		hooks = new Hooks(pconf, plog, ptemp, s);
+		apr_pool_cleanup_register(pconf, NULL,
+			destroy_hooks,
+			apr_pool_cleanup_null);
 		return OK;
+	} catch (const thread_resource_error &e) {
+		struct rlimit lim;
+		string pthread_threads_max;
+		
+		lim.rlim_cur = 0;
+		lim.rlim_max = 0;
+		getrlimit(RLIMIT_NPROC, &lim);
+		#ifdef PTHREAD_THREADS_MAX
+			pthread_threads_max = toString(PTHREAD_THREADS_MAX);
+		#else
+			pthread_threads_max = "unknown";
+		#endif
+		
+		ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+			"*** Passenger could not be initialize because a "
+			"threading resource could not be allocated or initialized. "
+			"The error message is:");
+		fprintf(stderr,
+			"  %s\n\n"
+			"System settings:\n"
+			"  RLIMIT_NPROC: soft = %d, hard = %d\n"
+			"  PTHREAD_THREADS_MAX: %s\n"
+			"\n",
+			e.what(),
+			(int) lim.rlim_cur, (int) lim.rlim_max,
+			pthread_threads_max.c_str());
+		
+		fprintf(stderr, "Output of 'uname -a' follows:\n");
+		fflush(stderr);
+		system("uname -a >&2");
+		
+		fprintf(stderr, "\nOutput of 'ulimit -a' follows:\n");
+		fflush(stderr);
+		system("ulimit -a >&2");
+		
+		return DECLINED;
+		
+	} catch (const exception &e) {
+		ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+			"*** Passenger could not be initialized because of this error: %s",
+			e.what());
+		hooks = NULL;
+		return DECLINED;
 	}
 }
 

data/ext/apache2/MessageChannel.h

@@ -256,33 +256,31 @@ public:
 	 * @see readFileDescriptor()
 	 */
 	void writeFileDescriptor(int fileDescriptor) {
-		struct {
-			struct cmsghdr header;
-			int fd;
-		} control;
-
-		control.header.cmsg_len   = sizeof(control);
-		control.header.cmsg_level = SOL_SOCKET;
-		control.header.cmsg_type  = SCM_RIGHTS;
-		control.fd = fileDescriptor;
-
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
-		
+		char control_data[CMSG_SPACE(sizeof(int))];
+		struct cmsghdr *control_header;
+	
 		msg.msg_name = NULL;
 		msg.msg_namelen = 0;
-		
-		/* Linux and Solaris require msg_iov to be non-NULL.. */
+	
+		/* Linux and Solaris require msg_iov to be non-NULL. */
 		dummy[0]       = '\0';
 		vec.iov_base   = dummy;
 		vec.iov_len    = sizeof(dummy);
 		msg.msg_iov    = &vec;
 		msg.msg_iovlen = 1;
-		
-		msg.msg_control    = (caddr_t) &control;
-		msg.msg_controllen = sizeof(control);
+	
+		msg.msg_control    = (caddr_t) control_data;
+		msg.msg_controllen = sizeof(control_data);
 		msg.msg_flags      = 0;
+	
+		control_header             = CMSG_FIRSTHDR(&msg);
+		control_header->cmsg_len   = CMSG_LEN(sizeof(int));
+		control_header->cmsg_level = SOL_SOCKET;
+		control_header->cmsg_type  = SCM_RIGHTS;
+		memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
 		
 		if (sendmsg(fd, &msg, 0) == -1) {
 			throw SystemException("Cannot send file descriptor with sendmsg()", errno);
@@ -422,19 +420,11 @@ public:
 	 *            file descriptor.
 	 */
 	int readFileDescriptor() {
-		struct {
-			struct cmsghdr header;
-			int fd;
-		} control;
-
-		control.header.cmsg_len   = sizeof(control);
-		control.header.cmsg_level = SOL_SOCKET;
-		control.header.cmsg_type  = SCM_RIGHTS;
-		control.fd = -1;
-
 		struct msghdr msg;
 		struct iovec vec;
 		char dummy[1];
+		char control_data[CMSG_SPACE(sizeof(int))];
+		struct cmsghdr *control_header;
 
 		msg.msg_name    = NULL;
 		msg.msg_namelen = 0;
@@ -445,21 +435,22 @@ public:
 		msg.msg_iov    = &vec;
 		msg.msg_iovlen = 1;
 
-		msg.msg_control    = (caddr_t) &control;
-		msg.msg_controllen = sizeof(control);
+		msg.msg_control    = (caddr_t) control_data;
+		msg.msg_controllen = sizeof(control_data);
 		msg.msg_flags      = 0;
-
+		
 		if (recvmsg(fd, &msg, 0) == -1) {
 			throw SystemException("Cannot read file descriptor with recvmsg()", errno);
 		}
 		
-		if (msg.msg_controllen        != sizeof(control)
-		 || control.header.cmsg_len   != sizeof(control)
-		 || control.header.cmsg_level != SOL_SOCKET
-		 || control.header.cmsg_type  != SCM_RIGHTS) {
+		control_header = CMSG_FIRSTHDR(&msg);
+		if (msg.msg_controllen         != sizeof(control_data)
+		 || control_header->cmsg_len   != CMSG_LEN(sizeof(int))
+		 || control_header->cmsg_level != SOL_SOCKET
+		 || control_header->cmsg_type  != SCM_RIGHTS) {
 			throw IOException("No valid file descriptor received.");
 		}
-		return control.fd;
+		return *((int *) CMSG_DATA(control_header));
 	}
 };
 

data/ext/passenger/native_support.c

@@ -40,34 +40,34 @@ static VALUE mNativeSupport;
  */
 static VALUE
 send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
-	int fd;
-	struct {
-		struct cmsghdr header;
-		int fd;
-	} control;
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
-
-	control.header.cmsg_len   = sizeof(control);
-	control.header.cmsg_level = SOL_SOCKET;
-	control.header.cmsg_type  = SCM_RIGHTS;
-	control.fd = NUM2INT(fd_to_send);
-
+	char control_data[CMSG_SPACE(sizeof(int))];
+	struct cmsghdr *control_header;
+	int control_payload;
+	
 	msg.msg_name = NULL;
 	msg.msg_namelen = 0;
 	
-	/* Linux and Solaris require msg_iov to be non-NULL.. */
+	/* Linux and Solaris require msg_iov to be non-NULL. */
 	dummy[0]       = '\0';
 	vec.iov_base   = dummy;
 	vec.iov_len    = sizeof(dummy);
 	msg.msg_iov    = &vec;
 	msg.msg_iovlen = 1;
 	
-	msg.msg_control    = (caddr_t) &control;
-	msg.msg_controllen = sizeof(control);
+	msg.msg_control    = (caddr_t) control_data;
+	msg.msg_controllen = sizeof(control_data);
 	msg.msg_flags      = 0;
 	
+	control_header             = CMSG_FIRSTHDR(&msg);
+	control_header->cmsg_len   = CMSG_LEN(sizeof(int));
+	control_header->cmsg_level = SOL_SOCKET;
+	control_header->cmsg_type  = SCM_RIGHTS;
+	control_payload = NUM2INT(fd_to_send);
+	memcpy(CMSG_DATA(control_header), &control_payload, sizeof(int));
+	
 	if (sendmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
 		rb_sys_fail("sendmsg(2)");
 		return Qnil;
@@ -88,19 +88,11 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
  */
 static VALUE
 recv_fd(VALUE self, VALUE socket_fd) {
-	struct {
-		struct cmsghdr header;
-		int fd;
-	} control;
-
-	control.header.cmsg_len   = sizeof(control);
-	control.header.cmsg_level = SOL_SOCKET;
-	control.header.cmsg_type  = SCM_RIGHTS;
-	control.fd = -1;
-
 	struct msghdr msg;
 	struct iovec vec;
 	char dummy[1];
+	char control_data[CMSG_SPACE(sizeof(int))];
+	struct cmsghdr *control_header;
 
 	msg.msg_name    = NULL;
 	msg.msg_namelen = 0;
@@ -111,23 +103,24 @@ recv_fd(VALUE self, VALUE socket_fd) {
 	msg.msg_iov    = &vec;
 	msg.msg_iovlen = 1;
 
-	msg.msg_control    = (caddr_t) &control;
-	msg.msg_controllen = sizeof(control);
+	msg.msg_control    = (caddr_t) control_data;
+	msg.msg_controllen = sizeof(control_data);
 	msg.msg_flags      = 0;
-
+	
 	if (recvmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
 		rb_sys_fail("Cannot read file descriptor with recvmsg()");
 		return Qnil;
 	}
 	
-	if (msg.msg_controllen        != sizeof(control)
-	 || control.header.cmsg_len   != sizeof(control)
-	 || control.header.cmsg_level != SOL_SOCKET
-	 || control.header.cmsg_type  != SCM_RIGHTS) {
+	control_header = CMSG_FIRSTHDR(&msg);
+	if (msg.msg_controllen         != sizeof(control_data)
+	 || control_header->cmsg_len   != CMSG_LEN(sizeof(int))
+	 || control_header->cmsg_level != SOL_SOCKET
+	 || control_header->cmsg_type  != SCM_RIGHTS) {
 		rb_sys_fail("No valid file descriptor received.");
 		return Qnil;
 	}
-	return INT2NUM(control.fd);
+	return INT2NUM(*((int *) CMSG_DATA(control_header)));
 }
 
 /*