passenger 5.0.0.rc1 → 5.0.0.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY1YWQzNTEzOGZmMDA4YmI2YTEwNjdkZTExMDllZDE5MWIzMGQ3ZA==
+    YzkyZGI4ZTVlOGU4MzAwYjYxNzcxMWUwM2I0NGM0MDVjOTM3ZWVmYw==
   data.tar.gz: !binary |-
-    ZGQzYjM2ZDZiNjc1YjA5NDMzN2NkMGQwZWUwYTk0NjU5MWRjYmMyNQ==
+    ZmQ2ODI5ZTE3NzczZGRlMjE1YTQ5NTdlN2ZkOTQxYTEyNTUzODA1OA==
 SHA512:
   metadata.gz: !binary |-
-    OGU1OGZmNDAzZDY4MThmY2YxNTFlNGY5OWEwZTFiYzhjMmU1MTAxN2UwYWIw
-    M2NhYjA2NmU5N2UwMWQyNzQ4NmUxYjcwMGIxM2E2MjI5OWQ4NDhmNDRlM2Ux
-    M2I1ZDEwMzBhNjJiNDNlZTI3MDc1OGQ5MDZlMzA2Zjg5NzlkNDU=
+    MWY3MzEzY2UzNDAyOTEwYjg1ZWU1YmI2ZDM2OWNmN2JmMGExMjRjMDMyNjBk
+    NWQxNWRhOTZiMWFhZTE3MjU0MmNiZDZjNWQ3YTJkMzcyYzNmMmFkZTgwMzlk
+    MzE2Mzk0NTA3ZTQ1NGVkZjViNWMyZDYwNGM0YWZhMGMwNjY5MmY=
   data.tar.gz: !binary |-
-    MWQ0YTYxZGRiNWZjNDAxZTFlYTgzNzU2YTgyZmFhODJmYjg3MjE1ODI4YzE4
-    MmFhNGM4OTEzNDQ4M2U5MmZiMzQ1OTk1NzYyZDdjOTU0ZjQxNThiMjM3OTJk
-    ODEwZTExZGY2YWU0MTVkOTUxY2U3NGE5M2Y3MjdhYjkwNjRhYzI=
+    YWZjN2JkMTYwZjAxZDM3NmZkMDExZjM1YTMwODUyZDc1ZjllZDE4N2JmOWYz
+    NTdiNTcyNWNmYjQwMzYwMTdlOWQ3N2ZkM2RhNTk3ZTIzNTlmYTE4NWUyZTVj
+    MThjNDQzMzNmZjY3MGNlOTRiNzEzOWVmZGNkZjcyYzBhYmEyMDY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU5fgMAAoJECrHRaUKISqMdiEH/A95x8IXUvRhHFkvyoaspc4/
-CfFfHjwfljWhjwstBpwSuAcFrv4QYMBV331qzQRZM2yI9gln/HaOfaeDSVX7rlyM
-1gd1c/o6GWlbymy/81+3lC4oNy1/nkP37gZH+QQ+42Nv+UHpY6qzMt1TFztqhOfv
-5n1dPZtJMOpsdo1mGgcZeebDuvKsRt1j6PixU2vVJc90L/bd27kcZnKjXn73daol
-idBO8GEKfoUxm7VsoAxESHZLloUI7RWHRntvfW39+EnOyzduZBUFLUCWgpHDewJI
-r3zkbbcrC0q77lVwGDlZMN5s03TuxFWTTIcxhGtkOIkC7fnzD6qm+/eXDPOp/48=
-=arpK
+iQEcBAABAgAGBQJU5zPQAAoJECrHRaUKISqM5EAH/14wc1xeU1EglMA+EXM2mows
+2i17hxn7GzsRiSOeo+F1Xm5fKqQ7NauefjH3Zrz6WAyaJyakwhkkuJYw6z+3Fp1i
+pqrT4puKOQJ3G/2j1hkHbmiRyXLgWUu5Z5gnf45689Nhq80vjZW8X4bBaqeh6ZuR
+67Ch4c8z3JeeSYz05A+S8Evg3RY9SA93lsar+BdTEopGrNhfx4p0DHlb2YwFuMkh
+wJCHG0K2AFleOmrWWaUH9Wg7s8rT4C6Lxy8Hg4Xmda3FF71iahy/19D4EmuuC1+s
+L8wupN2tNq0OwqGwoNFb44QTiistw7C15TSbd0wQQ2Yp7O+ZyK5r+lI2WWY8gaQ=
+=SoHV
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,10 @@
+Release 5.0.0 release candidate 2
+---------------------------------
+
+ * Fixes an installation problem with the Ruby gem due to incorrect Makefile generation. Closes GH-1382.
+ * More helpful message when request queue is full. Closes GH-1375.
+
+
 Release 5.0.0 release candidate 1
 ---------------------------------
 

