passenger 4.0.18 → 4.0.19

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSOKPwAAoJECrHRaUKISqMIWsIAI0gIk9gSi5obV1E6ZzujCtb
-caa6QFENT8p9GY1w6V1vy1j8IX5fH4lVp5NpVpSfLUpebER0NLWChF53xSQ7pt2x
-ai9grp2EWke0mc/U8xpV1b/JdP3+6aAaynk0Gn6aqAz8Oj4Z1L3KL6zaaG8p8HX/
-wmlyjbkXvVxakyk+JIldGjZIsZIskEq2Z9uKfUGj4JVFHSq06d2g3u8tM8hA8QpY
-6DmXvd2d/VV4S/g3UsvDqh69wKIEX43k4PTIgsyOypThkkoEiXcFMniBtnohPTfB
-ShqktUEJUUsTPPtuKaIw/LnrLhE8HscgSn6kSDpsLeLgKDO5P9DIJVEiYQ2V4mI=
-=UqRe
+iQEcBAABAgAGBQJSQSkWAAoJECrHRaUKISqMWtsIAKiNtrucfxuOIVN6wptQyV0B
+E1HSZ00iHfUSh96Tx7avx/QZT4VO76Kn7iWDSuv0txACtdbCWkcvMvEc/8Py2umr
+PnvZm9FpY6yWaF9nd85flihTKHh8TVohYxhYyA+NvBc/qHvYtYwBi2Fq3SmHA7qT
+nkx2Q3uZSE3w8bMfDvTfQL/tO5pidzKxV0pu6SBfQWg8OMpryRVP2dUv4dpg8lDh
+ZsnP+aVW8rxSoOn56Wwhbkqez2/1W1MFo1HG11ms//nSvwjVXRO/XpHhNsIIvrFH
+O8DXuKpcGeB32GQ4xAdX8FrSt4+ecMpraDTtcIEyMU4qagBcgOlXgqofcFCNIUE=
+=H3GZ
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,15 @@
+Release 4.0.19
+--------------
+
+ * Fixed a problem with response buffering. Application processes are now
+   properly marked available for request processing immediately after they're
+   done sending the response, instead of after having sent the entire response
+   to the client.
+ * The "processed" counter in `passenger-status` is now bumped after the process
+   has handled a request, not at the beginning.
+ * [Enterprise] Fixed an off-by-one bug in the `passenger_max_processes` setting.
+
+
 Release 4.0.18
 --------------
 

data/build/packaging.rb

@@ -187,13 +187,20 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 		else
 			dir = "/u/apps/passenger_website/shared"
 			subdir = string_option('NAME', version)
+			git_url = `git config remote.origin.url`.strip
+
 			sh "scp #{PKG_DIR}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
 			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
 			sh "curl -F file=@#{PKG_DIR}/#{basename}.gem --user admin:#{website_config['admin_password']} " +
 				"https://www.phusionpassenger.com/enterprise_gems/upload"
 
+			puts "Initiating building of binaries"
+			command = "cd /srv/passenger_autobuilder/app && " +
+				"/tools/silence-unless-failed chpst -l /tmp/passenger_autobuilder.lock " +
+				"./autobuild-with-pbuilder #{git_url} passenger-enterprise --tag=#{tag}"
+			ssh "psg_autobuilder_run@juvia-helper.phusion.nl at now <<<'#{command}'"
+
 			puts "Initiating building of Debian packages"
-			git_url = `git config remote.origin.url`.strip
 			command = "cd /srv/passenger_apt_automation && " +
 				"chpst -l /tmp/passenger_apt_automation.lock " +
 				"/tools/silence-unless-failed " +

data/ext/common/ApplicationPool2/Process.h

@@ -557,7 +557,6 @@ public:
 		} else {
 			socket->sessions++;
 			this->sessions++;
-			processed++;
 			socket->pqHandle = sessionSockets.push(socket, socket->utilization());
 			lastUsed = SystemTime::getUsec();
 			return make_shared<Session>(shared_from_this(), socket);
@@ -572,6 +571,7 @@ public:
 		
 		socket->sessions--;
 		this->sessions--;
+		processed++;
 		sessionSockets.decrease(socket->pqHandle, socket->utilization());
 		assert(!atFullUtilization());
 	}

data/ext/common/BackgroundEventLoop.cpp

@@ -119,5 +119,10 @@ BackgroundEventLoop::stop() {
 	}
 }
 
