passenger 5.0.1 → 5.0.2

data/debian.template/{control.template → control.erb}

@@ -1,23 +1,23 @@
 Source: passenger
 Section: ruby
 Priority: optional
-Maintainer: John Leach <john@brightbox.co.uk>
+Maintainer: Phusion <info@phusion.nl>
 Uploaders: Phusion <info@phusion.nl>, Hongli Lai <hongli@phusion.nl>
 Build-Depends: debhelper (>= 7.0.50~), rake,
-#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
-     ruby1.8, ruby1.8-dev, rubygems1.8,
-#endif
+<% if is_distribution?("<= lucid") -%>
+ ruby1.8, ruby1.8-dev, rubygems1.8,
+ ruby1.9.1, ruby1.9.1-dev, rubygems1.9,
+<% elsif is_distribution?("<= saucy") || is_distribution?("<= wheezy") -%>
+ ruby1.8, ruby1.8-dev, rubygems1.8,
  ruby1.9.1, ruby1.9.1-dev,
-#if is_distribution?('<= lucid')
-     rubygems1.9,
-#endif
-#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
-     ruby2.0, ruby2.0-dev,
-#endif
+<% else -%>
+ ruby1.9.1, ruby1.9.1-dev,
+ ruby2.0, ruby2.0-dev,
+<% end -%>
  apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
-#if is_distribution?('>= precise') || is_distribution?('>= wheezy')
-     libev-dev (>= 1:4.0.0),
-#endif
+<% if is_distribution?('>= precise') || is_distribution?('>= wheezy') -%>
+ libev-dev (>= 1:4.0.0),
+<% end -%>
  libapr1-dev, libcurl4-openssl-dev
 Standards-Version: 3.9.3
 Homepage: https://www.phusionpassenger.com/
@@ -30,11 +30,11 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby2.4 | ruby2.3 | ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
  rubygems-integration (>= 1.8) | rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
-#if is_distribution?('<= lucid') || is_distribution?('<= squeeze')
-     librack-ruby
-#else
-     ruby-rack
-#endif
+<% if is_distribution?('<= lucid') || is_distribution?('<= squeeze') -%>
+ librack-ruby
+<% else -%>
+ ruby-rack
+<% end -%>
 Recommends: passenger-doc (= ${binary:Version}), passenger-dev (= ${binary:Version})
 Breaks: libapache2-mod-passenger (<< <%= DEBIAN_EPOCH %>:<%= PACKAGE_VERSION %>), passenger-common,
  passenger-common1.8, passenger-common1.9.1, ruby-passenger