data/ext/common/ApplicationPool2/Group.h

@@ -444,9 +444,8 @@ public:
 				callback));
 			return true;
 		} else {
-			P_WARN("Request queue is full. Returning an error");
 			postLockActions.push_back(boost::bind(GetCallback::call,
-				callback, SessionPtr(), boost::make_shared<RequestQueueFullException>()));
+				callback, SessionPtr(), boost::make_shared<RequestQueueFullException>(newOptions.maxRequestQueueSize)));
 
 			HookScriptOptions hsOptions;
 			if (prepareHookScriptOptions(hsOptions, "queue_full_error")) {

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -1472,7 +1472,7 @@ Group::getResourceLocator() const {
 
 /* Given a hook name like "queue_full_error", we return HookScriptOptions filled in with this name and a spec
  * (user settings that can be queried from agentsOptions using the external hook name that is prefixed with "hook_")
-
+ *
  * @return false if the user parameters (agentsOptions) are not available (e.g. during ApplicationPool2_PoolTest)
  */
 bool

data/ext/common/Constants.h

@@ -112,7 +112,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.0.rc1"
+	#define PASSENGER_VERSION "5.0.0.rc2"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Exceptions.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -396,13 +396,22 @@ public:
  * the getWaitlist queue was full.
  */
 class RequestQueueFullException: public GetAbortedException {
+private:
+	string msg;
+
 public:
-	RequestQueueFullException()
+	RequestQueueFullException(unsigned int maxQueueSize)
 		: GetAbortedException(oxt::tracable_exception::no_backtrace())
-		{ }
+		{
+			stringstream str;
+			str << "Request queue full (configured max. size: " << maxQueueSize << ")";
+			msg = str.str();
+		}
+
+	virtual ~RequestQueueFullException() throw() {}
 
 	virtual const char *what() const throw() {
-		return "Request queue is full";
+		return msg.c_str();
 	}
 };
 

data/ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -208,7 +208,7 @@ reportSessionCheckoutError(Client *client, Request *req, const ExceptionPtr &e)
 		boost::shared_ptr<RequestQueueFullException> e2 =
 			dynamic_pointer_cast<RequestQueueFullException>(e);
 		if (e2 != NULL) {
-			writeRequestQueueFullExceptionErrorResponse(client, req);
+			writeRequestQueueFullExceptionErrorResponse(client, req, e2);
 			return;
 		}
 	}
@@ -223,7 +223,7 @@ reportSessionCheckoutError(Client *client, Request *req, const ExceptionPtr &e)
 }
 
 void
-writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req) {
+writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req, const boost::shared_ptr<RequestQueueFullException> &e) {
 	TRACE_POINT();
 	const LString *value = req->secureHeaders.lookup("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE");
 	int requestQueueOverflowStatusCode = 503;
@@ -232,6 +232,9 @@ writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req) {
 		requestQueueOverflowStatusCode = stringToInt(
 			StaticString(value->start->data, value->size));
 	}
