passenger 5.0.15 → 5.0.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODZjYzJlNjU3ZTVlODhjZGNlY2ZjYTIxZWUyMjQzZTIwNDQ1ZTIzNg==
+    ZDgwN2RlMjY2MzQ4NWZkZmMwY2ZhYjUwYTVlZjJiNWRiODY3YmZkZg==
   data.tar.gz: !binary |-
-    NWU1NGVmMTNiNGNjYmM0Y2E0MWE3YmM4MTAyZDVhZmNiNTFiMGZmZg==
+    YTZhZDg3NGMzMDUyNjgwNTY1Y2I2MmNmZDIwZDMzNTU4ZmZjYmJkZA==
 SHA512:
   metadata.gz: !binary |-
-    ZGYzZTY5MmQzMjVjZmU3NGI0YjYxYTM1ZWIzY2I0YTk5ZmUwYTNlOGI5MDRm
-    OTk3MDc1MjNiZTJmZGVjOTY5OTQzYWM5NDEzN2Q5YTU0OGEyMWUwYTZkZGZi
-    YjRjMThjZmQ2OTdhZGE1ZTEwYjUwZGYyNmVhZWRjOGFlMGFlZmE=
+    YzMwMTBhYmQzMTQ4YWYwNDk4ZjYyZmVlYjBhZmZjY2NhY2MxZjYxMGQzODVl
+    ODIyMmQ1MTlkNjVlNjU3MzgyYzNmYmNhOGQxNDQzYjJiMTUwOWY5MGRkYmNh
+    NWE1YTZhOWRiYTFlMDEyZGRiNmJmNGMxNGM5NWQ5YjM1M2QxYjA=
   data.tar.gz: !binary |-
-    NmE0MmU1OGZhOTM2ZTI3OGU2ZTFmMjIxZDIxYTZkMGUwM2I5ZjYyOGRmOTAx
-    NDkxODE1OGNkMDhmZTQxMWFkMDY2OTdhMTJkYzIwODE3ZDEzNjMyOWFlYjY0
-    MWM0NmI2OGFhNzAwMWFjZTNmOTE3NWM0YTM0NDEyMDk0MTgwMDU=
+    YjZlNzVmY2EwYzgyYjVkNTY5YTk4ZWRhYjRmNjM2MTA2NjQ2ZWY1NTZlM2I2
+    Y2VmODIwMDg1ODdkZDE5NjljOWUxMzVmM2I4N2M0N2MyZDU1YWNmN2RhOGQx
+    Y2U2MDJmZmRjNWQ4MDU1NzYyOGU4OTAyZjkzYzFlMTJiYzNlNWE=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVuJ34AAoJECrHRaUKISqMAv4H/2a7GvsZ/7rREszICP9/2hpE
-LJvK5PsjZHpM1xLyjGAeVP+h6WYanTUXhGYa57S1hEcxauF7SV6vQatSIWxNrmEy
-VjWXzSbJmaGc+MzOd/FaRXnHK2bNp/7QVsgrmOl50JA8dqD2Ub6kVmZ8iUH7Aa1m
-sp6Itegjs6C7wZuyaepQnyA6rOpvMnncZS/cY0UgucGriE++2wHYvgi/17nckP8t
-IUpX9T3LwporEUv1TDqszLnI2EVCrgW7Efm7/wVBLtp5pcwQOzQZB6VrB2flgZXc
-1fl1G2euM8zLrDc7iaXw1aceGdnB0wrJ3UhYebGkNkphir2fGD8Zj1pCjRfpCZk=
-=8Zp2
+iQEcBAABAgAGBQJV2sAHAAoJECrHRaUKISqM6SQH/jeVr+ImP7XMpKXQa4N1dP44
+W98ONW4xh4fbtj30M6MXn6NToQQsTRtY+zlOIoJgRnv7z3PaVvZ2gSbpH0d7/LdS
+yreVlchOjFzNE6wMDOTkM6AZAZVW9kBODvUTJenyophe08fqi7fZv6BrD8SLbrJH
+FausNhLMwdeA6MDQi1sW6uPXIml5B4shVPeKnF+MKmbI/UGykIESTZROQ5XiQxVo
+kWcMQDsa5D9Q8nP8xbyR3M2qzFpQ/muRXx1GC2dL+zlbUismCCgoH6StjAu2FXex
+d+mJ+5dUfNgmM7k8gIF057+AFkks94d4s/9YvftUpSWa94hqSyyDfX5K8An9Vmo=
+=wJYU
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVuJ34AAoJECrHRaUKISqM6soIALpuDRkmefIcwE9Tq/vrVE4/
-KsV/qPlJ6izfkfJhIAaQ8AZfXRzWV6vXD05FN91G7n7qgrBJbrd1ClS8lNEiey1C
-PM/o/0gGwJi5eIgPmtqhwLqjEhr561w5yKyW61d8NTiF0yEAX0w+XVKXfnmTjUb3
-H9uZJnFqBBMhaFHttqVtjB563+D+sK3YrqaDjzOS8bO7QgHv/G622/6bcnFMIqn6
-46drtEF3yuEWXTmu2JHBK4g169lzQKYlSMWj+PuWdzxZ4j4LVtWovw8qgISzwMrC
-1JVo0DcMM+q5/va8GtHHGrI1ozWqAF2Bfv3VDZ8hiq4YICi8hcNWD5c4cc7rewQ=
-=sIbu
+iQEcBAABAgAGBQJV2sAHAAoJECrHRaUKISqM84UIAIEpdsK4nlS/ZxJEF6JUlWDL
+t6AMVofl4ySl2SI5baoSI4lLvDfxaAA0rnOXdgDa43sdFbDu4o1ClrqixAaYGVy+
+WL9natVctyF1/HKnLz+k0NihAFWAogJ46/M6Wj6RBwm66sPIqM8h3FdPMIPIsiQz
+Z9/MopM0LX32+8tSPRo3dpjZhSw8pwsX7VKrxpnaAR2thr7ZiNpeP6d0VYceIcf4
+IYV2eDR3y47hzHcRPRkrauewHDOP1yW1xz3V7YIR/Azl2iMg3njS0Yojl2z4tBQN
+4by87m9bLXj3H5WvYlPdgZQ8XoRaOnwnLxirHPlKQWSQgATigSQ/2r08BdJ+CXQ=
+=Y7ud
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 5.0.16
+--------------
+
+ * Allows independent configuration of Union Station gateway address, port and certificate. Closes GH-1543.
+ * Supports seek() such that body.rewind works when using Rack middleware that uses Zlib::GzipReader (e.g. for compressed requests). Closes GH-1553.
+ * [Apache] Improves detection of Apache configuration file problems. Closes GH-1577.
+ * [Enterprise] Fixes installation of the Passenger Enterprise Apache module on Debian Testing.
+ * Fixes logging of HTTP response code for Union Station. This regression was introduced by Passenger 5. Closes GH-1581. 
+ * Adds a new subcommand `passenger-config about support-binaries-dir`.
+ * Fixes a regression in the Node.js loader with regard to custom startup files. This bug was introduced in 5.0.14. Closes GH-1557 (again).
+ * Fixes a crash when a Ruby application is accessed through a sub-URI and a root virtual host at the same time.
+
+
 Release 5.0.15
 --------------
 