data/debian.template/passenger-doc.install.erb

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/* usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/
+CONTRIBUTORS usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/

data/debian.template/{rules.template → rules.erb}

@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 # export DH_VERBOSE=1
 
-#if is_distribution?('>= precise') || is_distribution?('>= wheezy')
-    export USE_VENDORED_LIBEV=false
-#endif
+<% if is_distribution?('>= precise') || is_distribution?('>= wheezy') -%>
+export USE_VENDORED_LIBEV=false
+<% end %>
 
-#if ['1', 'true', 'on', 'yes'].include?(ENV['USE_CCACHE'])
-	export USE_CCACHE=1
-	NGINX_CONFIGURE_OPTIONS = CC=/usr/lib/ccache/cc CXX=/usr/lib/ccache/c++
-#else
-	NGINX_CONFIGURE_OPTIONS =
-#endif
+<% if ['1', 'true', 'on', 'yes'].include?(ENV['USE_CCACHE']) -%>
+export USE_CCACHE=1
+NGINX_CONFIGURE_OPTIONS = CC=/usr/lib/ccache/cc CXX=/usr/lib/ccache/c++
+<% else -%>
+NGINX_CONFIGURE_OPTIONS =
+<% end -%>
 
 # Speed up ccache (reduce I/O) by lightly compressing things.
 # Always set these variables because pbuilder uses ccache transparently.
@@ -26,16 +26,17 @@ override_dh_auto_configure:
 	# Do nothing
 
 override_dh_auto_build:
-#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
-    	/usr/bin/ruby1.8 /usr/bin/rake fakeroot
-    	mv pkg/fakeroot pkg/fakeroot1.8
-#endif
+<% if is_distribution?("<= saucy") || is_distribution?("<= wheezy") -%>
+	/usr/bin/ruby1.8 /usr/bin/rake fakeroot
+	mv pkg/fakeroot pkg/fakeroot1.8
 	/usr/bin/ruby1.9.1 /usr/bin/rake fakeroot
 	mv pkg/fakeroot pkg/fakeroot1.9.1
-#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
-    	/usr/bin/ruby2.0 /usr/bin/rake fakeroot
-    	mv pkg/fakeroot pkg/fakeroot2.0
-#endif
+<% else -%>
+	/usr/bin/ruby1.9.1 /usr/bin/rake fakeroot
+	mv pkg/fakeroot pkg/fakeroot1.9.1
+	/usr/bin/ruby2.0 /usr/bin/rake fakeroot
+	mv pkg/fakeroot pkg/fakeroot2.0
+<% end -%>
 	cd nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> && \
 		env $(NGINX_CONFIGURE_OPTIONS) ./configure --prefix=/tmp \
 		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
@@ -46,13 +47,13 @@ override_dh_auto_build:
 override_dh_auto_install:
 	mkdir debian/tmp/
 	# Merge Ruby 1.8, 1.9 and 2.0 files into a single directory.
-#if is_distribution?("<= saucy") || is_distribution?("<= wheezy")
-    	cp -a pkg/fakeroot1.8/* debian/tmp/
-#endif
+<% if is_distribution?("<= saucy") || is_distribution?("<= wheezy") -%>
+	cp -a pkg/fakeroot1.8/* debian/tmp/
+	cp -a pkg/fakeroot1.9.1/* debian/tmp/
+<% else -%>
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
-#if is_distribution?(">= trusty") || is_distribution?(">= jessie")
-    	cp -a pkg/fakeroot2.0/* debian/tmp/
-#endif
+	cp -a pkg/fakeroot2.0/* debian/tmp/
+<% end -%>
 	./dev/install_scripts_bootstrap_code.rb --ruby /usr/lib/ruby/vendor_ruby debian/tmp/usr/bin/* debian/tmp/usr/sbin/*
 	./dev/install_scripts_bootstrap_code.rb --nginx-module-config /usr/bin debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ngx_http_passenger_module/config
 	touch debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/release.txt

data/doc/users_guide_snippets/tips.txt

@@ -515,7 +515,6 @@ Extra environment variables: `PASSENGER_PROCESS_PID`, `PASSENGER_APP_ROOT`. Erro
 `queue_full_error` (since 5.0.0 RC 1)::
 	The server rejects new requests (default: HTTP 503) while the request queue is full (https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html#passenger_max_request_queue_size). 
 	This hook gets called for each rejection.
-	
 +
 Extra environment variables:
 +
@@ -537,6 +536,15 @@ Note that the `after_initialize_supergroup` hook may be called while this hook i
 +
 Extra environment variables: `PASSENGER_APP_ROOT`.
 
+`max_request_time_reached` (since 5.0.2, Enterprise-only)::
+	Called when a <<PassengerMaxRequestTime,max request time limit>> has been reached. Please note that as soon as this hook has finished executing, the application process will be killed with SIGKILL. So if you want to perform any diagnostics on the process in question (e.g. with strace, gdb, etc), please do not exit your hook script until you've obtained all the diagnostics you want.
++
+Extra environment variables:
++
+- `PASSENGER_APP_ID`: the PID of the process whose request took too long.
+- `PASSENGER_REQUEST_PATH`: the path of the request that took took long, e.g. "/photos/edit?id=123".
+- `PASSENGER_REQUEST_HOST`: the host name of the request that took too long, e.g. "www.example.com". This environment variable is not set if the request doesn't contain a Host header.
+
 [[flying_passenger]]
 === Flying Passenger
 ifdef::apache[]

data/ext/common/Constants.h

@@ -60,6 +60,8 @@
 
 	#define DEFAULT_CONCURRENCY_MODEL "process"
 
+	#define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
+
 	#define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
 
 	#define DEFAULT_LOGGING_AGENT_ADMIN_LISTEN_ADDRESS "tcp://127.0.0.1:9345"
@@ -112,7 +114,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.1"
+	#define PASSENGER_VERSION "5.0.2"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/ServerKit/Channel.h

@@ -36,6 +36,7 @@
 #include <MemoryKit/mbuf.h>
 #include <Logging.h>
 #include <Utils/StrIntUtils.h>
+#include <Utils/json.h>
 
 namespace Passenger {
 namespace ServerKit {
@@ -61,10 +62,10 @@ using namespace boost;
  *
  * The data callback can consume the buffer immediately, and tell Channel how many bytes
  * it has consumed, and whether it accepts any further data, by returning a Channel::Result.
- * If the buffer was not fully consumed the data callback, and it is still willing to accept
- * further data (by not transitioning to the end state or an error state), then Channel will
- * call the data callback again with the remainder of the buffer. This repeats
- * until:
+ * If the buffer was not fully consumed by the data callback, and the callback is still
+ * willing to accept further data (by not transitioning to the end state or an error state),
+ * then Channel will call the data callback again with the remainder of the buffer. This
+ * repeats until:
  *
  *  * the buffer is fully consumed,
  *  * or until the callback indicates that it's no longer accepting further data,
@@ -149,6 +150,8 @@ using namespace boost;
  * when the Channel is not accepting reads, and it starts reading from the file
  * descriptor when the channel is accepting reads again.
  *
+ * ## Asynchronous consumption
+ *
  * The data callback can also tell Channel that it wants to consume the buffer
  * *asynchronously*, by returning a Channel::Result with a negative consumption size.
  * At some later point, something must notify Channel that the buffer is consumed,
@@ -738,6 +741,21 @@ public:
 	bool endAcked() const {
 		return state == EOF_REACHED;
 	}
+
+	Json::Value inspectAsJson() const {
+		Json::Value doc;
+
+		doc["callback_in_progress"] = !acceptingInput();
+		if (hasError()) {
+			doc["error"] = errcode;
+			doc["error_acked"] = endAcked();
+		} else if (ended()) {
+			doc["ended"] = true;
+			doc["end_acked"] = endAcked();
+		}
+
+		return doc;
+	}
 };
 
 

data/ext/common/ServerKit/Context.h

@@ -43,13 +43,15 @@ struct FileBufferedChannelConfig {
 	string bufferDir;
 	unsigned int threshold;
 	unsigned int delayInFileModeSwitching;
+	unsigned int maxDiskChunkReadSize;
 	bool autoTruncateFile;
 	bool autoStartMover;
 
 	FileBufferedChannelConfig()
 		: bufferDir("/tmp"),
-		  threshold(1024 * 128),
+		  threshold(DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD),
 		  delayInFileModeSwitching(0),
+		  maxDiskChunkReadSize(0),
 		  autoTruncateFile(true),
 		  autoStartMover(true)
 		{ }

data/ext/common/ServerKit/FdSinkChannel.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <ev.h>
 #include <ServerKit/Channel.h>
+#include <Utils/json.h>
 
 namespace Passenger {
 namespace ServerKit {
@@ -197,6 +198,13 @@ public:
 	void setHooks(Hooks *hooks) {
 		this->hooks = hooks;
 	}
+
+	Json::Value inspectAsJson() const {
+		Json::Value doc = Channel::inspectAsJson();
+		doc["initialized"] = watcher.fd != -1;
+		doc["io_watcher_active"] = (bool) watcher.active;
+		return doc;
+	}
 };
 
 

data/ext/common/ServerKit/FdSourceChannel.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -33,6 +33,7 @@
 #include <MemoryKit/mbuf.h>
 #include <ServerKit/Context.h>
 #include <ServerKit/Channel.h>
+#include <Utils/json.h>
 
 namespace Passenger {
 namespace ServerKit {
@@ -231,6 +232,13 @@ public:
 	void setHooks(Hooks *hooks) {
 		this->hooks = hooks;
 	}
+
+	Json::Value inspectAsJson() const {
+		Json::Value doc = Channel::inspectAsJson();
+		doc["initialized"] = watcher.fd != -1;
+		doc["io_watcher_active"] = (bool) watcher.active;
+		return doc;
+	}
 };
 
 

data/ext/common/ServerKit/FileBufferedChannel.h

@@ -389,7 +389,8 @@ private:
 
 	/***** Buffer manipulation *****/
 