+
+	SKC_WARN(client, "Returning HTTP " << requestQueueOverflowStatusCode << " due to: " << e->what());
+
 	endRequestWithSimpleResponse(&client, &req,
 		"<h1>This website is under heavy load</h1>"
 		"<p>We're sorry, too many people are accessing this website at the same "

data/ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp

@@ -31,7 +31,7 @@ virtual unsigned int getClientName(const Client *client, char *buf, size_t size)
 	char *pos = buf;
 	const char *end = buf + size - 1;
 	pos += uintToString(threadNumber, pos, end - pos);
-	pos = appendData(pos, end, ".", 1);
+	pos = appendData(pos, end, "-", 1);
 	pos += uintToString(client->number, pos, end - pos);
 	*pos = '\0';
 	return pos - buf;

data/helper-scripts/download_binaries/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  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.
 #
@@ -28,9 +28,11 @@
 # Create a dummy Makefile to prevent 'gem install' from borking out.
 File.open("Makefile", "w") do |f|
   f.puts "all:"
-  f.puts "  true"
+  f.puts "\ttrue"
   f.puts "install:"
-  f.puts "  true"
+  f.puts "\ttrue"
+  f.puts "clean:"
+  f.puts "\ttrue"
 end
 
 # Don't do anything on Windows. We don't support Windows but exiting now

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 = '5.0.0.rc1'
+  VERSION_STRING = '5.0.0.rc2'
 
   PREFERRED_NGINX_VERSION = '1.6.2'
   NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU5fgMAAoJECrHRaUKISqMhBQH/i667vaEo5PDWPZTprBUD5Xu
-lYLsnc4g5TyWYG309u3aOfd3GnZ+hI8gkR3daBZ2SmJWLI3uLfNpNielH8j9m+G8
-JgjLgKw/UiIwrfvqyQHSaCiN7UDx8qM56kYePUFA3GL4WgsTB5nXFq6TUaXp2CqR
-tOB38iLPL978foqMhu1kNiT+7IFj4OZ/L037EZYSGsOvmGF/fSQkQ4eEFa6AH4md
-lLaeEvqaFQculPUFrg2GNjv39fnCNrmDsm+XuMDNf55SX1hma5LOVXnbIufesr//
-ls5lAVBzlmdE9GlCuj4UfdW8MceHvUqm98/dFt5btoB5kaz0xEVPWeEfQMN8FAE=
-=HsCD
+iQEcBAABAgAGBQJU5zPQAAoJECrHRaUKISqMfIMH/ibyDpj/kSqVKpaMJx9B1UBV
+tlfqXzlVT9rDLbsB6B8yFy2kXKKirRUkvFQmXw3l0xivi1xlyBcgW7PA9fkXeSvK
+oUfMkBKaZYKwpcBwC0Pnd3aKAZiD9sEfSrhR73xZSTKZQTJYomPSLmWLJikq/zX/
+iidzjpdQ2OkVxY8LdQj9FH+I2Ebazf1rKiSaY0OSNE5M4kYlm425QfBnfHvjp7Vr
+sv1zlxZtkAiMNsp0khBLb2203xYyy9X8DyhqChO8GuAbA9jfEmiveUNokx+oFCdO
+LOojfJN3f9LhcL2igWy99KmseREjty4q5qli0TFCxCCI4oKka8eUJn9lwX0PHWE=
+=O6BO
 -----END PGP SIGNATURE-----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-20 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
 
-iQEcBAABAgAGBQJU5fgMAAoJECrHRaUKISqM2W8IAIiE6ZNzN5Z8ZOJl04ujPwph
-HsyNPbuc/hokEeFf2rxsNM9T6JgsihckDMWHInNpEGx1xM+5sMNJ8Qka4RW4SImA
-Neb9Q8LIMI5onbNut1u4r8NZAd6D+LJEwyvMoKW5BLtVTLM4nDcN9ck+FLXG+Hi4
-/gclwWQixnxeMyi209hJpQrd6xzXmbj7yhsh3IruunnZYnMEVtyutZuLyTBPTg8g
-5JyukZ4M7z0MyQRmSDWm0BsVUjjDwz1PWyfoYn8rfTGCbKF5DioKQlKkT1RI46EL
-gpJzP4IzyZTSOmbBH47LWudsDG2sYETcKQHluxX5fHgP9d/RRUJYGFWOrwhT9zI=
-=VpfF
+iQEcBAABAgAGBQJU5zPQAAoJECrHRaUKISqMdhUH/2gCqNzD6k9SF95PpPkvpHYd
+eat4jQTLH7kLa/RznZrRSTUE4O6Yr9uvCIAsG5oFFEUEDEuz4cn4V5asWXpjON9b
+QE3w8+TU2MsVS6C34EDU/Krinf/+3faQxD/JxVaPlSDiLo3PkHIt6IZBQQLGFSYI
+FqCx/ipKfnhQJUtWLQwwdQS35qSFYZ/OcY0fgLiM2/YOXW+m/mNTDoxhOPqTV3iD
+aTJj+JMBYuvFfkrNfPRYxt4ZilTKFzwGeAFQOCL8tE/2iMbJ3i4WCW+QeX94qqQN
+G2iuj+IT1HKnfkdlq1mnhO1JcYjREkxJXlHg17GKhC5cyAPmQ5UQDKBXVlcap+w=
+=xp1q
 -----END PGP SIGNATURE-----