passenger 5.0.25 → 5.0.26

data/build/cxx_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -46,8 +46,8 @@ TEST_CXX_OBJECTS = {
     "test/cxx/Core/UnionStationTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Core/ResponseCacheTest.o" =>
     "test/cxx/Core/ResponseCacheTest.cpp",
-  # "#{TEST_OUTPUT_DIR}cxx/Core/RequestHandlerTest.o" =>
-  #   "test/cxx/Core/RequestHandlerTest.cpp",
+  "#{TEST_OUTPUT_DIR}cxx/Core/ControllerTest.o" =>
+    "test/cxx/Core/ControllerTest.cpp",
 
   "#{TEST_OUTPUT_DIR}cxx/UstRouter/TransactionTest.o" =>
     "test/cxx/UstRouter/TransactionTest.cpp",

data/build/misc.rb

@@ -137,6 +137,7 @@ task :contributors do
   entries.push "Sean Wilkinson"
   entries.push "Yichun Zhang"
   entries.delete "OnixGH"
+  entries.push "Ruslan Ermilov (NGINX Inc)"
   File.open("CONTRIBUTORS", "w") do |f|
     f.puts(entries.sort{ |a, b| a.downcase <=> b.downcase }.join("\n"))
   end

data/dev/index_cxx_dependencies.rb

@@ -191,11 +191,12 @@ end
 
 def generate_full_map(basic_map)
   result = {}
-  basic_map.each_pair do |source_file, deps|
+  basic_map.keys.sort.each do |source_file|
+    deps = basic_map[source_file]
     gather_results = {}
     gather_all_dependencies_recursively(
       source_file, basic_map, gather_results)
-    result[source_file] = gather_results.keys
+    result[source_file] = gather_results.keys.sort
   end
   result
 end

data/resources/templates/standalone/config.erb

@@ -22,7 +22,7 @@
 
 worker_processes 1;
 events {
-    worker_connections 1024;
+    worker_connections 4096;
 }
 
 http {

data/resources/templates/standalone/http.erb

@@ -33,6 +33,7 @@ passenger_user_switching off;
 <%= nginx_http_option(:turbocaching) %>
 <%= nginx_http_option(:instance_registry_dir) %>
 <%= nginx_http_option(:data_buffer_dir) %>
+<%= nginx_http_option(:core_file_descriptor_ulimit) %>
 <%= nginx_http_option(:union_station_gateway_address) %>
 <%= nginx_http_option(:union_station_gateway_port) %>
 <%= nginx_http_option(:union_station_gateway_cert) %>

data/resources/templates/standalone/server.erb

@@ -47,6 +47,7 @@ passenger_enabled on;
 <%= nginx_option(app, :vary_turbocache_by_cookie) %>
 <%= nginx_option(app, :meteor_app_settings) %>
 <%= nginx_option(app, :load_shell_envvars) %>
+<%= nginx_option(app, :app_file_descriptor_ulimit) %>
 <%= nginx_option(app, :friendly_error_pages) %>
 <%= nginx_option(app, :abort_websockets_on_process_shutdown) %>
 <%= nginx_option(app, :force_max_concurrent_requests_per_process) %>

data/src/agent/Core/ApplicationPool/AbstractSession.h

@@ -0,0 +1,83 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2016 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_APPLICATION_POOL_ABSTRACT_SESSION_H_
+#define _PASSENGER_APPLICATION_POOL_ABSTRACT_SESSION_H_
+
+#include <sys/types.h>
+#include <boost/atomic.hpp>
+#include <boost/intrusive_ptr.hpp>
+#include <StaticString.h>
+#include <Shared/ApplicationPoolApiKey.h>
+
+namespace Passenger {
+namespace ApplicationPool2 {
+
+
+/**
+ * An abstract base class for Session so that unit tests can work with
+ * a mocked version of it.
+ */
+class AbstractSession {
+public:
+	virtual ~AbstractSession() {}
+
+	virtual void ref() const = 0;
+	virtual void unref() const = 0;
+
+	virtual pid_t getPid() const = 0;
+	virtual StaticString getGupid() const = 0;
+	virtual StaticString getProtocol() const = 0;
+	virtual unsigned int getStickySessionId() const = 0;
+	virtual const ApiKey &getApiKey() const = 0;
+	virtual int fd() const = 0;
+	virtual bool isClosed() const = 0;
+
+	virtual void initiate(bool blocking = true) = 0;
+
+	virtual void requestOOBW() { /* Do nothing */ }
+
+	/**
+	 * This Session object becomes fully unsable after closing.
+	 */
+	virtual void close(bool success, bool wantKeepAlive = false) = 0;
+};
+
+
+inline void
+intrusive_ptr_add_ref(const AbstractSession *session) {
+	session->ref();
+}
+
+inline void
+intrusive_ptr_release(const AbstractSession *session) {
+	session->unref();
+}
+
+
+} // namespace ApplicationPool2
+} // namespace Passenger
+
+#endif /* _PASSENGER_APPLICATION_POOL2_ABSTRACT_SESSION_H_ */

data/src/agent/Core/ApplicationPool/Common.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -57,6 +57,7 @@ class Pool;
 class Group;
 class Process;
 class Socket;
+class AbstractSession;
 class Session;
 
 /**
@@ -164,6 +165,7 @@ enum RestartMethod {
 typedef boost::shared_ptr<Pool> PoolPtr;
 typedef boost::shared_ptr<Group> GroupPtr;
 typedef boost::intrusive_ptr<Process> ProcessPtr;
+typedef boost::intrusive_ptr<AbstractSession> AbstractSessionPtr;
 typedef boost::intrusive_ptr<Session> SessionPtr;
 typedef boost::shared_ptr<tracable_exception> ExceptionPtr;
 typedef StringKeyTable<GroupPtr> GroupMap;
@@ -171,14 +173,14 @@ typedef boost::function<void (const ProcessPtr &process, DisableResult result)>
 typedef boost::function<void ()> Callback;
 
 struct GetCallback {
-	void (*func)(const SessionPtr &session, const ExceptionPtr &e, void *userData);
+	void (*func)(const AbstractSessionPtr &session, const ExceptionPtr &e, void *userData);
 	mutable void *userData;
 
-	void operator()(const SessionPtr &session, const ExceptionPtr &e) const {
+	void operator()(const AbstractSessionPtr &session, const ExceptionPtr &e) const {
 		func(session, e, userData);
 	}
 
-	static void call(GetCallback cb, const SessionPtr &session, const ExceptionPtr &e) {
+	static void call(GetCallback cb, const AbstractSessionPtr &session, const ExceptionPtr &e) {
 		cb(session, e);
 	}
 };

data/src/agent/Core/ApplicationPool/Options.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -281,6 +281,8 @@ public:
 	 */
 	StaticString environmentVariables;
 
+	unsigned int fileDescriptorUlimit;
+
 	/**
 	 * If set to a value that isn't -1, makes Passenger ignore the application's
 	 * advertised socket concurrency, and believe that the concurrency should be
@@ -476,6 +478,7 @@ public:
 		  ruby(DEFAULT_RUBY, sizeof(DEFAULT_RUBY) - 1),
 		  python(DEFAULT_PYTHON, sizeof(DEFAULT_PYTHON) - 1),
 		  nodejs(DEFAULT_NODEJS, sizeof(DEFAULT_NODEJS) - 1),
+		  fileDescriptorUlimit(0),
 		  forceMaxConcurrentRequestsPerProcess(-1),
 		  debugger(false),
 		  loadShellEnvvars(true),

data/src/agent/Core/ApplicationPool/Pool.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -327,7 +327,7 @@ public:
 	template<typename Queue> static void assignExceptionToGetWaiters(Queue &getWaitlist,
 		const ExceptionPtr &exception,
 		boost::container::vector<Callback> &postLockActions);
-	static void syncGetCallback(const SessionPtr &session, const ExceptionPtr &e,
+	static void syncGetCallback(const AbstractSessionPtr &session, const ExceptionPtr &e,
 		void *userData);
 
 

data/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp

@@ -61,17 +61,14 @@ Pool::collectAnalytics(PoolPtr self) {
 			P_WARN("ERROR: " << e.what() << "\n  Backtrace:\n" << e.backtrace());
 		}
 
-		// Sleep for about 4 seconds, aligned to seconds boundary
-		// for saving power on laptops.
 		UPDATE_TRACE_POINT();
 		unsigned long long currentTime = SystemTime::getUsec();
-		unsigned long long deadline =
-			roundUp<unsigned long long>(currentTime, 1000000) + 4000000;
+		unsigned long long sleepTime = timeToNextMultipleULL(5000000, currentTime);
 		P_DEBUG("Analytics collection done; next analytics collection in " <<
-			std::fixed << std::setprecision(3) << ((deadline - currentTime) / 1000000.0) <<
+			std::fixed << std::setprecision(3) << (sleepTime / 1000000.0) <<
 			" sec");
 		try {
-			syscalls::usleep(deadline - currentTime);
+			syscalls::usleep(sleepTime);
 		} catch (const thread_interrupted &) {
 			break;
 		} catch (const tracable_exception &e) {

data/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -196,13 +196,13 @@ Pool::assignExceptionToGetWaiters(Queue &getWaitlist,
 }
 
 void
-Pool::syncGetCallback(const SessionPtr &session, const ExceptionPtr &e,
+Pool::syncGetCallback(const AbstractSessionPtr &session, const ExceptionPtr &e,
 	void *userData)
 {
 	Ticket *ticket = static_cast<Ticket *>(userData);
 	ScopedLock lock(ticket->syncher);
 	if (OXT_LIKELY(session != NULL)) {
-		ticket->session = session;
+		ticket->session = static_pointer_cast<Session>(session);
 	} else {
 		ticket->exception = e;
 	}

data/src/agent/Core/ApplicationPool/Session.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -28,7 +28,6 @@
 
 #include <sys/types.h>
 #include <boost/atomic.hpp>
-#include <boost/intrusive_ptr.hpp>
 #include <oxt/macros.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>
@@ -38,6 +37,7 @@
 #include <Core/ApplicationPool/BasicProcessInfo.h>
 #include <Core/ApplicationPool/BasicGroupInfo.h>
 #include <Core/ApplicationPool/Socket.h>
+#include <Core/ApplicationPool/AbstractSession.h>
 #include <Shared/ApplicationPoolApiKey.h>
 
 namespace Passenger {
@@ -62,7 +62,7 @@ using namespace oxt;
  * so in that case you must not destroy Pool before destroying all Session
  * objects.
  */
-class Session {
+class Session: public AbstractSession {
 public:
 	typedef void (*Callback)(Session *session);
 
@@ -151,22 +151,22 @@ public:
 	}
 
 
-	const ApiKey &getApiKey() const {
+	virtual const ApiKey &getApiKey() const {
 		assert(!closed);
 		return processInfo->groupInfo->apiKey;
 	}
 
-	pid_t getPid() const {
+	virtual pid_t getPid() const {
 		assert(!closed);
 		return processInfo->pid;
 	}
 
-	StaticString getGupid() const {
+	virtual StaticString getGupid() const {
 		assert(!closed);
 		return StaticString(processInfo->gupid, processInfo->gupidSize);
 	}
 
-	unsigned int getStickySessionId() const {
+	virtual unsigned int getStickySessionId() const {
 		assert(!closed);
 		return processInfo->stickySessionId;
 	}
@@ -176,12 +176,12 @@ public:
 		return socket;
 	}
 
-	StaticString getProtocol() const {
+	virtual StaticString getProtocol() const {
 		return getSocket()->protocol;
 	}
 
 
-	void initiate(bool blocking = true) {
+	virtual void initiate(bool blocking = true) {
 		assert(!closed);
 		ScopeGuard g(boost::bind(&Session::callOnInitiateFailure, this));
 		Connection connection = socket->checkoutConnection();
@@ -200,8 +200,7 @@ public:
 		return connection.fd != -1;
 	}
 
-	OXT_FORCE_INLINE
-	int fd() const {
+	virtual int fd() const {
 		assert(!closed);
 		return connection.fd;
 	}
@@ -209,7 +208,7 @@ public:
 	/**
 	 * This Session object becomes fully unsable after closing.
 	 */
-	void close(bool success, bool wantKeepAlive = false) {
+	virtual void close(bool success, bool wantKeepAlive = false) {
 		if (OXT_LIKELY(initiated())) {
 			deinitiate(success, wantKeepAlive);
 		}
@@ -220,18 +219,18 @@ public:
 		socket = NULL;
 	}
 
-	bool isClosed() const {
+	virtual bool isClosed() const {
 		return closed;
 	}
 
-	void requestOOBW();
+	virtual void requestOOBW();
 
 
-	void ref() const {
+	virtual void ref() const {
 		refcount.fetch_add(1, boost::memory_order_relaxed);
 	}
 
-	void unref() const {
+	virtual void unref() const {
 		if (refcount.fetch_sub(1, boost::memory_order_release) == 1) {
 			boost::atomic_thread_fence(boost::memory_order_acquire);
 			destroySelf();
@@ -240,17 +239,6 @@ public:
 };
 
 
-inline void
-intrusive_ptr_add_ref(const Session *session) {
-	session->ref();
-}
-
-inline void
-intrusive_ptr_release(const Session *session) {
-	session->unref();
-}
-
-
 } // namespace ApplicationPool2
 } // namespace Passenger
 

data/src/agent/Core/ApplicationPool/TestSession.h

@@ -0,0 +1,188 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2016 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_APPLICATION_POOL_TEST_SESSION_H_
+#define _PASSENGER_APPLICATION_POOL_TEST_SESSION_H_
+
+#include <boost/thread.hpp>
+#include <string>
+#include <cassert>
+#include <Utils/IOUtils.h>
+#include <Utils/BufferedIO.h>
+#include <Core/ApplicationPool/AbstractSession.h>
+
+namespace Passenger {
+namespace ApplicationPool2 {
+
+using namespace std;
+
+
+class TestSession: public AbstractSession {
+private:
+	mutable boost::mutex syncher;
+	mutable unsigned int refcount;
+	pid_t pid;
+	string gupid;
+	string protocol;
+	ApiKey apiKey;
+	SocketPair connection;
+	BufferedIO peerBufferedIO;
+	unsigned int stickySessionId;
+	mutable bool closed;
+	mutable bool success;
+	mutable bool wantKeepAlive;
+
+public:
+	TestSession()
+		: refcount(1),
+		  pid(123),
+		  gupid("gupid-123"),
+		  protocol("session"),
+		  stickySessionId(0),
+		  closed(false),
+		  success(false),
+		  wantKeepAlive(false)
+		{ }
+
+	virtual void ref() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		assert(refcount > 0);
+		refcount++;
+	}
+
+	virtual void unref() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		assert(refcount > 0);
+		refcount--;
+		if (refcount == 0) {
+			if (!closed) {
+				closed = true;
+				success = false;
+				wantKeepAlive = false;
+			}
+		}
+	}
+
+	virtual pid_t getPid() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return pid;
+	}
+
+	void setPid(pid_t p) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		pid = p;
+	}
+
+	virtual StaticString getGupid() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return gupid;
+	}
+
+	void setGupid(const string &v) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		gupid = v;
+	}
+
+	virtual StaticString getProtocol() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return protocol;
+	}
+
+	void setProtocol(const string &v) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		protocol = v;
+	}
+
+	virtual unsigned int getStickySessionId() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return stickySessionId;
+	}
+
+	void setStickySessionId(unsigned int v) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		stickySessionId = v;
+	}
+
+	virtual const ApiKey &getApiKey() const {
+		return apiKey;
+	}
+
+	virtual int fd() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return connection.first;
+	}
+
+	virtual int peerFd() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return connection.second;
+	}
+
+	virtual BufferedIO &getPeerBufferedIO() {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return peerBufferedIO;
+	}
+
+	virtual bool isClosed() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return closed;
+	}
+
+	bool isSuccessful() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return success;
+	}
+
+	bool wantsKeepAlive() const {
+		boost::lock_guard<boost::mutex> l(syncher);
+		return wantKeepAlive;
+	}
+
+	virtual void initiate(bool blocking = true) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		connection = createUnixSocketPair(__FILE__, __LINE__);
+		peerBufferedIO = BufferedIO(connection.second);
+		if (!blocking) {
+			setNonBlocking(connection.first);
+		}
+	}
+
+	virtual void close(bool _success, bool _wantKeepAlive = false) {
+		boost::lock_guard<boost::mutex> l(syncher);
+		closed = true;
+		success = _success;
+		wantKeepAlive = _wantKeepAlive;
+	}
+
+	void closePeerFd() {
+		boost::lock_guard<boost::mutex> l(syncher);
+		connection.second.close();
+	}
+};
+
+
+} // namespace ApplicationPool2
+} // namespace Passenger
+
+#endif /* _PASSENGER_APPLICATION_POOL2_TEST_SESSION_H_ */