passenger 5.1.11 → 5.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcd88ceab959baa6975ea6d4305a925af272321
-  data.tar.gz: 44883c1837663f92487534c6069ba313a53062d8
+  metadata.gz: b0ca744c34e7b85ec574e802d3d5f51ba0e65ba4
+  data.tar.gz: f886554ad447e878969606ef9bf7facb430d9467
 SHA512:
-  metadata.gz: b7946c6e1585492f3f6e05e153893ef54b403e2850844ecafa228408d2f03168cd12e61cfdbe33735145d3d047b07375911e09b3c7b5bef52c5fd8978a0f80c1
-  data.tar.gz: 88bd249512da994cb367ec337be1e0ca9a986f017f1a911cbe5d4cd45f2880ff9fad63a68563b8d90fecdd3000f265b3048ef5d88155868f6c9aee20a3a74f06
+  metadata.gz: 6bf8a6e154ee6fe1128ee388e716bcd297d60ab84976c3969741d48cff84864276561759a52e7af2e2f23ef8ce9b0b93d82b1ae08fd1c9fee7113560f06f0552
+  data.tar.gz: 43e60afd9fb51149dcdaefb513d3d8ee6b9237828313d25bd9ca1f9cbde1c22ab26fa426ce49858b3e827734f3fe2cde654901bd8bd488fa4b1f8c8379a7b9d8

data/.editorconfig

@@ -90,6 +90,14 @@ indent_size = 4
 indent_style = space
 indent_size = 4
 