+bool
+BackgroundEventLoop::isStarted() const {
+	return priv->thr != NULL;
+}
+
 
 } // namespace Passenger

data/ext/common/BackgroundEventLoop.h

@@ -54,6 +54,7 @@ namespace Passenger {
 		
 		void start(const string &threadName = "", unsigned int stackSize = 1024 * 1024);
 		void stop();
+		bool isStarted() const;
 	};
 
 }

data/ext/common/Constants.h

@@ -72,7 +72,7 @@
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_VERSION "4.0.18"
+	#define PASSENGER_VERSION "4.0.19"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/agents/HelperAgent/FileBackedPipe.h

@@ -344,7 +344,7 @@ private:
 			return;
 		}
 
-		assert(dataState = OPENING_FILE);
+		assert(dataState == OPENING_FILE);
 		if (req.result < 0) {
 			setError(req.errorno);
 		} else {

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1128,6 +1128,7 @@ private:
 		}
 
 		RH_DEBUG(client, "Application sent EOF");
+		client->session.reset();
 		client->endScopeLog(&client->scopeLogs.requestProxying);
 		client->clientOutputPipe->end();
 	}
@@ -2061,7 +2062,10 @@ private:
 
 		RH_TRACE(client, 2, "Sending headers to application");
 
-		if (client->session->getProtocol() == "session") {
+		if (client->session == NULL) {
+			disconnectWithError(client,
+				"Application sent EOF before we were able to send headers to it");
+		} else if (client->session->getProtocol() == "session") {
 			char sizeField[sizeof(uint32_t)];
 			SmallVector<StaticString, 10> data;
 
@@ -2164,15 +2168,20 @@ private:
 	void state_sendingHeaderToApp_onAppOutputWritable(const ClientPtr &client) {
 		state_sendingHeaderToApp_verifyInvariants(client);
 
-		ssize_t ret = gatheredWrite(client->session->fd(), NULL, 0, client->appOutputBuffer);
-		if (ret == -1) {
-			if (errno != EAGAIN && errno != EPIPE && errno != ECONNRESET) {
-				disconnectWithAppSocketWriteError(client, errno);
+		if (client->session == NULL) {
+			disconnectWithError(client,
+				"Application sent EOF before we were able to send headers to it");
+		} else {
+			ssize_t ret = gatheredWrite(client->session->fd(), NULL, 0, client->appOutputBuffer);
+			if (ret == -1) {
+				if (errno != EAGAIN && errno != EPIPE && errno != ECONNRESET) {
+					disconnectWithAppSocketWriteError(client, errno);
+				}
+				// TODO: what about other errors?
+			} else if (client->appOutputBuffer.empty()) {
+				client->appOutputWatcher.stop();
+				sendBodyToApp(client);
 			}
-			// TODO: what about other errors?
-		} else if (client->appOutputBuffer.empty()) {
-			client->appOutputWatcher.stop();
-			sendBodyToApp(client);
 		}
 	}
 
@@ -2216,6 +2225,14 @@ private:
 		}
 
 		RH_TRACE(client, 3, "Forwarding " << size << " bytes of client body data to application.");
+
+		if (client->session == NULL) {
+			RH_TRACE(client, 2, "Application had already sent EOF. Stop reading client input.");
+			client->clientInput->stop();
+			syscalls::shutdown(client->fd, SHUT_RD);
+			return 0;
+		}
+
 		ssize_t ret = syscalls::write(client->session->fd(), data, size);
 		int e = errno;
 		if (ret == -1) {
@@ -2253,7 +2270,7 @@ private:
 
 		RH_TRACE(client, 2, "End of (unbuffered) client body reached; done sending data to application");
 		client->clientInput->stop();
-		if (client->shouldHalfCloseWrite()) {
+		if (client->session != NULL && client->shouldHalfCloseWrite()) {
 			syscalls::shutdown(client->session->fd(), SHUT_WR);
 		}
 	}
@@ -2280,6 +2297,14 @@ private:
 		assert(client->requestBodyIsBuffered);
 
 		RH_TRACE(client, 3, "Forwarding " << size << " bytes of buffered client body data to application.");
+
+		if (client->session == NULL) {
+			RH_TRACE(client, 2, "Application had already sent EOF. Stop reading client input.");
+			syscalls::shutdown(client->fd, SHUT_RD);
+			consumed(0, true);
+			return;
+		}
+
 		ssize_t ret = syscalls::write(client->session->fd(), data, size);
 		if (ret == -1) {
 			int e = errno;
@@ -2306,7 +2331,7 @@ private:
 		assert(client->requestBodyIsBuffered);
 
 		RH_TRACE(client, 2, "End of (buffered) client body reached; done sending data to application");
-		if (client->shouldHalfCloseWrite()) {
+		if (client->session != NULL && client->shouldHalfCloseWrite()) {
 			syscalls::shutdown(client->session->fd(), SHUT_WR);
 		}
 	}

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.18'
+	VERSION_STRING = '4.0.19'
 	
 	PREFERRED_NGINX_VERSION = '1.4.2'
 	NGINX_SHA256_CHECKSUM = '5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'

data/test/cxx/RequestHandlerTest.cpp

@@ -63,10 +63,12 @@ namespace tut {
 		
 		~RequestHandlerTest() {
 			setLogLevel(DEFAULT_LOG_LEVEL);
+			if (bg.isStarted()) {
+				bg.safe->runSync(boost::bind(&RequestHandlerTest::destroy, this));
+			} else {
+				destroy();
+			}
 			unlink(serverFilename.c_str());
-			handler.reset();
-			pool->destroy();
-			pool.reset();
 		}
 
 		void init() {
@@ -74,6 +76,13 @@ namespace tut {
 			bg.start();
 		}
 
+		void destroy() {
+			handler.reset();
+			pool->destroy();
+			pool.reset();
+			ev_break(bg.loop, EVBREAK_ALL);
+		}
+
 		void initPoolDebugging() {
 			pool->initDebugging();
 			debug = pool->debugSupport;
@@ -151,7 +160,7 @@ namespace tut {
 		}
 	};
 
-	DEFINE_TEST_GROUP(RequestHandlerTest);
+	DEFINE_TEST_GROUP_WITH_LIMIT(RequestHandlerTest, 80);
 
 	TEST_METHOD(1) {
 		// Test one normal request.
@@ -914,6 +923,31 @@ namespace tut {
 		ensure(response.find("This website is under heavy load") != string::npos);
 	}
 
+	TEST_METHOD(51) {
+		set_test_name("It relieves the application process after having read its entire response data");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/blob",
+			NULL);
+		vector<ProcessPtr> processes;
+		EVENTUALLY(5,
+			processes = pool->getProcesses();
+			result = processes.size() == 1;
+		);
+		EVENTUALLY(5,
+			LockGuard l(pool->syncher);
+			result = processes[0]->processed == 1;
+		);
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals("The session is closed before the client is done reading",
+				processes[0]->sessions, 0);
+		}
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.18
+  version: 4.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSOKPwAAoJECrHRaUKISqMlkcIAIyquE2ypVcCq8Kds8gncXoI
-T94rU5e49Jxqfzd8jxz0CDihW6wI+CvkuVOxziZdZaYfVYaBm3oGn7zhmhC6mQhL
-+B6g5NqzANlaty3OBCufl4yvAKMFw4M8GLc0nxtSdVdAwEKiI45gZY3WEZxwA74q
-aMZrVFACgXmYijayxqiHBUqITYEjMqrlAbpLjUNgulhKzwNNlpGhL2VeBg4t0Bpr
-NMldNutbg1Sc0PmIyIXOXmZJWtpYBm24RcrGyWCF6qikPWIEtpU9l3edLTKVmUHP
-J0hO08TMC7bDfE3qT3jB+KxGlXDPVFyO2cIn7+73llsZvricCWqr+GxTq5bCm88=
-=49PA
+iQEcBAABAgAGBQJSQSkWAAoJECrHRaUKISqM2EkH/ipt34zAO/CrdwkuXBOMzpXy
+VMVuZXXrVLZTqF8EdkjB3eq5pcwxrnfqQwOUfvLsyhc0rWKXxoWP0KOjm+bLpX4x
+O+skjXJleMSk63nH792obDFCR6x7BYx+oqaDDokvL1l04b6w4HJGWujCPcaIvc49
+CGo7U8d/ST2RilYpKAdkeaHD1Ms+kDObl7lbX/wLKMeuRYUbaEThI6wK3oKv7K4G
+zzQeVf05TdGpCV/sn3c5rhRCgqlde8xqLgDTxUiOeWKq3AwJYw1Mq20rHFf/8hBL
+NYlizIKtAXEZoTOdsX2BZ/vZfYIEinDbGO1rNx2hoCfh2daYhi5fnzDOn28vLrc=
+=b5ry
 -----END PGP SIGNATURE-----