-	void clearBuffers() {
+	void clearBuffers(bool mayCallCallbacks) {
+		unsigned int oldNbuffers = nbuffers;
 		nbuffers = 0;
 		bytesBuffered = 0;
 		firstBuffer = MemoryKit::mbuf();
@@ -399,6 +400,9 @@ private:
 			// a conditional here improves performance slightly.
 			moreBuffers.clear();
 		}
+		if (mayCallCallbacks && oldNbuffers != 0) {
+			callBuffersFlushedCallback();
+		}
 	}
 
 	void pushBuffer(const MemoryKit::mbuf &buffer) {
@@ -553,6 +557,11 @@ private:
 					if (config->autoTruncateFile) {
 						FBC_DEBUG("Reader: no more buffers. Transitioning to RS_INACTIVE, truncating file");
 						switchToInMemoryMode();
+						if (generation != this->generation || mode >= ERROR) {
+							// Callback deinitialized this object, or callback
+							// called a method that encountered an error.
+							return;
+						}
 					} else {
 						FBC_DEBUG("Reader: no more buffers. Transitioning to RS_INACTIVE, "
 							"not truncating file because config->autoTruncateFile is turned off");
@@ -647,7 +656,10 @@ private:
 		assert(inFileMode->written > 0);
 		size_t size = std::min<size_t>(inFileMode->written,
 			mbuf_pool_data_size(&ctx->mbuf_pool));
-		FBC_DEBUG("Reader: reading next chunk from file");
+		if (config->maxDiskChunkReadSize > 0 && size > config->maxDiskChunkReadSize) {
+			size = config->maxDiskChunkReadSize;
+		}
+		FBC_DEBUG("Reader: reading next chunk from file, " << size << " bytes");
 		verifyInvariants();
 		ReadContext *readContext = new ReadContext(this);
 		readContext->buffer = MemoryKit::mbuf_get(&ctx->mbuf_pool);
@@ -736,7 +748,6 @@ private:
 			P_ASSERT_EQ(readerState, RS_FEEDING);
 			verifyInvariants();
 			if (acceptingInput()) {
-				readerState = RS_INACTIVE;
 				readNext();
 			} else if (mayAcceptInputLater()) {
 				readNextWhenChannelIdle();
@@ -797,6 +808,8 @@ private:
 	 * a new one, instead of calling `ftruncate()` or something.
 	 * This way, any pending I/O operations in the background won't
 	 * affect correctness.
+	 *
+	 * This method may call callbacks.
 	 */
 	void switchToInMemoryMode() {
 		P_ASSERT_EQ(mode, IN_FILE_MODE);
@@ -804,9 +817,9 @@ private:
 
 		FBC_DEBUG("Recreating file, switching to in-memory mode");
 		cancelWriter();
-		clearBuffers();
 		mode = IN_MEMORY_MODE;
 		inFileMode.reset();
+		clearBuffers(true);
 	}
 
 
@@ -1400,7 +1413,7 @@ public:
 		if (mode == IN_FILE_MODE) {
 			cancelWriter();
 		}
-		clearBuffers();
+		clearBuffers(false);
 		mode = IN_MEMORY_MODE;
 		readerState = RS_INACTIVE;
 		errcode = 0;
@@ -1517,7 +1530,7 @@ public:
 	}
 
 	Json::Value inspectAsJson() const {
-		Json::Value doc;
+		Json::Value doc = Channel::inspectAsJson();
 
 		switch (mode) {
 		case IN_MEMORY_MODE:
@@ -1542,7 +1555,6 @@ public:
 		doc["reader_state"] = getReaderStateString();
 		doc["nbuffers"] = nbuffers;
 		doc["bytes_buffered"] = byteSizeToJson(getBytesBuffered());
-		doc["callback_in_progress"] = !acceptingInput();
 
 		return doc;
 	}

data/ext/common/Utils/SystemMetricsCollector.h

@@ -55,7 +55,6 @@
 #endif
 #ifdef __FreeBSD__
 	#include <sys/param.h>
-	#include <sys/pcpu.h>
 	#include <sys/sysctl.h>
 	#include <sys/resource.h>
 	#include <vm/vm_param.h>

data/ext/common/Utils/VariantMap.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -207,6 +207,13 @@ public:
 		return *this;
 	}
 
+	VariantMap &setDefaultUint(const string &name, unsigned int value) {
+		if (store.find(name) == store.end()) {
+			store[name] = toString(value);
+		}
+		return *this;
+	}
+
 	VariantMap &setULL(const string &name, unsigned long long value) {
 		set(name, toString(value));
 		return *this;
@@ -325,6 +332,20 @@ public:
 		return result;
 	}
 
+	unsigned int getUint(const string &name, bool required = true, unsigned int defaultValue = 0) const {
+		unsigned int result = defaultValue;
+		const string *str;
+		if (lookup(name, required, &str)) {
+			long long val = stringToLL(*str);
+			if (val < 0) {
+				result = 0;
+			} else {
+				result = (unsigned int) val;
+			}
+		}
+		return result;
+	}
+
 	unsigned long long getULL(const string &name, bool required = true,
 		unsigned long long defaultValue = 0) const
 	{