+[src/nginx_module/*/*.c]
+indent_style = space
+indent_size = 4
+
+[src/nginx_module/*/*.h]
+indent_style = space
+indent_size = 4
+
 [src/cxx_supportlib/vendor-modified/libev/*.c]
 indent_style = space
 indent_size = 2

data/CHANGELOG

@@ -1,3 +1,20 @@
+Release 5.1.12
+---------------------------------
+
+ * Changes the Debian/Ubuntu install script to completely restart Apache upon upgrade. This prevents issues due to a "half upgraded" state (old Passenger Apache module + new Passenger core). Closes GH-2000.
+ * Adds Ubuntu 17.10 "Artful" packages.
+ * Fixes a case in which -- when Passenger is configured with user switching turned off -- it is unable to open the web server log file and aborts during startup. This regression was introduced in 5.1.8. Closes GH-1990.
+ * [Nginx] The preferred Nginx version is now 1.12.2
+ * [Nginx] The preferred PCRE version is now 8.41 (previously 8.39).
+ * [Standalone] Adds support for using `start_timeout` in Passengerfile.json.
+ * [Enterprise] Uses libuv to detect total system RAM, allows for compilation on pre-10.11 macOS.
+ * [Enterprise] Added a max request queue time option, to limit time requests spend in the request queue. Closes GH-1688.
+ * Updated libcurl version used in precompiled binaries (used for e.g. gem installs) to 7.56.1 (was: 7.54.1).
+ * Updated OpenSSL version used in precompiled binaries (used for e.g. gem installs) to 1.0.2m (was: 1.0.2l).
+ * Updated PCRE version used in precompiled binaries (used for e.g. gem installs) to 8.41 (was: 8.40).
+ * Updated Ruby versions used in precompiled binaries (used for e.g. gem installs) to include 2.1.10, 2.2.8, 2.3.5, and 2.4.2 (removed: 2.1.9, 2.2.7, 2.3.4, and 2.4.1).
+
+
 Release 5.1.11
 --------------
 

data/CONTRIBUTING.md

@@ -54,7 +54,7 @@ When filing a bug report, please ensure that you include the following informati
 <a name="contrib_docs"></a>
 ## Contributing documentation
 
-All good software should have good documentation, and we take this very seriously. However writing and maintaing quality documentation is not an easy task. If you are not skilled in C++ or programming, then writing documentation is the easiest way to contribute.
+All good software should have good documentation, and we take this very seriously. However writing and maintaining quality documentation is not an easy task. If you are not skilled in C++ or programming, then writing documentation is the easiest way to contribute.
 
 Most documentation can be located in the `doc` directory, and are either written in Markdown or in Asciidoc format. They can be compiled to HTML with `rake doc`. You need [Mizuho](https://github.com/FooBarWidget/mizuho) to compile Asciidoc and [BlueCloth](http://deveiate.org/projects/BlueCloth) to compile Markdown. Both gems are automatically installed as part of the Phusion Passenger developer tools.
 
@@ -278,7 +278,7 @@ Less important directories:
 
         foo (1, 2, 3);
 
- * Seperate arguments and parts of expressions by spaces:
+ * Separate arguments and parts of expressions by spaces:
 
         foo(1, 2, foo == bar, 5 + 6);
         if (foo && bar) {

data/build/support/cxx_dependency_map.rb

@@ -6683,6 +6683,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/IOUtils.h",
    "src/cxx_supportlib/Utils/LargeFiles.h",
    "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/oxt/backtrace.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",

data/dev/ci/tests/debian/Jenkinsfile

@@ -0,0 +1,90 @@
+def getDefaultDistros() {
+    def distroInfo = readFile("packaging/debian/internal/lib/distro_info.sh")
+    def matcher = distroInfo =~ /DEFAULT_DISTROS="(.+?)"/
+    if (matcher.find()) {
+        matcher.group(1).split().sort()
+    } else {
+        error("Unable to parse packaging/debian/internal/lib/distro_info.sh")
+    }
+}
+
+def testDebianPackages(distro, params) {
+  if ((!distro in params) || params[distro]) {
+    node('linux') {
+      def env = [
+        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME}/${distro}",
+        "DISTRIBUTION=${distro}",
+        "ARCHITECTURE=amd64"
+      ]
+      withEnv(env) {
+        checkout scm
+        sh './dev/ci/tests/debian/run'
+      }
+    }
+  } else {
+    echo 'Test skipped.'
+  }
+}
+
+pipeline {
+  agent any
+
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+    timeout(time: 45, unit: 'MINUTES')
+    disableConcurrentBuilds()
+    timestamps()
+    ansiColor('xterm')
+  }
+
+  parameters {
+    booleanParam(name: 'trusty', defaultValue: true, description: 'Test Ubuntu 14.04 packages')
+    booleanParam(name: 'xenial', defaultValue: true, description: 'Test Ubuntu 16.04 packages')
+    booleanParam(name: 'zesty', defaultValue: true, description: 'Test Ubuntu 17.04 packages')
+    booleanParam(name: 'artful', defaultValue: true, description: 'Test Ubuntu 17.10 packages')
+
+    booleanParam(name: 'wheezy', defaultValue: true, description: 'Test Debian 7 packages')
+    booleanParam(name: 'jessie', defaultValue: true, description: 'Test Debian 8 packages')
+    booleanParam(name: 'stretch', defaultValue: true, description: 'Test Debian 9 packages')
+  }
+
+  stages {
+    stage('Initialize') {
+      steps {
+        script {
+          if (env.JOB_NAME.indexOf('Enterprise') != -1) {
+            env.ENTERPRISE = '1'
+          } else {
+            env.ENTERPRISE = '0'
+          }
+
+          // For debugging purposes
+          sh 'env | sort'
+        }
+      }
+    }
+
+
+
+    stage('Test') {
+      steps {
+        script {
+          def defaultDistros = getDefaultDistros()
+          def i
+          def parallelSteps = [:]
+
+          // We use a plain loop over .each because of this bug:
+          // https://issues.jenkins-ci.org/browse/JENKINS-27421
+          for (i = 0; i < defaultDistros.length; i++) {
+            def distro = defaultDistros[i]
+            parallelSteps[distro] = {
+              testDebianPackages(distro, params)
+            }
+          }
+
+          parallel(parallelSteps)
+        }
+      }
+    }
+  }
+}

data/dev/ci/tests/debian/run

@@ -0,0 +1,60 @@
+#!/bin/bash
+# This script is from the "Passenger Debian packaging test" Jenkins job. It builds
+# packages for a specific distribution and architecture and runs tests on the resulting packages.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#   DISTRIBUTION
+#   ARCHITECTURE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   CACHE_DIR (defaults to $WORKSPACE/cache)
+#   ENTERPRISE
+#   DEBUG_CONSOLE
+#
+# Sample invocation in Vagrant dev environment:
+#
+#   env WORKSPACE=$HOME DISTRIBUTION=el7 ARCHITECTURE=x86_64 PASSENGER_ROOT=/passenger ./dev/ci/debian/run
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/debian"
+# shellcheck source=../../../../packaging/debian/internal/lib/library.sh
+source "./internal/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+require_envvar DISTRIBUTION "$DISTRIBUTION"
+require_envvar ARCHITECTURE "$ARCHITECTURE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
+
+if [[ "$DEBUG_CONSOLE" = true ]]; then
+	EXTRA_TEST_PARAMS=-D
+else
+	EXTRA_TEST_PARAMS=
+fi
+if [[ "$ENTERPRISE" = 1 ]]; then
+	EXTRA_TEST_PARAMS="$EXTRA_TEST_PARAMS -e /etc/passenger-enterprise-license"
+fi
+
+run mkdir -p "$CACHE_DIR"
+run ./build \
+	-w "$WORKSPACE/work" \
+	-c "$CACHE_DIR" \
+	-o "$WORKSPACE/output" \
+	-p "$PASSENGER_ROOT" \
+	-d "$DISTRIBUTION" \
+	-a "$ARCHITECTURE" \
+	-R \
+	pkg:all
+run ./test \
+	-p "$PASSENGER_ROOT" \
+	-d "$WORKSPACE/output/$DISTRIBUTION" \
+	-c "$CACHE_DIR" \
+	-x "$DISTRIBUTION" \
+	-j \
+	$EXTRA_TEST_PARAMS

data/resources/templates/standalone/server.erb

@@ -41,6 +41,7 @@ passenger_enabled on;
 <%= nginx_option(app, :spawn_method) %>
 <%= nginx_option(app, :app_type) %>
 <%= nginx_option(app, :startup_file) %>
+<%= nginx_option(app, :start_timeout) %>
 <%= nginx_option(app, :min_instances) %>
 <%= nginx_option(app, :max_request_queue_size) %>
 <%= nginx_option(app, :restart_dir) %>

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

@@ -206,7 +206,7 @@ public:
 	}
 
 	/**
-	 * This Session object becomes fully unsable after closing.
+	 * This Session object becomes fully unusable after closing.
 	 */
 	virtual void close(bool success, bool wantKeepAlive = false) {
 		if (OXT_LIKELY(initiated())) {

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

@@ -286,6 +286,6 @@ typedef boost::shared_ptr<SocketList> SocketListPtr;
 
 
 } // namespace ApplicationPool2
-} // namespace Pasenger
+} // namespace Passenger
 
 #endif /* _PASSENGER_APPLICATION_POOL2_SOCKET_H_ */

