passenger 3.0.9 → 3.0.10

data/doc/Users guide Nginx.html

@@ -2310,7 +2310,55 @@ applications, each which must be available at all times.</p></div>
 The default value is <em>300</em>.</p></div>
 </div>
 <div class="sect3">
-<h4 id="PassengerPreStart">5.7.5. passenger_pre_start &lt;url&gt;</h4>
+<h4 id="PassengerMaxRequests">5.7.5. passenger_max_requests &lt;integer&gt;</h4>
+<div class="paragraph"><p>The maximum number of requests an application instance will process. After
+serving that many requests, the application instance will be shut down and
+Phusion Passenger will restart it. A value of 0 means that there is no maximum:
+an application instance will thus be shut down when its idle timeout has been
+reached.</p></div>
+<div class="paragraph"><p>This option is useful if your application is leaking memory. By shutting
+it down after a certain number of requests, all of its memory is guaranteed
+to be freed by the operating system.</p></div>
+<div class="paragraph"><p>This option may occur in the following places:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+In the <em>http</em> configuration block.
+</p>
+</li>
+<li>
+<p>
+In a <em>server</em> configuration block.
+</p>
+</li>
+<li>
+<p>
+In a <em>location</em> configuration block.
+</p>
+</li>
+<li>
+<p>
+In an <em>if</em> configuration scope.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>In each place, it may be specified at most once. The default value is <em>0</em>.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/caution.png" alt="Caution">
+</td>
+<td class="content">
+<div class="paragraph"><p>The <a href="#PassengerMaxRequests">passenger_max_requests</a> directive should be considered
+as a workaround for misbehaving applications. It is advised that you fix the
+problem in your application rather than relying on these directives as a
+measure to avoid memory leaks.</p></div>
+</td>
+</tr></table>
+</div>
+</div>
+<div class="sect3">
+<h4 id="PassengerPreStart">5.7.6. passenger_pre_start &lt;url&gt;</h4>
 <div class="paragraph"><p>By default, Phusion Passenger does not start any application instances until said
 web application is first accessed. The result is that the first visitor of said
 web application might experience a small delay as Phusion Passenger is starting
@@ -3704,7 +3752,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-08-11 22:39:09 CEST
+Last updated 2011-09-15 09:09:01 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Nginx.txt

@@ -1032,6 +1032,35 @@ applications, each which must be available at all times.
 This option may only occur once, in the 'http' configuration block.
 The default value is '300'.
 
+[[PassengerMaxRequests]]
+==== passenger_max_requests <integer> ====
+The maximum number of requests an application instance will process. After
+serving that many requests, the application instance will be shut down and
+Phusion Passenger will restart it. A value of 0 means that there is no maximum:
+an application instance will thus be shut down when its idle timeout has been
+reached.
+
+This option is useful if your application is leaking memory. By shutting
+it down after a certain number of requests, all of its memory is guaranteed
+to be freed by the operating system.
+
+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 '0'.
+
+[CAUTION]
+=====================================================
+The <<PassengerMaxRequests,passenger_max_requests>> directive should be considered
+as a workaround for misbehaving applications. It is advised that you fix the
+problem in your application rather than relying on these directives as a
+measure to avoid memory leaks.
+=====================================================
+
 [[PassengerPreStart]]
 ==== passenger_pre_start <url> ====
 By default, Phusion Passenger does not start any application instances until said

data/ext/apache2/Bucket.cpp