data/bin/passenger-install-apache2-module

@@ -823,6 +823,14 @@ private
   end
 
   def validate_install
+    # By compiling Passenger, we may have changed Apache's state. For example,
+    # if 'apache2ctl -V' failed because it referenced an Apache module that
+    # didn't exist, then it may exist now, causing 'apache2ctl -V' to succeed.
+    # We want ValidateInstallCommand to reflect the current Apache state,
+    # not the one before compilation started, so we clear PlatformInfo
+    # memoizations here.
+    PlatformInfo.clear_memoizations
+
     new_screen
     puts "<banner>Validating installation...</banner>"
     puts

data/build/agents.rb

@@ -23,8 +23,7 @@
 
 AGENT_OBJECTS = {
   'WatchdogMain.o' => [
-    'ext/common/agent/Watchdog/Main.cpp',
-    'ext/common/agent/Watchdog/Main.cpp',
+    'ext/common/agent/Watchdog/WatchdogMain.cpp',
     'ext/common/agent/Watchdog/AgentWatcher.cpp',
     'ext/common/agent/Watchdog/CoreWatcher.cpp',
     'ext/common/agent/Watchdog/UstRouterWatcher.cpp',
@@ -43,7 +42,7 @@ AGENT_OBJECTS = {
     'ext/common/Utils/VariantMap.h'
   ],
   'CoreMain.o' => [
-    'ext/common/agent/Core/Main.cpp',
+    'ext/common/agent/Core/CoreMain.cpp',
     'ext/common/agent/Core/OptionParser.h',
     'ext/common/agent/Core/ApiServer.h',
     'ext/common/agent/Core/ResponseCache.h',
@@ -85,7 +84,7 @@ AGENT_OBJECTS = {
     'ext/common/Utils/VariantMap.h'
   ],
   'UstRouterMain.o' => [
-    'ext/common/agent/UstRouter/Main.cpp',
+    'ext/common/agent/UstRouter/UstRouterMain.cpp',
     'ext/common/agent/UstRouter/OptionParser.h',
     'ext/common/agent/UstRouter/ApiServer.h',
     'ext/common/agent/UstRouter/LoggingServer.h',
@@ -105,14 +104,14 @@ AGENT_OBJECTS = {
     'ext/common/Utils/BlockingQueue.h'
   ],
   'SystemMetricsMain.o' => [
-    'ext/common/agent/SystemMetrics/Main.cpp',
+    'ext/common/agent/SystemMetrics/SystemMetricsMain.cpp',
     'ext/common/Utils/SystemMetricsCollector.h'
   ],
   'TempDirToucherMain.o' => [
-    'ext/common/agent/TempDirToucher/Main.cpp'
+    'ext/common/agent/TempDirToucher/TempDirToucherMain.cpp'
   ],
   'SpawnPreparerMain.o' => [
-    'ext/common/agent/SpawnPreparer/Main.cpp'
+    'ext/common/agent/SpawnPreparer/SpawnPreparerMain.cpp'
   ]
 }
 
@@ -138,7 +137,7 @@ agent_libs = COMMON_LIBRARY.
 agent_objects = AGENT_OBJECTS.keys.map { |x| "#{AGENT_OUTPUT_DIR}#{x}" }
 dependencies = agent_objects + [
   'ext/common/Constants.h',
-  'ext/common/agent/Main.cpp',
+  'ext/common/agent/AgentMain.cpp',
   LIBBOOST_OXT,
   agent_libs.link_objects,
   LIBEV_TARGET,
@@ -147,7 +146,7 @@ dependencies = agent_objects + [
 file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
   agent_objects_as_string = agent_objects.join(" ")
   sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-  compile_cxx("ext/common/agent/Main.cpp",
+  compile_cxx("ext/common/agent/AgentMain.cpp",
     "-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
     "#{EXTRA_PRE_CXXFLAGS} " <<
     "-Iext -Iext/common " <<

data/build/cxx_tests.rb

@@ -197,7 +197,7 @@ TEST_CXX_OBJECTS = {
   #   ext/common/UnionStation/Connection.h
   #   ext/common/UnionStation/Core.h
   #   ext/common/UnionStation/Transaction.h
-  #   ext/common/UnionStation/ScopeLog.h
+  #   ext/common/UnionStation/StopwatchLog.h
   #   ext/common/ApplicationPool2/Pool.h
   #   ext/common/ApplicationPool2/SuperGroup.h
   #   ext/common/ApplicationPool2/Group.h

data/build/misc.rb

@@ -42,8 +42,8 @@ task :sloccount do
       "ext/nginx",
       "ext/common",
       "ext/oxt",
-      "ext/phusion_passenger/*.c",
-      "test/**/*.{cpp,rb,h}"
+      "ext/ruby/*.c",
+      "helper-scripts/*"
     ]
   ensure
     system "rm -rf #{tmpdir}"

data/doc/Users guide Apache.html

@@ -1073,7 +1073,7 @@ pre {
 <img src="images/phusion_banner.png" alt="images/phusion_banner.png">
 </a>
 </span></p></div>
-<div class="paragraph"><p>This is the old, deprecated Passenger Standalone documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
+<div class="paragraph"><p>This is the old, deprecated Passenger for Apache documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
 </div>
 </div>
 <div id="toc">

data/doc/Users guide Apache.txt

@@ -3,7 +3,7 @@ Phusion Passenger users guide, Apache version
 
 image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
-This is the old, deprecated Passenger Standalone documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.
+This is the old, deprecated Passenger for Apache documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.
 
 
 == Support information

data/doc/Users guide Nginx.html

@@ -1073,7 +1073,7 @@ pre {
 <img src="images/phusion_banner.png" alt="images/phusion_banner.png">
 </a>
 </span></p></div>
-<div class="paragraph"><p>This is the old, deprecated Passenger Standalone documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
+<div class="paragraph"><p>This is the old, deprecated Passenger for Nginx documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
 </div>
 </div>
 <div id="toc">

data/doc/Users guide Nginx.txt

@@ -3,7 +3,7 @@ Phusion Passenger users guide, Nginx version
 
 image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
-This is the old, deprecated Passenger Standalone documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.
+This is the old, deprecated Passenger for Nginx documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.
 
 
 == Support information

data/doc/Users guide.html

@@ -1085,7 +1085,7 @@ pre {
 <div class="sect1">
 <span class="anchor_helper" id="_the_documentation_has_moved"></span><h2 data-anchor="_the_documentation_has_moved">1. The documentation has moved</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>This is the old, deprecated Passenger Standalone documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
+<div class="paragraph"><p>This is the old, deprecated Passenger documentation. Please visit <a href="https://www.phusionpassenger.com/library/">https://www.phusionpassenger.com/library/</a> for the new documentation.</p></div>
 </div>
 </div>
 </div>

data/doc/Users guide.txt

@@ -5,4 +5,4 @@ image:images/phusion_banner.png[link="http://www.phusion.nl/"]
 
 == The documentation has moved
 
-This is the old, deprecated Passenger Standalone documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.
+This is the old, deprecated Passenger documentation. Please visit https://www.phusionpassenger.com/library/ for the new documentation.

data/ext/common/ApplicationPool2/Group/InitializationAndShutdown.cpp

@@ -58,7 +58,7 @@ Group::generateUuid(const Pool *pool) {
 
 bool
 Group::shutdownCanFinish() const {
-	LifeStatus lifeStatus = (LifeStatus) this->lifeStatus.load(boost::memory_order_relaxed);
+	LifeStatus lifeStatus = (LifeStatus) this->lifeStatus.load(boost::memory_order_seq_cst);
 	return lifeStatus == SHUTTING_DOWN
 		&& enabledCount == 0
 		&& disablingCount == 0
@@ -83,7 +83,7 @@ Group::finishShutdown(boost::container::vector<Callback> &postLockActions) {
 	}
 	postLockActions.push_back(boost::bind(interruptAndJoinAllThreads,
 		shared_from_this()));
-	this->lifeStatus.store(SHUT_DOWN, boost::memory_order_release);
+	this->lifeStatus.store(SHUT_DOWN, boost::memory_order_seq_cst);
 	selfPointer.reset();
 }
 
@@ -182,7 +182,7 @@ Group::shutdown(const Callback &callback,
 	spawner.reset();
 	selfPointer = shared_from_this();
 	assert(disableWaitlist.empty());
-	lifeStatus.store(SHUTTING_DOWN, boost::memory_order_release);
+	lifeStatus.store(SHUTTING_DOWN, boost::memory_order_seq_cst);
 }
 
 

data/ext/common/ApplicationPool2/Group/LifetimeAndBasics.cpp

@@ -55,7 +55,7 @@ Group::isAlive() const {
 OXT_FORCE_INLINE
 Group::LifeStatus
 Group::getLifeStatus() const {
-	return (LifeStatus) lifeStatus.load(boost::memory_order_acquire);
+	return (LifeStatus) lifeStatus.load(boost::memory_order_seq_cst);
 }
 
 StaticString

data/ext/common/ApplicationPool2/Options.h

@@ -584,7 +584,7 @@ public:
 			appendKeyValue (vec, "app_group_name",     getAppGroupName());
 			appendKeyValue (vec, "app_type",           appType);
 			appendKeyValue (vec, "start_command",      getStartCommand(resourceLocator));
-			appendKeyValue (vec, "startup_file",       getStartupFile());
+			appendKeyValue (vec, "startup_file",       absolutizePath(getStartupFile(), absolutizePath(appRoot)));
 			appendKeyValue (vec, "process_title",      getProcessTitle());
 			appendKeyValue2(vec, "log_level",          logLevel);
 			appendKeyValue3(vec, "start_timeout",      startTimeout);

data/ext/common/Constants.h

@@ -120,7 +120,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.15"
+	#define PASSENGER_VERSION "5.0.16"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/MemoryKit/mbuf.cpp

@@ -60,13 +60,12 @@ _mbuf_block_get(struct mbuf_pool *pool)
 	 *   |       mbuf_block data          |  mbuf_block header   |
 	 *   |     (mbuf_block_offset)        | (struct mbuf_block)  |
 	 *   +-------------------------------------------------------+
-	 *   ^           ^          ^         ^^
-	 *   |           |          |         ||
-	 *   \           |          |         |\
-	 * block->start  \          |         | block->end (one byte past valid bound)
-	 *              block->pos  |         \
-	 *                          \         block
-	 *                          block->last (one byte past valid byte)
+	 *   ^                                ^^
+	 *   |                                ||
+	 *   \                                |\
+	 * block->start                       | block->end (one byte past valid bound)
+	 *                                    \
+	 *                                    block
 	 *
 	 */
 	mbuf_block = (struct mbuf_block *)(buf + pool->mbuf_block_offset);
@@ -104,9 +103,6 @@ mbuf_block_get(struct mbuf_pool *pool)
 	assert(mbuf_block->end - mbuf_block->start == (int)pool->mbuf_block_offset);
 	assert(mbuf_block->start < mbuf_block->end);
 
-	mbuf_block->pos = mbuf_block->start;
-	mbuf_block->last = mbuf_block->start;
-
 	#ifdef MBUF_DEBUG
 		printf("[%p] mbuf_block get %p\n", oxt::thread_signature, mbuf_block);
 	#endif
@@ -119,7 +115,7 @@ mbuf_block_free(struct mbuf_pool *pool, struct mbuf_block *mbuf_block)
 {
 	char *buf;
 
-	//log_debug(LOG_VVERB, "put mbuf_block %p len %d", mbuf_block, mbuf_block->last - mbuf_block->pos);
+	//log_debug(LOG_VVERB, "put mbuf_block %p", mbuf_block);
 
 	assert(STAILQ_NEXT(mbuf_block, next) == NULL);
 	assert(mbuf_block->magic == MBUF_BLOCK_MAGIC);
@@ -157,129 +153,18 @@ mbuf_block_put(struct mbuf_block *mbuf_block)
 	#endif
 }
 
-/*
- * Rewind the mbuf_block by discarding any of the read or unread data that it
- * might hold.
- */
-void
-mbuf_block_rewind(struct mbuf_block *mbuf_block)
-{
-	mbuf_block->pos = mbuf_block->start;
-	mbuf_block->last = mbuf_block->start;
-}
-
-/*
- * Return the length of data in mbuf_block. Mbuf cannot contain more than
- * 2^32 bytes (4G).
- */
-uint32_t
-mbuf_block_length(struct mbuf_block *mbuf_block)
-{
-	assert(mbuf_block->last >= mbuf_block->pos);
-
-	return (uint32_t)(mbuf_block->last - mbuf_block->pos);
-}
-
-/*
- * Return the remaining space size for any new data in mbuf_block. Mbuf cannot
- * contain more than 2^32 bytes (4G).
- */
-uint32_t
-mbuf_block_size(struct mbuf_block *mbuf_block)
-{
-	assert(mbuf_block->end >= mbuf_block->last);
-
-	return (uint32_t)(mbuf_block->end - mbuf_block->last);
-}
-
-/*
- * Insert mbuf_block at the tail of the mhdr Q
- */
-void
-mbuf_block_insert(struct mhdr *mhdr, struct mbuf_block *mbuf_block)
-{
-	STAILQ_INSERT_TAIL(mhdr, mbuf_block, next);
-	//log_debug(LOG_VVERB, "insert mbuf_block %p len %d", mbuf_block, mbuf_block->last - mbuf_block->pos);
-}
-
 /*
  * Remove mbuf_block from the mhdr Q
  */
-void
+static void
 mbuf_block_remove(struct mhdr *mhdr, struct mbuf_block *mbuf_block)
 {
-	//log_debug(LOG_VVERB, "remove mbuf_block %p len %d", mbuf_block, mbuf_block->last - mbuf_block->pos);
+	//log_debug(LOG_VVERB, "remove mbuf_block %p", mbuf_block);
 
 	STAILQ_REMOVE(mhdr, mbuf_block, struct mbuf_block, next);
 	STAILQ_NEXT(mbuf_block, next) = NULL;
 }
 
-/*
- * Copy n bytes from memory area pos to mbuf_block.
- *
- * The memory areas should not overlap and the mbuf_block should have
- * enough space for n bytes.
- */
-void
-mbuf_block_copy(struct mbuf_block *mbuf_block, char *pos, size_t n)
-{
-	if (n == 0) {
-		return;
-	}
-
-	/* mbuf_block has space for n bytes */
-	assert(!MBUF_BLOCK_FULL(mbuf_block) && n <= mbuf_block_size(mbuf_block));
-
-	/* no overlapping copy */
-	assert(pos < mbuf_block->start || pos >= mbuf_block->end);
-
-	memcpy(mbuf_block->last, pos, n);
-	mbuf_block->last += n;
-}
-
-/*
- * Split mbuf_block h into h and t by copying data from h to t. Before
- * the copy, we invoke a precopy handler cb that will copy a predefined
- * string to the head of t.
- *
- * Return new mbuf_block t, if the split was successful.
- */
-struct mbuf_block *
-mbuf_block_split(struct mbuf_pool *pool, struct mhdr *h, char *pos,
-	mbuf_block_copy_t cb, void *cbarg)
-{
-	struct mbuf_block *mbuf_block, *nbuf;
-	size_t size;
-
-	assert(!STAILQ_EMPTY(h));
-
-	mbuf_block = STAILQ_LAST(h, struct mbuf_block, next);
-	assert(pos >= mbuf_block->pos && pos <= mbuf_block->last);
-
-	nbuf = mbuf_block_get(pool);
-	if (nbuf == NULL) {
-		return NULL;
-	}
-
-	if (cb != NULL) {
-		/* precopy nbuf */
-		cb(nbuf, cbarg);
-	}
-
-	/* copy data from mbuf_block to nbuf */
-	size = (size_t)(mbuf_block->last - pos);
-	mbuf_block_copy(nbuf, pos, size);
-
-	/* adjust mbuf_block */
-	mbuf_block->last = pos;
-
-	//log_debug(LOG_VVERB, "split into mbuf_block %p len %"PRIu32" and nbuf %p len "
-	//          "%"PRIu32" copied %zu bytes", mbuf_block, mbuf_block_length(mbuf_block), nbuf,
-	//          mbuf_block_length(nbuf), size);
-
-	return nbuf;
-}
-
 void
 mbuf_pool_init(struct mbuf_pool *pool)
 {

data/ext/common/MemoryKit/mbuf.h

@@ -71,7 +71,7 @@ struct mhdr;
 typedef void (*mbuf_block_copy_t)(struct mbuf_block *, void *);
 
 struct mbuf_block {
-	uint32_t           magic;     /* mbuf_block magic (const) */
+	boost::uint32_t    magic;     /* mbuf_block magic (const) */
 	STAILQ_ENTRY(struct mbuf_block) next;         /* next free mbuf_block */
 	#ifdef MBUF_ENABLE_DEBUGGING
 		TAILQ_ENTRY(struct mbuf_block) active_q;  /* prev and next active mbuf_block */
@@ -79,8 +79,6 @@ struct mbuf_block {
 	#ifdef MBUF_ENABLE_BACKTRACES
 		char *backtrace;
 	#endif
-	char              *pos;       /* read marker */
-	char              *last;      /* write marker */
 	char              *start;     /* start of buffer (const) */
 	char              *end;       /* end of buffer (const) */
 	struct mbuf_pool  *pool;      /* containing pool (const) */
@@ -93,8 +91,8 @@ STAILQ_HEAD(mhdr, struct mbuf_block);
 #endif
 
 struct mbuf_pool {
-	uint32_t nfree_mbuf_blockq;   /* # free mbuf_block */
-	uint32_t nactive_mbuf_blockq; /* # active (non-free) mbuf_block */
+	boost::uint32_t nfree_mbuf_blockq;   /* # free mbuf_block */
+	boost::uint32_t nactive_mbuf_blockq; /* # active (non-free) mbuf_block */
 	struct mhdr free_mbuf_blockq; /* free mbuf_block q */
 	#ifdef MBUF_ENABLE_DEBUGGING
 		struct active_mbuf_block_list active_mbuf_blockq; /* active mbuf_block q */
@@ -120,14 +118,6 @@ unsigned int mbuf_pool_compact(struct mbuf_pool *pool);
 
 struct mbuf_block *mbuf_block_get(struct mbuf_pool *pool);
 void mbuf_block_put(struct mbuf_block *mbuf_block);
-void mbuf_block_rewind(struct mbuf_block *mbuf_block);
-uint32_t mbuf_block_length(struct mbuf_block *mbuf_block);
-uint32_t mbuf_block_size(struct mbuf_block *mbuf_block);
-void mbuf_block_insert(struct mhdr *mhdr, struct mbuf_block *mbuf_block);
-void mbuf_block_remove(struct mhdr *mhdr, struct mbuf_block *mbuf_block);
-void mbuf_block_copy(struct mbuf_block *mbuf_block, char *pos, size_t n);
-struct mbuf_block *mbuf_block_split(struct mbuf_pool *pool, struct mhdr *h,
-	char *pos, mbuf_block_copy_t cb, void *cbarg);
 
 void mbuf_block_ref(struct mbuf_block *mbuf_block);
 void mbuf_block_unref(struct mbuf_block *mbuf_block);

data/ext/common/UnionStation/{ScopeLog.h → StopwatchLog.h}

@@ -22,8 +22,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_UNION_STATION_SCOPE_LOG_H_
-#define _PASSENGER_UNION_STATION_SCOPE_LOG_H_
+#ifndef _PASSENGER_UNION_STATION_STOPWATCH_LOG_H_
+#define _PASSENGER_UNION_STATION_STOPWATCH_LOG_H_
 
 #include <boost/noncopyable.hpp>
 
@@ -44,7 +44,7 @@ using namespace std;
 using namespace boost;
 
 
-class ScopeLog: public noncopyable {
+class StopwatchLog: public noncopyable {
 private:
 	Transaction * const transaction;
 	union {
@@ -72,11 +72,11 @@ private:
 	}
 
 public:
-	ScopeLog()
+	StopwatchLog()
 		: transaction(NULL)
 		{ }
 
-	ScopeLog(const TransactionPtr &_transaction, const char *name)
+	StopwatchLog(const TransactionPtr &_transaction, const char *name)
 		: transaction(_transaction.get())
 	{
 		type = NAME;
@@ -107,7 +107,7 @@ public:
 		}
 	}
 
-	ScopeLog(const TransactionPtr &_transaction,
+	StopwatchLog(const TransactionPtr &_transaction,
 		const char *beginMessage,
 		const char *endMessage,
 		const char *abortMessage = NULL)
@@ -122,7 +122,7 @@ public:
 		}
 	}
 
-	~ScopeLog() {
+	~StopwatchLog() {
 		if (transaction == NULL) {
 			return;
 		}
@@ -169,4 +169,4 @@ public:
 } // namespace UnionStation
 } // namespace Passenger
 
-#endif /* _PASSENGER_UNION_STATION_SCOPE_LOG_H_ */
+#endif /* _PASSENGER_UNION_STATION_STOPWATCH_LOG_H_ */

data/ext/common/agent/Core/{Main.cpp → CoreMain.cpp}

@@ -250,7 +250,7 @@ initializeSingleAppMode() {
 		}
 
 		options.set("app_type", getAppTypeName(appType));
-		options.set("startup_file", getAppTypeStartupFile(appType));
+		options.set("startup_file", options.get("app_root") + "/" + getAppTypeStartupFile(appType));
 	}
 
 	P_NOTICE(SHORT_PROGRAM_NAME " core running in single-application mode.");

data/ext/common/agent/Core/RequestHandler/BufferBody.cpp

@@ -34,7 +34,7 @@ beginBufferingBody(Client *client, Request *req) {
 	req->bodyChannel.start();
 	req->bodyBuffer.reinitialize();
 	req->bodyBuffer.stop();
-	req->beginScopeLog(&req->scopeLogs.bufferingRequestBody, "buffering request body");
+	req->beginStopwatchLog(&req->stopwatchLogs.bufferingRequestBody, "buffering request body");
 }
 
 Channel::Result
@@ -83,7 +83,7 @@ whenBufferingBody_onRequestBody(Client *client, Request *req,
 			req->headers.erase(HTTP_TRANSFER_ENCODING);
 			req->headers.insert(&header, req->pool);
 		}
-		req->endScopeLog(&req->scopeLogs.bufferingRequestBody);
+		req->endStopwatchLog(&req->stopwatchLogs.bufferingRequestBody);
 		checkoutSession(client, req);
 		return Channel::Result(0, true);
 	} else {

data/ext/common/agent/Core/RequestHandler/CheckoutSession.cpp

@@ -35,7 +35,7 @@ checkoutSession(Client *client, Request *req) {
 	RH_BENCHMARK_POINT(client, req, BM_BEFORE_CHECKOUT);
 	SKC_TRACE(client, 2, "Checking out session: appRoot=" << options.appRoot);
 	req->state = Request::CHECKING_OUT_SESSION;
-	req->beginScopeLog(&req->scopeLogs.getFromPool, "get from pool");
+	req->beginStopwatchLog(&req->stopwatchLogs.getFromPool, "get from pool");
 	if (req->requestBodyBuffering) {
 		assert(!req->bodyBuffer.isStarted());
 	} else {
@@ -119,7 +119,7 @@ sessionCheckedOutFromEventLoopThread(Client *client, Request *req,
 		initiateSession(client, req);
 	} else {
 		UPDATE_TRACE_POINT();
-		req->endScopeLog(&req->scopeLogs.getFromPool, false);
+		req->endStopwatchLog(&req->stopwatchLogs.getFromPool, false);
 		reportSessionCheckoutError(client, req, e);
 	}
 }
@@ -171,11 +171,11 @@ initiateSession(Client *client, Request *req) {
 
 	UPDATE_TRACE_POINT();
 	if (req->useUnionStation()) {
-		req->endScopeLog(&req->scopeLogs.getFromPool);
+		req->endStopwatchLog(&req->stopwatchLogs.getFromPool);
 		req->logMessage("Application PID: " +
 			toString(req->session->getPid()) +
 			" (GUPID: " + req->session->getGupid() + ")");
-		req->beginScopeLog(&req->scopeLogs.requestProxying, "request proxying");
+		req->beginStopwatchLog(&req->stopwatchLogs.requestProxying, "request proxying");
 	}
 
 	UPDATE_TRACE_POINT();

data/ext/common/agent/Core/RequestHandler/ForwardResponse.cpp

@@ -776,6 +776,7 @@ sendResponseHeaderWithWritev(Client *client, Request *req, ssize_t &bytesWritten
 	if (constructHeaderBuffersForResponse(req, buffers,
 		maxbuffers, nbuffers, dataSize, nCacheableBuffers))
 	{
+		SKC_TRACE(client, 2, "Sending response headers using writev()");
 		logResponseHeaders(client, req, buffers, nbuffers, dataSize);
 		markHeaderBuffersForTurboCaching(client, req, buffers, nCacheableBuffers);
 
@@ -815,11 +816,13 @@ sendResponseHeaderWithBuffering(Client *client, Request *req, unsigned int offse
 	MemoryKit::mbuf_pool &mbuf_pool = getContext()->mbuf_pool;
 	const unsigned int MBUF_MAX_SIZE = mbuf_pool_data_size(&mbuf_pool);
 	if (dataSize <= MBUF_MAX_SIZE) {
+		SKC_TRACE(client, 2, "Sending response headers using an mbuf");
 		MemoryKit::mbuf buffer(MemoryKit::mbuf_get(&mbuf_pool));
 		gatherBuffers(buffer.start, MBUF_MAX_SIZE, buffers, nbuffers);
 		buffer = MemoryKit::mbuf(buffer, offset, dataSize - offset);
 		writeResponse(client, buffer);
 	} else {
+		SKC_TRACE(client, 2, "Sending response headers using a psg_pool buffer");
 		char *buffer = (char *) psg_pnalloc(req->pool, dataSize);
 		gatherBuffers(buffer, dataSize, buffers, nbuffers);
 		writeResponse(client, buffer + offset, dataSize - offset);
@@ -836,6 +839,15 @@ logResponseHeaders(Client *client, Request *req, struct iovec *buffers,
 		SKC_TRACE(client, 3, "Sending response headers: \"" <<
 			cEscapeString(StaticString(buffer, dataSize)) << "\"");
 	}
+
+	if (req->useUnionStation()) {
+		const char *status = getStatusCodeAndReasonPhrase(req->appResponse.statusCode);
+		if (status != NULL) {
+			req->logMessage("Status: " + StaticString(status));
+		} else {
+			req->logMessage("Status: " + toString(req->appResponse.statusCode));
+		}
+	}
 }
 
 void
@@ -850,7 +862,7 @@ markHeaderBuffersForTurboCaching(Client *client, Request *req, struct iovec *buf
 		}
 
 		if (totalSize > ResponseCache<Request>::MAX_HEADER_SIZE) {
-			SKC_DEBUG(client, "Response header larger than " <<
+			SKC_DEBUG(client, "Response headers larger than " <<
 				ResponseCache<Request>::MAX_HEADER_SIZE <<
 				" bytes, so response is not eligible for turbocaching");
 			// Decrease store success ratio.
@@ -992,6 +1004,7 @@ handleAppResponseBodyEnd(Client *client, Request *req) {
 	keepAliveAppConnection(client, req);
 	storeAppResponseInTurboCache(client, req);
 	finalizeUnionStationWithSuccess(client, req);
+	assert(!req->ended());
 }
 
 OXT_FORCE_INLINE void
@@ -1038,6 +1051,6 @@ storeAppResponseInTurboCache(Client *client, Request *req) {
 
 void
 finalizeUnionStationWithSuccess(Client *client, Request *req) {
-	req->endScopeLog(&req->scopeLogs.requestProcessing, true);
-	req->endScopeLog(&req->scopeLogs.requestProxying, true);
+	req->endStopwatchLog(&req->stopwatchLogs.requestProcessing, true);
+	req->endStopwatchLog(&req->stopwatchLogs.requestProxying, true);
 }

data/ext/common/agent/Core/RequestHandler/Hooks.cpp

@@ -109,10 +109,10 @@ virtual void reinitializeRequest(Client *client, Request *req) {
 virtual void deinitializeRequest(Client *client, Request *req) {
 	req->session.reset();
 
-	req->endScopeLog(&req->scopeLogs.requestProxying, false);
-	req->endScopeLog(&req->scopeLogs.getFromPool, false);
-	req->endScopeLog(&req->scopeLogs.bufferingRequestBody, false);
-	req->endScopeLog(&req->scopeLogs.requestProcessing, false);
+	req->endStopwatchLog(&req->stopwatchLogs.requestProxying, false);
+	req->endStopwatchLog(&req->stopwatchLogs.getFromPool, false);
+	req->endStopwatchLog(&req->stopwatchLogs.bufferingRequestBody, false);
+	req->endStopwatchLog(&req->stopwatchLogs.requestProcessing, false);
 
 	req->options.transaction.reset();
 

data/ext/common/agent/Core/RequestHandler/InitRequest.cpp

@@ -416,7 +416,7 @@ initializeUnionStation(Client *client, Request *req, RequestAnalysis &analysis)
 			options.unionStationKey = StaticString(key->start->data, key->size);
 		}
 
-		req->beginScopeLog(&req->scopeLogs.requestProcessing, "request processing");
+		req->beginStopwatchLog(&req->stopwatchLogs.requestProcessing, "request processing");
 		req->logMessage(string("Request method: ") + http_method_str(req->method));
 		req->logMessage("URI: " + StaticString(req->path.start->data, req->path.size));
 	}

data/ext/common/agent/Core/RequestHandler/Request.h

@@ -35,7 +35,7 @@
 #include <ApplicationPool2/Pool.h>
 #include <UnionStation/Core.h>
 #include <UnionStation/Transaction.h>
-#include <UnionStation/ScopeLog.h>
+#include <UnionStation/StopwatchLog.h>
 #include <agent/Core/RequestHandler/AppResponse.h>
 #include <Logging.h>
 
@@ -84,11 +84,11 @@ public:
 	boost::uint64_t bodyBytesBuffered; // After dechunking
 
 	struct {
-		UnionStation::ScopeLog *requestProcessing;
-		UnionStation::ScopeLog *bufferingRequestBody;
-		UnionStation::ScopeLog *getFromPool;
-		UnionStation::ScopeLog *requestProxying;
-	} scopeLogs;
+		UnionStation::StopwatchLog *requestProcessing;
+		UnionStation::StopwatchLog *bufferingRequestBody;
+		UnionStation::StopwatchLog *getFromPool;
+		UnionStation::StopwatchLog *requestProxying;
+	} stopwatchLogs;
 
 	HashedStaticString cacheKey;
 	LString *cacheControl;
@@ -105,7 +105,7 @@ public:
 	Request()
 		: BaseHttpRequest()
 	{
-		memset(&scopeLogs, 0, sizeof(scopeLogs));
+		memset(&stopwatchLogs, 0, sizeof(stopwatchLogs));
 	}
 
 	const char *getStateString() const {
@@ -131,18 +131,18 @@ public:
 		return options.transaction != NULL;
 	}
 
-	void beginScopeLog(UnionStation::ScopeLog **scopeLog, const char *name) {
+	void beginStopwatchLog(UnionStation::StopwatchLog **stopwatchLog, const char *name) {
 		if (options.transaction != NULL) {
-			*scopeLog = new UnionStation::ScopeLog(options.transaction, name);
+			*stopwatchLog = new UnionStation::StopwatchLog(options.transaction, name);
 		}
 	}
 
-	void endScopeLog(UnionStation::ScopeLog **scopeLog, bool success = true) {
-		if (success && *scopeLog != NULL) {
-			(*scopeLog)->success();
+	void endStopwatchLog(UnionStation::StopwatchLog **stopwatchLog, bool success = true) {
+		if (success && *stopwatchLog != NULL) {
+			(*stopwatchLog)->success();
 		}
-		delete *scopeLog;
-		*scopeLog = NULL;
+		delete *stopwatchLog;
+		*stopwatchLog = NULL;
 	}
 
 	void logMessage(const StaticString &message) {

data/ext/common/agent/Core/RequestHandler/SendRequest.cpp

@@ -175,7 +175,8 @@ determineHeaderSizeForSessionProtocol(Request *req,
 	unsigned int dataSize = sizeof(boost::uint32_t);
 
 	state.path        = req->getPathWithoutQueryString();
-	state.hasBaseURI  = req->options.baseURI != P_STATIC_STRING("/");
+	state.hasBaseURI  = req->options.baseURI != P_STATIC_STRING("/")
+		&& startsWith(state.path, req->options.baseURI);
 	if (state.hasBaseURI) {
 		state.path = state.path.substr(req->options.baseURI.size());
 		if (state.path.empty()) {

data/helper-scripts/node-loader.js

@@ -116,8 +116,8 @@ function configure(_options) {
 
 function loadApplication() {
 	var appRoot = PhusionPassenger.options.app_root || process.cwd();
-	var startupFile = PhusionPassenger.options.startup_file || 'app.js';
-	require(appRoot + '/' + startupFile);
+	var startupFile = PhusionPassenger.options.startup_file || (appRoot + '/' + 'app.js');
+	require(startupFile);
 }
 
 function extractCallback(args) {

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.15'
+  VERSION_STRING = '5.0.16'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/lib/phusion_passenger/config/about_command.rb

@@ -40,6 +40,7 @@ module PhusionPassenger
         puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
         puts "  nginx-libs               Show Nginx runtime library flags."
         puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
+        puts "  support-binaries-dir     Show #{PROGRAM_NAME}'s support binaries dir."
         puts "  compiled                 Check whether runtime libraries are compiled."
         puts "  custom-packaged          Check whether Phusion Passenger is custom"
         puts "                           packaged."
@@ -77,6 +78,8 @@ module PhusionPassenger
           puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
         when "--resourcesdir"
           puts PhusionPassenger.resources_dir
+        when "--support-binaries-dir"
+          puts PhusionPassenger.support_binaries_dir
         when "--compiled"
           common_library.link_objects.each do |filename|
             if !File.exist?(filename)

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -88,14 +88,14 @@ module PhusionPassenger
             handle_error(name, response)
           end
         else
-          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} #{name} (code #{response.code}):"
           STDERR.puts response.body
           abort
         end
       end
 
       def perform_reinherit_logs_on(name, socket_name)
-        puts "Reopen logs for #{AGENT_EXE} #{name} (through reinheritance)"
+        puts "Reopening logs for #{PROGRAM_NAME} #{name} (through reinheritance)"
         request = Net::HTTP::Post.new("/reinherit_logs.json")
         try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"
@@ -108,7 +108,7 @@ module PhusionPassenger
             handle_error(name, response)
           end
         else
-          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} #{name} (code #{response.code}):"
           STDERR.puts response.body
           abort
         end
@@ -117,7 +117,7 @@ module PhusionPassenger
       def handle_error(name, response)
         json = PhusionPassenger::Utils::JSON.parse(response.body)
         if !should_ignore_error?(json)
-          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} #{name} (code #{response.code}):"
           STDERR.puts json['message']
           abort
         end

data/lib/phusion_passenger/platform_info.rb

@@ -226,6 +226,16 @@ module PhusionPassenger
       return ""
     end
 
+    # Clears all memoized values. However, the disk cache (if any is configured)
+    # is still used.
+    def self.clear_memoizations
+      class_variables.each do |name|
+        if name.to_s =~ /^@@has_memoized_/
+          class_variable_set(name, false)
+        end
+      end
+    end
+
     def self.tmpdir
       result = ENV['TMPDIR']
       if result && !result.empty?

data/lib/phusion_passenger/platform_info/apache.rb

@@ -102,7 +102,7 @@ module PhusionPassenger
     end
     memoize :httpd_version
 
-    # Run `apache2ctl -V` and return its output.
+    # Run `apache2ctl -V` and return its output, or nil on failure.
     #
     # We used to run `httpd -V`, but on systems like Ubuntu it depends on various
     # environment variables or directories, wich apache2ctl loads or initializes.
@@ -137,16 +137,20 @@ module PhusionPassenger
           e_filename = Shellwords.escape(filename)
           output = `#{version_command} -V 2>#{e_filename}`
 
-          stderr_text = File.open(filename, "rb") do |f2|
-            f2.read
-          end
-          # This stderr message shows up on Ubuntu. We ignore it.
-          stderr_text.sub!(/.*Could not reliably determine the server's fully qualified domain name.*\r?\n?/, "")
-          # But we print the rest of stderr.
-          STDERR.write(stderr_text)
-          STDERR.flush
+          if $? && $?.exitstatus == 0
+            stderr_text = File.open(filename, "rb") do |f2|
+              f2.read
+            end
+            # This stderr message shows up on Ubuntu. We ignore it.
+            stderr_text.sub!(/.*Could not reliably determine the server's fully qualified domain name.*\r?\n?/, "")
+            # But we print the rest of stderr.
+            STDERR.write(stderr_text)
+            STDERR.flush
 
-          output
+            output
+          else
+            nil
+          end
         end
       else
         nil

data/lib/phusion_passenger/utils/tee_input.rb

@@ -167,6 +167,16 @@ class TeeInput
     end
   end
 
+  def seek(*args)
+    if !socket_drained?
+      # seek may be forward, or relative to the end, so we need to consume the socket fully into tmp
+      pos = @tmp.pos # save/restore tmp.pos, to not break relative seeks
+      consume!
+      @tmp.pos = pos
+    end
+    @tmp.seek(*args) 
+  end
+  
   def rewind
     return 0 if 0 == @tmp.size
     consume! if !socket_drained?

data/resources/templates/standalone/config.erb

@@ -87,7 +87,11 @@ http {
 
     <% if @options[:union_station_gateway_address] %>
         union_station_gateway_address <%= @options[:union_station_gateway_address] %>;
+    <% end %>
+    <% if @options[:union_station_gateway_port] %>
         union_station_gateway_port <%= @options[:union_station_gateway_port] %>;
+    <% end %>
+    <% if @options[:union_station_gateway_cert] %>
         union_station_gateway_cert -;
     <% end %>
 
@@ -106,9 +110,9 @@ http {
     gzip_comp_level 3;
     gzip_min_length 150;
     gzip_proxied any;
-    gzip_types text/plain text/css text/json text/javascript \
-        application/javascript application/x-javascript application/json \
-        application/rss+xml application/vnd.ms-fontobject application/x-font-ttf \
+    gzip_types text/plain text/css text/json text/javascript
+        application/javascript application/x-javascript application/json
+        application/rss+xml application/vnd.ms-fontobject application/x-font-ttf
         application/xml font/opentype image/svg+xml text/xml;
 
     <% if @app_finder.multi_mode? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.15
+  version: 5.0.16
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2543,7 +2543,7 @@ files:
 - ext/common/StaticString.h
 - ext/common/UnionStation/Connection.h
 - ext/common/UnionStation/Core.h
-- ext/common/UnionStation/ScopeLog.h
+- ext/common/UnionStation/StopwatchLog.h
 - ext/common/UnionStation/Transaction.h
 - ext/common/Utils.cpp
 - ext/common/Utils.h
@@ -2607,11 +2607,12 @@ files:
 - ext/common/Utils/utf8/checked.h
 - ext/common/Utils/utf8/core.h
 - ext/common/Utils/utf8/unchecked.h
+- ext/common/agent/AgentMain.cpp
 - ext/common/agent/ApiServerUtils.h
 - ext/common/agent/Base.cpp
 - ext/common/agent/Base.h
 - ext/common/agent/Core/ApiServer.h
-- ext/common/agent/Core/Main.cpp
+- ext/common/agent/Core/CoreMain.cpp
 - ext/common/agent/Core/OptionParser.h
 - ext/common/agent/Core/RequestHandler.h
 - ext/common/agent/Core/RequestHandler/AppResponse.h
@@ -2626,24 +2627,23 @@ files:
 - ext/common/agent/Core/RequestHandler/TurboCaching.h
 - ext/common/agent/Core/RequestHandler/Utils.cpp
 - ext/common/agent/Core/ResponseCache.h
-- ext/common/agent/Main.cpp
-- ext/common/agent/SpawnPreparer/Main.cpp
-- ext/common/agent/SystemMetrics/Main.cpp
-- ext/common/agent/TempDirToucher/Main.cpp
+- ext/common/agent/SpawnPreparer/SpawnPreparerMain.cpp
+- ext/common/agent/SystemMetrics/SystemMetricsMain.cpp
+- ext/common/agent/TempDirToucher/TempDirToucherMain.cpp
 - ext/common/agent/UstRouter/ApiServer.h
 - ext/common/agent/UstRouter/DataStoreId.h
 - ext/common/agent/UstRouter/FilterSupport.cpp
 - ext/common/agent/UstRouter/FilterSupport.h
 - ext/common/agent/UstRouter/LoggingServer.h
-- ext/common/agent/UstRouter/Main.cpp
 - ext/common/agent/UstRouter/OptionParser.h
 - ext/common/agent/UstRouter/RemoteSender.h
+- ext/common/agent/UstRouter/UstRouterMain.cpp
 - ext/common/agent/Watchdog/AgentWatcher.cpp
 - ext/common/agent/Watchdog/ApiServer.h
 - ext/common/agent/Watchdog/CoreWatcher.cpp
 - ext/common/agent/Watchdog/InstanceDirToucher.cpp
-- ext/common/agent/Watchdog/Main.cpp
 - ext/common/agent/Watchdog/UstRouterWatcher.cpp
+- ext/common/agent/Watchdog/WatchdogMain.cpp
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/Makefile.am
@@ -2684,13 +2684,6 @@ files:
 - ext/libuv/README.md
 - ext/libuv/aclocal.m4
 - ext/libuv/ar-lib
-- ext/libuv/autom4te.cache/output.0
-- ext/libuv/autom4te.cache/output.1
-- ext/libuv/autom4te.cache/output.2
-- ext/libuv/autom4te.cache/requests
-- ext/libuv/autom4te.cache/traces.0
-- ext/libuv/autom4te.cache/traces.1
-- ext/libuv/autom4te.cache/traces.2
 - ext/libuv/checksparse.sh
 - ext/libuv/common.gypi
 - ext/libuv/compile

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVuJ34AAoJECrHRaUKISqM/O4IAIa/7ugQ2b8Z7E8HLEd4cGp4
-G7IKljKLCmV0U7mHHIpkMQn1MQbVfuJTOc1sZj2ffIPd70zZcHzVGL2o19GkotOy
-+zvbNJSA9SwqddlZisyV7SwJvyQrcyav3jwqKNRABOcvmtCaZJ1R7z2iQoeNVQRC
-fE7ETK3bJnQxy1iddA6JPwBeSk4HUXBga01juYuRdsPySBtY7bX4EHLPAdj0EEEj
-ceX8cCsvCobB9P11OPupxPJ5RuoL+p+ZnqV3H+n2OEhvL9icaWSoLXvaGrd4mjO4
-NjQjjwYhOv55eRmHyXnPqoeQ0dtDF1+qEc6UUi31229UI2ATVIXCkF0FSVJR9mI=
-=Z6Wn
+iQEcBAABAgAGBQJV2sAHAAoJECrHRaUKISqMiqkH/jfE92JB1oWIyLNOJ92Fwksa
+lFUC66V79wkjv3hJVjkGb3z9kkAyvRRku7weTyHeCGZIkPtkP7I+AyP5ZyIfX90c
+YI1Yoae6s6MDnEeBGh7z1vHx6bHOddgbQmBCrapbSvS2jAU35smuiD4yvcwuYHcN
+2v+dC6PYfGe5l9dugJAF9gXZ6WjaRmOlEl1n54SZ1p6cxgg4wOaaTV6/8xjYDFmO
+0QK7ualtpyEbpOpsJyw6W/rOus8HzNUbA9BYYn3buj/VEztxBzXjM8iMZU7/d9T6
+UemM3UcoowbV5o5xLPY00MazpiFenevmC9fOAxFNSVvD2FzE8RGJBETNUnSlpKc=
+=vfGW
 -----END PGP SIGNATURE-----