data/src/agent/Core/Controller/InitRequest.cpp

@@ -172,7 +172,7 @@ Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis
 				req->envvars->size);
 		}
 
-		// Allow certain options to be overriden on a per-request basis
+		// Allow certain options to be overridden on a per-request basis
 		fillPoolOption(req, req->options.maxRequests, PASSENGER_MAX_REQUESTS);
 	}
 }

data/src/agent/Core/SecurityUpdateChecker.h

@@ -151,7 +151,7 @@ private:
 				// A problem occurred somewhere in the SSL/TLS handshake. Not sure what's up, but in this case the
 				// error buffer (printed in DEBUG) should pinpoint the problem slightly more.
 			case CURLE_OPERATION_TIMEDOUT:
-				// This is not a normal connect timeout, there are some refs to it occuring while downloading large
+				// This is not a normal connect timeout, there are some refs to it occurring while downloading large
 				// files, but we don't do that so fall through to default.
 			default:
 				error.append(" while connecting to " CHECK_URL_DEFAULT " " +

data/src/agent/Shared/ApiServerUtils.h

@@ -784,7 +784,12 @@ apiServerProcessReopenLogs(Server *server, Client *client, Request *req) {
 		vector<ConfigKit::Error> errors;
 		bool ok;
 		try {
-			ok = LoggingKit::context->prepareConfigChange(Json::objectValue,
+			// We deliberately ignore the target.stderr key.
+			// If the log file was equal to stderr then we'll want
+			// to reopen the log file anyway.
+			Json::Value updates;
+			updates["target"] = config["target"]["path"];
+			ok = LoggingKit::context->prepareConfigChange(updates,
 				errors, configReq);
 		} catch (const SystemException &e) {
 			unsigned int bufsize = 2048;
@@ -867,6 +872,7 @@ _apiServerProcessReinheritLogsResponseBody(
 
 	config["target"] = oldConfig["target"];
 	config["target"]["fd"] = fd;
+	config["target"].removeMember("stderr");
 	try {
 		ok = LoggingKit::context->prepareConfigChange(config,
 			errors, configReq);

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -445,9 +445,12 @@ initializeLoggingKit(const char *processName, VariantMap &options) {
 	config["level"] = options.get("log_level");
 
 	if (options.has("log_file")) {
-		config["target"] = options.get("log_file");
+		config["target"]["path"] = options.get("log_file");
 	} else if (options.has("debug_log_file")) {
-		config["target"] = options.get("debug_log_file");
+		config["target"]["path"] = options.get("debug_log_file");
+	}
+	if (options.getBool("log_file_is_stderr", false, false)) {
+		config["target"]["stderr"] = true;
 	}
 
 	if (options.has("file_descriptor_log_file")) {

data/src/apache2_module/Hooks.cpp

@@ -42,8 +42,10 @@
 
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/stat.h>
 #include <exception>
 #include <cstdio>
+#include <fcntl.h>
 #include <unistd.h>
 
 #include <oxt/initialize.hpp>
@@ -358,6 +360,27 @@ private:
 		return m_hasModXsendfile == YES;
 	}
 
+	static bool stderrEqualsFile(const char *path) {
+		struct stat s1, s2;
+
+		if (fstat(STDERR_FILENO, &s1) == -1) {
+			return false;
+		}
+
+		// No O_CREAT: we don't care if the file does not exist.
+		int fd = open(path, O_WRONLY | O_APPEND, 0600);
+		if (fd == -1) {
+			return false;
+		}
+		if (fstat(fd, &s2) == -1) {
+			close(fd);
+			return false;
+		}
+		close(fd);
+
+		return s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino && s1.st_rdev == s2.st_rdev;
+	}
+
 	int reportBusyException(request_rec *r) {
 		ap_custom_response(r, HTTP_SERVICE_UNAVAILABLE,
 			"This website is too busy right now.  Please try again later.");
@@ -1347,6 +1370,8 @@ public:
 				" with an explicit log file using the `PassengerLogFile` directive.");
 		} else {
 			params.set("log_file", ap_server_root_relative(pconf, s->error_fname));
+			params.setBool("log_file_is_stderr", stderrEqualsFile(
+				ap_server_root_relative(pconf, s->error_fname)));
 		}
 
 		serverConfig.ctl.addTo(params);

data/src/cxx_supportlib/ConfigKit/Schema.h

@@ -154,6 +154,8 @@ public:
 		: finalized(false)
 		{ }
 
+	virtual ~Schema() { }
+
 	/**
 	 * Register a new schema entry, possibly with a static default value.
 	 */

data/src/cxx_supportlib/Constants.h

@@ -82,7 +82,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.1.11"
+#define PASSENGER_VERSION "5.1.12"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/InstanceDirectory.h

@@ -43,6 +43,7 @@
 #include <RandomGenerator.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
+#include <Utils/SystemTime.h>
 #include <jsoncpp/json.h>
 
 namespace Passenger {
@@ -220,6 +221,7 @@ private:
 		props["instance_dir"]["major_version"] = SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION;
 		props["instance_dir"]["minor_version"] = SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION;
 		props["instance_dir"]["created_at"] = (Json::Int64) time(NULL);
+		props["instance_dir"]["created_at_monotonic_usec"] = (Json::UInt64) SystemTime::getMonotonicUsec();
 		props["passenger_version"] = PASSENGER_VERSION;
 		props["watchdog_pid"] = (Json::UInt64) getpid();
 

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -577,18 +577,24 @@ Schema::validateTarget(const string &key, const ConfigKit::Store &store,
 		return;
 	}
 
+	// Allowed formats:
+	// "/path-to-file"
+	// { "stderr": true }
+	// { "path": "/path" }
+	// { "path": "/path", "fd": 123 }
+	// { "path": "/path", "stderr": true }
+
 	if (value.isObject()) {
 		if (value.isMember("stderr")) {
-			if (value.size() > 1) {
-				errors.push_back(Error("When " + keyQuote
-					+ " is an object containing the 'stderr' key,"
-					" it may not contain any other keys"));
-			} else if (!value["stderr"].asBool()) {
+			if (!value["stderr"].isBool() || !value["stderr"].asBool()) {
 				errors.push_back(Error("When " + keyQuote
 					+ " is an object containing the 'stderr' key,"
 					" it must have the 'true' value"));
+				return;
 			}
-		} else if (value.isMember("path")) {
+		}
+
+		if (value.isMember("path")) {
 			if (!value["path"].isString()) {
 				errors.push_back(Error("When " + keyQuote
 					+ " is an object containing the 'path' key,"
@@ -605,6 +611,21 @@ Schema::validateTarget(const string &key, const ConfigKit::Store &store,
 						" it must be 0 or greater"));
 				}
 			}
+			if (value.isMember("fd") && value.isMember("stderr")) {
+				errors.push_back(Error(keyQuote
+					+ " may contain either the 'fd' or the"
+					" 'stderr' key, but not both"));
+			}
+		} else if (value.isMember("stderr")) {
+			if (value.size() > 1) {
+				errors.push_back(Error("When " + keyQuote
+					+ " is an object containing the 'stderr' key,"
+					" it may not contain any other keys"));
+			} else if (!value["stderr"].asBool()) {
+				errors.push_back(Error("When " + keyQuote
+					+ " is an object containing the 'stderr' key,"
+					" it must have the 'true' value"));
+			}
 		} else {
 			errors.push_back(Error("When " + keyQuote
 				+ " is an object, it must contain either"
@@ -661,15 +682,20 @@ ConfigRealization::ConfigRealization(const ConfigKit::Store &store)
 	} else if (store["target"]["fd"].isNull()) {
 		string path = store["target"]["path"].asString();
 		targetType = FILE_TARGET;
-		targetFd = syscalls::open(path.c_str(),
-			O_WRONLY | O_APPEND | O_CREAT, 0644);
-		if (targetFd == -1) {
-			int e = errno;
-			throw FileSystemException(
-				"Cannot open " + path + " for writing",
-				e, path);
+		if (store["target"]["stderr"].asBool()) {
+			targetFd = STDERR_FILENO;
+			targetFdClosePolicy = NEVER_CLOSE;
+		} else {
+			targetFd = syscalls::open(path.c_str(),
+				O_WRONLY | O_APPEND | O_CREAT, 0644);
+			if (targetFd == -1) {
+				int e = errno;
+				throw FileSystemException(
+					"Cannot open " + path + " for writing",
+					e, path);
+			}
+			targetFdClosePolicy = ALWAYS_CLOSE;
 		}
-		targetFdClosePolicy = ALWAYS_CLOSE;
 	} else {
 		targetType = FILE_TARGET;
 		targetFd = store["target"]["fd"].asInt();
@@ -690,15 +716,20 @@ ConfigRealization::ConfigRealization(const ConfigKit::Store &store)
 	} else if (store["file_descriptor_log_target"]["fd"].isNull()) {
 		string path = store["file_descriptor_log_target"]["path"].asString();
 		fileDescriptorLogTargetType = FILE_TARGET;
-		fileDescriptorLogTargetFd = syscalls::open(path.c_str(),
-			O_WRONLY | O_APPEND | O_CREAT, 0644);
-		if (fileDescriptorLogTargetFd == -1) {
-			int e = errno;
-			throw FileSystemException(
-				"Cannot open " + path + " for writing",
-				e, path);
+		if (store["file_descriptor_log_target"]["stderr"].asBool()) {
+			fileDescriptorLogTargetFd = STDERR_FILENO;
+			fileDescriptorLogTargetFdClosePolicy = NEVER_CLOSE;
+		} else {
+			fileDescriptorLogTargetFd = syscalls::open(path.c_str(),
+				O_WRONLY | O_APPEND | O_CREAT, 0644);
+			if (fileDescriptorLogTargetFd == -1) {
+				int e = errno;
+				throw FileSystemException(
+					"Cannot open " + path + " for writing",
+					e, path);
+			}
+			fileDescriptorLogTargetFdClosePolicy = ALWAYS_CLOSE;
 		}
-		fileDescriptorLogTargetFdClosePolicy = ALWAYS_CLOSE;
 	} else {
 		fileDescriptorLogTargetType = FILE_TARGET;
 		fileDescriptorLogTargetFd = store["file_descriptor_log_target"]["fd"].asInt();

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -390,7 +390,6 @@ public:
 			// except stdin, stdout, stderr and 3.
 			close(fds[0]);
 			installFeedbackFd(fds[1]);
-			closeAllFileDescriptors(FEEDBACK_FD);
 
 			setenv("PASSENGER_USE_FEEDBACK_FD", "true", 1);
 
@@ -398,6 +397,8 @@ public:
 				afterFork();
 			}
 
+			closeAllFileDescriptors(FEEDBACK_FD, true);
+
 			execl(agentFilename.c_str(), AGENT_EXE, "watchdog",
 				// Some extra space to allow the child process to change its process title.
 				"                                                ",

data/src/nginx_module/ngx_http_passenger_module.c

@@ -35,6 +35,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <fcntl.h>
 #include <time.h>
 #include <signal.h>
 #include <string.h>
@@ -124,16 +125,18 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     return NGX_OK;
 }
 
+typedef struct {
+    ngx_cycle_t *cycle;
+    int log_fd;
+    int stderr_equals_log_file;
+} AfterForkData;
+
 /**
  * This function is called after forking and just before exec()ing the watchdog.
  */
 static void
-starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
-    ngx_cycle_t *cycle = (void *) paramCycle;
-    PsgVariantMap *params = (void *) paramParams;
-
-    char        *log_filename;
-    FILE        *log_file;
+starting_watchdog_after_fork(void *_data, void *_params) {
+    AfterForkData   *data = (AfterForkData *) _data;
     ngx_core_conf_t *ccf;
     ngx_uint_t   i;
     ngx_str_t   *envs;
@@ -142,48 +145,74 @@ starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
     /* At this point, stdout and stderr may still point to the console.
      * Make sure that they're both redirected to the log file.
      */
-    log_file = NULL;
+    if (data->log_fd != -1) {
+        dup2(data->log_fd, 1);
+        dup2(data->log_fd, 2);
+        close(data->log_fd);
+    }
+
+    /* Set environment variables in Nginx config file. */
+    ccf = (ngx_core_conf_t *) ngx_get_conf(data->cycle->conf_ctx, ngx_core_module);
+    envs = ccf->env.elts;
+    for (i = 0; i < ccf->env.nelts; i++) {
+        env = (const char *) envs[i].data;
+        if (strchr(env, '=') != NULL) {
+            putenv(strdup(env));
+        }
+    }
+}
+
+/**
+ * This function provides a file descriptor that will be used
+ * to redirect stderr to after the upcoming fork. This prevents
+ * EIO errors on Linux if the user disconnects from the console
+ * on which Nginx is started.
+ *
+ * The fd will point to the log file, or to /dev/null if that
+ * fails (or -1 if that fails too).
+ */
+static void
+open_log_file_for_after_forking(AfterForkData *data, PsgVariantMap *params) {
+    char *log_filename;
+    int   fd;
+
     log_filename = psg_variant_map_get_optional(params, "log_file");
     if (log_filename == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
-                "no passenger log file configured, discarding log output");
+        ngx_log_error(NGX_LOG_ALERT, data->cycle->log, 0,
+            "no " PROGRAM_NAME " log file configured, discarding log output");
+        fd = -1;
     } else {
-        log_file = fopen(log_filename, "a");
-        if (log_file == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                    "could not open the passenger log file for writing during Nginx startup, some log lines might be lost (will retry from Passenger core)");
+        fd = open(log_filename, O_WRONLY | O_APPEND | O_CREAT, 0644);
+        if (fd == -1) {
+            ngx_log_error(NGX_LOG_ALERT, data->cycle->log, ngx_errno,
+                "could not open the " PROGRAM_NAME " log file for writing during Nginx startup,"
+                " some log lines might be lost (will retry from " SHORT_PROGRAM_NAME " core)");
         }
         free(log_filename);
         log_filename = NULL;
     }
 
-    if (log_file == NULL) {
-        /* If the log file cannot be opened then we redirect stdout
-         * and stderr to /dev/null, because if the user disconnects
-         * from the console on which Nginx is started, then on Linux
-         * any writes to stdout or stderr will result in an EIO error.
-         */
-        log_file = fopen("/dev/null", "w");
-        if (log_file == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                    "could not open /dev/null for logs, this will probably cause EIO errors");
+    if (fd == -1) {
+        fd = open("/dev/null", O_WRONLY | O_APPEND);
+        if (fd == -1) {
+            ngx_log_error(NGX_LOG_ALERT, data->cycle->log, ngx_errno,
+                "could not open /dev/null for logs, this will probably cause EIO errors");
         }
-    }
-    if (log_file != NULL) {
-        dup2(fileno(log_file), 1);
-        dup2(fileno(log_file), 2);
-        fclose(log_file);
+        /**
+         * The log file open failed, so the after fork isn't going to be able to redirect
+         * stderr to it.
+         */
+        data->stderr_equals_log_file = 0;
+    } else {
+    	/**
+    	 * Technically not true until after the fork when starting_watchdog_after_fork does
+    	 * the redirection (dup2), but that never seems to fail and we need to know here
+    	 * already.
+    	 */
+        data->stderr_equals_log_file = 1;
     }
 
-    /* Set environment variables in Nginx config file. */
-    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-    envs = ccf->env.elts;
-    for (i = 0; i < ccf->env.nelts; i++) {
-        env = (const char *) envs[i].data;
-        if (strchr(env, '=') != NULL) {
-            putenv(strdup(env));
-        }
-    }
+    data->log_fd = fd;
 }
 
 static ngx_int_t
@@ -228,6 +257,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     ngx_uint_t       i;
     ngx_str_t       *prestart_uris;
     char           **prestart_uris_ary = NULL;
+    AfterForkData    after_fork_data;
     ngx_keyval_t    *ctl = NULL;
     PsgVariantMap   *params = NULL;
     u_char  filename[NGX_MAX_PATH], *last;
@@ -237,6 +267,8 @@ start_watchdog(ngx_cycle_t *cycle) {
     core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
     result    = NGX_OK;
     params    = psg_variant_map_new();
+    after_fork_data.cycle = cycle;
+    after_fork_data.log_fd = -1;
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
     if (passenger_root == NULL) {
         goto error_enomem;
@@ -304,6 +336,10 @@ start_watchdog(ngx_cycle_t *cycle) {
         psg_variant_map_set_ngx_str(params, "log_file", &cycle->log->file->name);
     }
 
+    open_log_file_for_after_forking(&after_fork_data, params);
+    psg_variant_map_set_bool(params, "log_file_is_stderr",
+        after_fork_data.stderr_equals_log_file);
+
     ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;
     for (i = 0; i < passenger_main_conf.ctl->nelts; i++) {
         psg_variant_map_set2(params,
@@ -315,7 +351,7 @@ start_watchdog(ngx_cycle_t *cycle) {
         passenger_root,
         params,
         starting_watchdog_after_fork,
-        cycle,
+        &after_fork_data,
         &error_message);
     if (!ret) {
         ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "%s", error_message);
@@ -354,6 +390,10 @@ cleanup:
         free(prestart_uris_ary);
     }
 
+    if (after_fork_data.log_fd != -1) {
+        close(after_fork_data.log_fd);
+    }
+
     if (result == NGX_ERROR && passenger_main_conf.abort_on_startup_error) {
         exit(1);
     }

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,18 +31,18 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.1.11'
+  VERSION_STRING = '5.1.12'
 
-  PREFERRED_NGINX_VERSION = '1.12.1'
-  NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb'
+  PREFERRED_NGINX_VERSION = '1.12.2'
+  NGINX_SHA256_CHECKSUM = '305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.12.1'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.12.2'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'
 
-  PREFERRED_PCRE_VERSION  = '8.39'
-  PCRE_SHA256_CHECKSUM = 'ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7'
+  PREFERRED_PCRE_VERSION  = '8.41'
+  PCRE_SHA256_CHECKSUM = '244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c'
 
   STANDALONE_INTERFACE_VERSION  = 1
 
@@ -173,7 +173,7 @@ module PhusionPassenger
 
   # Whether the current Phusion Passenger installation is installed
   # from a release package, e.g. an official gem or official tarball.
-  # Retruns false if e.g. the gem was built by the user, or if this
+  # Returns false if e.g. the gem was built by the user, or if this
   # install is from a git repository.
   def self.installed_from_release_package?
     File.exist?("#{resources_dir}/release.txt")

data/src/ruby_supportlib/phusion_passenger/platform_info.rb

@@ -100,7 +100,7 @@ module PhusionPassenger
                   if cache_file && #{cache_to_disk}                           #         if cache_file && #{cache_to_disk}
                     begin                                                     #           begin
                       if !File.directory?(@@cache_dir)                        #             if !File.directory?(@@cache_dir)
-                        Dir.mkdir(@@cache_dir)                                #               Dir.mkdir(@@cache_dir)
+                        FileUtils.mkdir_p(@@cache_dir)                        #               FileUtils.mkdir_p(@@cache_dir)
                       end                                                     #             end
                       File.open(cache_file, "wb") do |f|                      #             File.open(cache_file, "wb") do |f|
                         f.write(Marshal.dump(#{variable_name}))               #               f.write(Marshal.dump(@@memoized_httpd))

data/src/ruby_supportlib/phusion_passenger/standalone/config_utils.rb

@@ -174,7 +174,7 @@ module PhusionPassenger
       # We want the command line options to override the options in the local
       # config file, but the local config file could only be parsed when the
       # command line options have been parsed. This method remerges all the
-      # config options from different sources so that options are overriden
+      # config options from different sources so that options are overridden
       # according to the following order:
       #
       # - CONFIG_DEFAULTS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.1.11
+  version: 5.1.12
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,6 +114,8 @@ files:
 - dev/ci/tests/apache2/setup
 - dev/ci/tests/cxx/run
 - dev/ci/tests/cxx/setup
+- dev/ci/tests/debian/Jenkinsfile
+- dev/ci/tests/debian/run
 - dev/ci/tests/nginx-dynamic/run
 - dev/ci/tests/nginx-dynamic/setup
 - dev/ci/tests/nginx/run