@@ -44,6 +44,7 @@ struct BucketData {
 	SessionPtr session;
 	PassengerBucketStatePtr state;
 	int stream;
+	bool bufferResponse;
 	
 	~BucketData() {
 		/* The session here is an ApplicationPoolServer::RemoteSession.
@@ -80,7 +81,7 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 	*str = NULL;
 	*len = 0;
 	
-	if (block == APR_NONBLOCK_READ) {
+	if (!data->bufferResponse && block == APR_NONBLOCK_READ) {
 		/*
 		 * The bucket brigade that Hooks::handleRequest() passes using
 		 * ap_pass_brigade() is always passed through ap_content_length_filter,
@@ -130,7 +131,7 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 		 * which can read the next chunk from the stream.
 		 */
 		APR_BUCKET_INSERT_AFTER(bucket, passenger_bucket_create(
-			data->session, data->state, bucket->list));
+			data->session, data->state, bucket->list, data->bufferResponse));
 		
 		/* The newly created Passenger Bucket has a reference to the session
 		 * object, so we can delete data here.
@@ -163,11 +164,12 @@ bucket_read(apr_bucket *bucket, const char **str, apr_size_t *len, apr_read_type
 }
 
 static apr_bucket *
-passenger_bucket_make(apr_bucket *bucket, SessionPtr session, PassengerBucketStatePtr state) {
+passenger_bucket_make(apr_bucket *bucket, SessionPtr session, PassengerBucketStatePtr state, bool bufferResponse) {
 	BucketData *data = new BucketData();
 	data->session  = session;
 	data->stream   = session->getStream();
 	data->state    = state;
+	data->bufferResponse = bufferResponse;
 	
 	bucket->type   = &apr_bucket_type_passenger_pipe;
 	bucket->length = (apr_size_t)(-1);
@@ -177,14 +179,14 @@ passenger_bucket_make(apr_bucket *bucket, SessionPtr session, PassengerBucketSta
 }
 
 apr_bucket *
-passenger_bucket_create(SessionPtr session, PassengerBucketStatePtr state, apr_bucket_alloc_t *list) {
+passenger_bucket_create(SessionPtr session, PassengerBucketStatePtr state, apr_bucket_alloc_t *list, bool bufferResponse) {
 	apr_bucket *bucket;
 	
 	bucket = (apr_bucket *) apr_bucket_alloc(sizeof(*bucket), list);
 	APR_BUCKET_INIT(bucket);
 	bucket->free = apr_bucket_free;
 	bucket->list = list;
-	return passenger_bucket_make(bucket, session, state);
+	return passenger_bucket_make(bucket, session, state, bufferResponse);
 }
 
 } // namespace Passenger

data/ext/apache2/Bucket.h

@@ -80,7 +80,8 @@ typedef shared_ptr<PassengerBucketState> PassengerBucketStatePtr;
  */
 apr_bucket *passenger_bucket_create(SessionPtr session,
                                     PassengerBucketStatePtr state,
-                                    apr_bucket_alloc_t *list);
+                                    apr_bucket_alloc_t *list,
+                                    bool bufferResponse);
 
 } // namespace Passenger
 

data/ext/apache2/Configuration.cpp

@@ -209,6 +209,7 @@ passenger_config_create_dir(apr_pool_t *p, char *dirspec) {
 	config->uploadBufferDir = NULL;
 	config->friendlyErrorPages = DirConfig::UNSET;
 	config->unionStationSupport = DirConfig::UNSET;
+	config->bufferResponse = DirConfig::UNSET;
 	/*************************************/
 	return config;
 }
@@ -259,6 +260,7 @@ passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv) {
 	MERGE_THREEWAY_CONFIG(allowEncodedSlashes);
 	MERGE_THREEWAY_CONFIG(friendlyErrorPages);
 	MERGE_THREEWAY_CONFIG(unionStationSupport);
+	MERGE_THREEWAY_CONFIG(bufferResponse);
 	/*************************************/
 	return config;
 }
@@ -313,6 +315,7 @@ DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_resolve_symlinks_in_document_roo
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_allow_encoded_slashes, allowEncodedSlashes)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_friendly_error_pages, friendlyErrorPages)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_union_station_support, unionStationSupport)
+DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_buffer_response, bufferResponse)
 
 static const char *
 cmd_passenger_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
@@ -586,6 +589,11 @@ const command_rec passenger_commands[] = {
 		NULL,
 		OR_ALL,
 		"A filter for Union Station data."),
+	AP_INIT_FLAG("PassengerBufferResponse",
+		(FlagFunc) cmd_passenger_buffer_response,
+		NULL,
+		OR_ALL,
+		"Whether to enable buffering response."),
 	AP_INIT_FLAG("PassengerResolveSymlinksInDocumentRoot",
 		(FlagFunc) cmd_passenger_resolve_symlinks_in_document_root,
 		NULL,

data/ext/apache2/Configuration.hpp

@@ -26,17 +26,12 @@
 #define _PASSENGER_CONFIGURATION_HPP_
 
 #include "Utils.h"
-#include "MessageChannel.h"
 #include "Logging.h"
 #include "ServerInstanceDir.h"
 #include "Constants.h"
 
 /* The APR headers must come after the Passenger headers. See Hooks.cpp
  * to learn why.
- *
- * MessageChannel.h must be included -- even though we don't actually use
- * MessageChannel.h in here, it's necessary to make sure that apr_want.h
- * doesn't b0rk on 'struct iovec'.
  */
 #include "Configuration.h"
 
@@ -197,6 +192,11 @@ struct DirConfig {
 	 */
 	Threeway unionStationSupport;
 	
+	/**
+	 * Whether response buffering support is enabled.
+	 */
+	Threeway bufferResponse;
+	
 	/*************************************/
 	/*************************************/
 	
@@ -332,6 +332,10 @@ struct DirConfig {
 	bool useUnionStation() const {
 		return unionStationSupport == ENABLED;
 	}
+
+	bool getBufferResponse() const {
+		return bufferResponse != DISABLED;
+	}
 	
 	string getUnionStationFilterString() const {
 		if (unionStationFilters.empty()) {

data/ext/apache2/HelperAgent.cpp

@@ -49,12 +49,12 @@
 #include "MessageServer.h"
 #include "ServerInstanceDir.h"
 #include "ResourceLocator.h"
-#include "MessageChannel.h"
 #include "FileDescriptor.h"
 #include "Logging.h"
 #include "Exceptions.h"
 #include "Utils.h"
 #include "Utils/Timer.h"
+#include "Utils/MessageIO.h"
 
 using namespace std;
 using namespace boost;
@@ -137,7 +137,6 @@ private:
 	ServerInstanceDir serverInstanceDir;
 	ServerInstanceDir::GenerationPtr generation;
 	FileDescriptor feedbackFd;
-	MessageChannel feedbackChannel;
 	AnalyticsLoggerPtr analyticsLogger;
 	AccountsDatabasePtr accountsDatabase;
 	MessageServerPtr messageServer;
@@ -152,7 +151,7 @@ private:
 		TRACE_POINT();
 		vector<string> args;
 		
-		if (!feedbackChannel.read(args)) {
+		if (!readArrayMessage(feedbackFd, args)) {
 			throw IOException("The watchdog unexpectedly closed the connection.");
 		}
 		if (args[0] != "request socket password" && args[0] != "message socket password") {
@@ -218,7 +217,6 @@ public:
 		string loggingAgentPassword;
 		
 		this->feedbackFd  = feedbackFd;
-		feedbackChannel   = MessageChannel(feedbackFd);
 		
 		UPDATE_TRACE_POINT();
 		messageSocketPassword = Base64::decode(options.get("message_socket_password"));
@@ -259,7 +257,8 @@ public:
 		messageServer->addHandler(ptr(new ExitHandler(exitEvent)));
 		
 		UPDATE_TRACE_POINT();
-		feedbackChannel.write("initialized",
+		writeArrayMessage(feedbackFd,
+			"initialized",
 			"",  // Request socket filename; not available in the Apache helper server.
 			messageServer->getSocketFilename().c_str(),
 			NULL);

data/ext/apache2/Hooks.cpp

@@ -54,16 +54,11 @@
 #include "Logging.h"
 #include "AgentsStarter.hpp"
 #include "ApplicationPool/Client.h"
-#include "MessageChannel.h"
 #include "DirectoryMapper.h"
 #include "Constants.h"
 
 /* The Apache/APR headers *must* come after the Boost headers, otherwise
  * compilation will fail on OpenBSD.
- *
- * apr_want.h *must* come after MessageChannel.h, otherwise compilation will
- * fail on platforms on which apr_want.h tries to redefine 'struct iovec'.
- * http://groups.google.com/group/phusion-passenger/browse_thread/thread/7e162f60df212e9c
  */
 #include <ap_config.h>
 #include <ap_release.h>
@@ -726,7 +721,7 @@ private:
 			/* Setup the bucket brigade. */
 			bucketState = ptr(new PassengerBucketState());
 			bb = apr_brigade_create(r->connection->pool, r->connection->bucket_alloc);
-			b = passenger_bucket_create(session, bucketState, r->connection->bucket_alloc);
+			b = passenger_bucket_create(session, bucketState, r->connection->bucket_alloc, config->getBufferResponse());
 			
 			/* The bucket (b) still has a reference to the session, so the reset()
 			 * call here is guaranteed not to throw any exceptions.

data/ext/boost/thread/exceptions.hpp

@@ -38,7 +38,7 @@ namespace boost
         std::string message;
         
         thread_exception():
-            m_sys_err(0)
+            m_sys_err(-1)
         {}
     
         thread_exception(const std::string &description, int sys_err_code):
@@ -107,6 +107,12 @@ namespace boost
             thread_exception(sys_err_code)
         {}
     
+        lock_error(const std::string &message)
+        {
+            this->message = "boost::lock_error: ";
+            this->message.append(message);
+        }
+    
         ~lock_error() throw()
         {}
     

data/ext/boost/thread/locks.hpp

@@ -407,7 +407,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             m->lock();
             is_locked=true;
@@ -416,7 +416,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             is_locked=m->try_lock();
             return is_locked;
@@ -442,7 +442,7 @@ namespace boost
         {
             if(!owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock not owned"));
             }
             m->unlock();
             is_locked=false;
@@ -650,7 +650,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             m->lock_shared();
             is_locked=true;
@@ -659,7 +659,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             is_locked=m->try_lock_shared();
             return is_locked;
@@ -668,7 +668,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             is_locked=m->timed_lock_shared(target_time);
             return is_locked;
@@ -678,7 +678,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             is_locked=m->timed_lock_shared(target_time);
             return is_locked;
@@ -687,7 +687,7 @@ namespace boost
         {
             if(!owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock not owned"));
             }
             m->unlock_shared();
             is_locked=false;
@@ -847,7 +847,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             m->lock_upgrade();
             is_locked=true;
@@ -856,7 +856,7 @@ namespace boost
         {
             if(owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock already owned"));
             }
             is_locked=m->try_lock_upgrade();
             return is_locked;
@@ -865,7 +865,7 @@ namespace boost
         {
             if(!owns_lock())
             {
-                boost::throw_exception(boost::lock_error());
+                boost::throw_exception(boost::lock_error("lock not owned"));
             }
             m->unlock_upgrade();
             is_locked=false;

data/ext/common/AgentBase.cpp

@@ -66,6 +66,24 @@ ignoreSigpipe() {
 	sigaction(SIGPIPE, &action, NULL);
 }
 
+static bool
+hasEnvOption(const char *name, bool defaultValue = false) {
+	const char *value = getenv(name);
+	if (value != NULL) {
+		if (*value != '\0') {
+			return strcmp(value, "yes") == 0
+				|| strcmp(value, "y") == 0
+				|| strcmp(value, "1") == 0
+				|| strcmp(value, "on") == 0
+				|| strcmp(value, "true") == 0;
+		} else {
+			return defaultValue;
+		}
+	} else {
+		return defaultValue;
+	}
+}
+
 // No idea whether strlen() is async signal safe, but let's not risk it
 // and write our own version instead that's guaranteed to be safe.
 static size_t
@@ -328,7 +346,9 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 	VariantMap options;
 	
 	ignoreSigpipe();
-	installAbortHandler();
+	if (hasEnvOption("PASSENGER_ABORT_HANDLER", true)) {
+		installAbortHandler();
+	}
 	setup_syscall_interruption_support();
 	setvbuf(stdout, NULL, _IONBF, 0);
 	setvbuf(stderr, NULL, _IONBF, 0);