passenger 5.0.24 → 5.0.25

data/src/cxx_supportlib/vendor-modified/boost/version.hpp

@@ -10,16 +10,16 @@
 #define BOOST_VERSION_HPP
 
 //
-//  Caution, this is the only boost header that is guarenteed
-//  to change with every boost release, including this header
-//  will cause a recompile every time a new boost version is
-//  released.
+//  Caution: this is the only Boost header that is guaranteed
+//  to change with every Boost release. Including this header
+//  will cause a recompile every time a new Boost version is
+//  used.
 //
 //  BOOST_VERSION % 100 is the patch level
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 105400
+#define BOOST_VERSION 106000
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,6 +27,6 @@
 //  number, y is the minor version number, and z is the patch level if not 0.
 //  This is used by <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_54"
+#define BOOST_LIB_VERSION "1_60"
 
 #endif

data/src/cxx_supportlib/vendor-modified/boost/visit_each.hpp

@@ -10,8 +10,6 @@
 #ifndef BOOST_VISIT_EACH_HPP
 #define BOOST_VISIT_EACH_HPP
 
-#include <boost/config.hpp>
-
 namespace boost {
   template<typename Visitor, typename T>
   inline void visit_each(Visitor& visitor, const T& t, long)

data/src/cxx_supportlib/vendor-modified/modp_b64.cpp

@@ -53,7 +53,9 @@
 	typedef uint32_t modp_uint32_t;
 #endif
 
-#include "boost/detail/endian.hpp" /* File is C compatible. */
+#ifndef MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
+	#include <boost/detail/endian.hpp>
+#endif
 
 /* public header */
 #include "modp_b64.h"

data/src/nginx_module/Configuration.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -55,10 +55,29 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
+typedef struct postprocess_ctx_s postprocess_ctx_t;
+
 static ngx_path_init_t  ngx_http_proxy_temp_path = {
     ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
 };
 
+static ngx_int_t postprocess_location_conf(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t *location_conf,
+    int is_toplevel,
+    postprocess_ctx_t *ctx);
+static ngx_int_t traverse_location_confs_nested_in_server_conf(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t *location_conf,
+    postprocess_ctx_t *ctx);
+static ngx_int_t traverse_static_location_tree(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_location_tree_node_t *node,
+    postprocess_ctx_t *ctx);
+static ngx_int_t traverse_regex_locations(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t **regex_locations,
+    postprocess_ctx_t *ctx);
 static ngx_int_t merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf,
     passenger_loc_conf_t *prev);
 static ngx_int_t merge_string_array(ngx_conf_t *cf, ngx_array_t **prev,
@@ -109,6 +128,7 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->analytics_log_user.len  = 0;
     conf->analytics_log_group.data = NULL;
     conf->analytics_log_group.len  = 0;
+    conf->union_station_support = 0;
     conf->union_station_gateway_address.data = NULL;
     conf->union_station_gateway_address.len = 0;
     conf->union_station_gateway_port = (ngx_uint_t) NGX_CONF_UNSET;
@@ -367,13 +387,13 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
     u_char        *unencoded_buf;
 
     if (generated_cache_location_part(cf, conf) == 0) {
-    	return NGX_ERROR;
+        return NGX_ERROR;
     }
 
     if (conf->env_vars != NULL) {
-    	size_t len = 0;
-    	u_char *buf;
-    	u_char *pos;
+        size_t len = 0;
+        u_char *buf;
+        u_char *pos;
 
         /* Cache env vars data as base64-serialized string.
          * First, calculate the length of the unencoded data.
@@ -448,7 +468,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
 
     if (generated_merge_part(conf, prev, cf) == 0) {
-    	return NGX_CONF_ERROR;
+        return NGX_CONF_ERROR;
     }
 
     if (prev->options_cache.data == NULL) {
@@ -1057,6 +1077,137 @@ merge_string_array(ngx_conf_t *cf, ngx_array_t **prev, ngx_array_t **conf)
     return NGX_OK;
 }
 
+struct postprocess_ctx_s {
+    /* Reserved for future use */
+};
+
+ngx_int_t
+passenger_postprocess_config(ngx_conf_t *cf)
+{
+    ngx_http_core_main_conf_t  *cmcf;
+    ngx_http_core_srv_conf_t   **server_confs, *server_conf;
+    ngx_http_core_loc_conf_t    *base_location_conf;
+    ngx_uint_t                  i;
+    ngx_int_t                   result;
+    postprocess_ctx_t           ctx;
+
+    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
+    server_confs = (ngx_http_core_srv_conf_t **) cmcf->servers.elts;
+
+    ngx_memzero(&ctx, sizeof(ctx));
+
+    for (i = 0; i < cmcf->servers.nelts; i++) {
+        server_conf = server_confs[i];
+        base_location_conf = server_conf->ctx->loc_conf[ngx_http_core_module.ctx_index];
+
+        result = postprocess_location_conf(cf, server_conf, base_location_conf, 1, &ctx);
+        if (result != NGX_OK) {
+            return result;
+        }
+    }
+
+    return NGX_OK;
+}
+
+static ngx_int_t
+postprocess_location_conf(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t *location_conf,
+    int is_toplevel,
+    postprocess_ctx_t *ctx)
+{
+    passenger_loc_conf_t *plconf = server_conf->ctx->loc_conf[
+        ngx_http_passenger_module.ctx_index];
+
+    if (plconf->union_station_support != NGX_CONF_UNSET && plconf->union_station_support) {
+        passenger_main_conf.union_station_support = 1;
+    }
+
+    return traverse_location_confs_nested_in_server_conf(cf, server_conf, location_conf, ctx);
+}
+
+static ngx_int_t
+traverse_location_confs_nested_in_server_conf(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t *location_conf,
+    postprocess_ctx_t *ctx)
+{
+    ngx_int_t result;
+
+    result = traverse_static_location_tree(cf, server_conf,
+        location_conf->static_locations, ctx);
+    if (result != NGX_OK) {
+        return result;
+    }
+
+    return traverse_regex_locations(cf, server_conf,
+        location_conf->regex_locations, ctx);
+}
+
+static ngx_int_t
+traverse_static_location_tree(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_location_tree_node_t *node,
+    postprocess_ctx_t *ctx)
+{
+    ngx_int_t result;
+
+    if (node == NULL) {
+        return NGX_OK;
+    }
+
+    if (node->left != NULL) {
+        result = traverse_static_location_tree(cf, server_conf, node->left, ctx);
+        if (result != NGX_OK) {
+            return result;
+        }
+    }
+
+    if (node->right != NULL) {
+        result = traverse_static_location_tree(cf, server_conf, node->right, ctx);
+        if (result != NGX_OK) {
+            return result;
+        }
+    }
+
+    if (node->exact != NULL) {
+        result = postprocess_location_conf(cf, server_conf,
+            node->exact, 0, ctx);
+    } else {
+        result = postprocess_location_conf(cf, server_conf,
+            node->inclusive, 0, ctx);
+    }
+    if (result != NGX_OK) {
+        return result;
+    }
+
+    return NGX_OK;
+}
+
+static ngx_int_t
+traverse_regex_locations(ngx_conf_t *cf,
+    ngx_http_core_srv_conf_t *server_conf,
+    ngx_http_core_loc_conf_t **regex_locations,
+    postprocess_ctx_t *ctx)
+{
+    ngx_uint_t i;
+    ngx_int_t  result;
+
+    if (regex_locations == NULL) {
+        return NGX_OK;
+    }
+
+    for (i = 0; regex_locations[i] != NULL; i++) {
+        result = postprocess_location_conf(cf, server_conf,
+            regex_locations[i], 0, ctx);
+        if (result != NGX_OK) {
+            return result;
+        }
+    }
+
+    return NGX_OK;
+}
+
 static int
 string_keyval_has_key(ngx_array_t *table, ngx_str_t *key)
 {

data/src/nginx_module/Configuration.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -55,6 +55,7 @@ typedef struct {
     ngx_str_t    default_group;
     ngx_str_t    analytics_log_user;
     ngx_str_t    analytics_log_group;
+    ngx_int_t    union_station_support;
     ngx_str_t    union_station_gateway_address;
     ngx_uint_t   union_station_gateway_port;
     ngx_str_t    union_station_gateway_cert;
@@ -69,6 +70,7 @@ void *passenger_create_main_conf(ngx_conf_t *cf);
 char *passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer);
 void *passenger_create_loc_conf(ngx_conf_t *cf);
 char *passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child);
+ngx_int_t passenger_postprocess_config(ngx_conf_t *cf);
 
 #endif /* _PASSENGER_NGINX_CONFIGURATION_H_ */
 

data/src/nginx_module/ContentHandler.c

@@ -742,7 +742,8 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
 
     PUSH_STATIC_STR("!~FLAGS: DC");
     #if (NGX_HTTP_SSL)
-        if (r->http_connection->ssl) {
+        if (r->http_connection != NULL /* happens in sub-requests */
+                && r->http_connection->ssl) {
             PUSH_STATIC_STR("S");
         }
     #endif

data/src/nginx_module/ngx_http_passenger_module.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -40,6 +40,13 @@
 #include <string.h>
 #include <errno.h>
 
+#define MODP_B64_DONT_INCLUDE_BOOST_ENDIANNESS_HEADERS
+#if NGX_HAVE_LITTLE_ENDIAN
+    #define BOOST_LITTLE_ENDIAN
+#else
+    #define BOOST_BIG_ENDIAN
+#endif
+
 #include "ngx_http_passenger_module.h"
 #include "Configuration.h"
 #include "ContentHandler.h"
@@ -56,34 +63,6 @@ PsgWatchdogLauncher      *psg_watchdog_launcher = NULL;
 ngx_cycle_t              *pp_current_cycle;
 
 
-/*
-    HISTORIC NOTE:
-    We used to register passenger_content_handler as a default content handler,
-    instead of setting ngx_http_core_loc_conf_t->handler. However, if
-    ngx_http_read_client_request_body (and thus passenger_content_handler)
-    returns NGX_AGAIN, then Nginx will pass the not-fully-receive file upload
-    data to the upstream handler even though it shouldn't. Is this an Nginx
-    bug? In any case, setting ngx_http_core_loc_conf_t->handler fixed the
-    problem.
-
-static ngx_int_t
-register_content_handler(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-    *h = passenger_content_handler;
-
-    return NGX_OK;
-}
-*/
-
 static void
 ignore_sigpipe() {
     struct sigaction action;
@@ -148,9 +127,11 @@ save_master_process_pid(ngx_cycle_t *cycle) {
  * This function is called after forking and just before exec()ing the watchdog.
  */
 static void
-starting_watchdog_after_fork(void *arg) {
-    ngx_cycle_t *cycle = (void *) arg;
-    char        *log_filename;
+starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
+    ngx_cycle_t *cycle = (void *) paramCycle;
+    PsgVariantMap *params = (void *) paramParams;
+
+    const char  *log_filename;
     FILE        *log_file;
     ngx_core_conf_t *ccf;
     ngx_uint_t   i;
@@ -161,23 +142,18 @@ starting_watchdog_after_fork(void *arg) {
      * Make sure that they're both redirected to the log file.
      */
     log_file = NULL;
-    if (cycle->new_log.file->name.len > 0) {
-        log_filename = ngx_str_null_terminate(&cycle->new_log.file->name);
-        log_file = fopen((const char *) log_filename, "a");
-        if (log_file == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                          "could not open the error log file for writing");
-        }
-        free(log_filename);
-    } else if (cycle->log != NULL && cycle->log->file->name.len > 0) {
-        log_filename = ngx_str_null_terminate(&cycle->log->file->name);
-        log_file = fopen((const char *) log_filename, "a");
+    log_filename = (const char *) 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");
+    } 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 error log file for writing");
+                    "could not open the passenger log file for writing, discarding log output");
         }
-        free(log_filename);
     }
+
     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
@@ -185,6 +161,10 @@ starting_watchdog_after_fork(void *arg) {
          * 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 (log_file != NULL) {
         dup2(fileno(log_file), 1);
@@ -299,6 +279,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_variant_map_set_int    (params, "stat_throttle_rate", passenger_main_conf.stat_throttle_rate);
     psg_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
     psg_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
+    psg_variant_map_set_bool   (params, "union_station_support", passenger_main_conf.union_station_support);
     psg_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
     psg_variant_map_set_int    (params, "union_station_gateway_port", passenger_main_conf.union_station_gateway_port);
     psg_variant_map_set_ngx_str(params, "union_station_gateway_cert", &passenger_main_conf.union_station_gateway_cert);
@@ -484,7 +465,7 @@ exit_master(ngx_cycle_t *cycle) {
 
 static ngx_http_module_t passenger_module_ctx = {
     pre_config_init,                     /* preconfiguration */
-    /* register_content_handler */ NULL, /* postconfiguration */
+    passenger_postprocess_config,        /* postconfiguration */
 
     passenger_create_main_conf,          /* create main configuration */
     passenger_init_main_conf,            /* init main configuration */

data/src/nodejs_supportlib/phusion_passenger/log_express.js

@@ -66,7 +66,7 @@ exports.initPreLoad = function() {
 				express.application.useOrig.call(this, logException);
 			}
 
-			express.application.useOrig.apply(this, arguments);
+			return express.application.useOrig.apply(this, arguments);
 		}
 	} catch (e) {
 		log.error("Unable to instrument Express due to error: " + e);

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.24'
+  VERSION_STRING = '5.0.25'
 
   PREFERRED_NGINX_VERSION = '1.8.1'
   NGINX_SHA256_CHECKSUM = '8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7'

data/src/ruby_supportlib/phusion_passenger/rack_handler.rb

@@ -0,0 +1,102 @@
+#  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.
+
+## Magic comment: begin bootstrap ##
+libdir = File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH.unshift(libdir)
+begin
+  require 'rubygems'
+rescue LoadError
+end
+require 'phusion_passenger'
+## Magic comment: end bootstrap ##
+
+PhusionPassenger.locate_directories
+
+require 'rbconfig'
+
+module Rack
+  module Handler
+    class PhusionPassenger
+      class << self
+        def run(app, options = {})
+          result = system(ruby_executable, '-S', find_passenger_standalone,
+            'start', *build_args(options))
+          if !result
+            raise "Error starting Passenger"
+          end
+        end
+
+        def environment
+          ENV['RAILS_ENV'] || 'development'
+        end
+
+        def to_s
+          'Passenger application server'
+        end
+
+      private
+        def build_args(options)
+          args = ['-e', environment]
+          if options[:Port]
+            args << '-p'
+            args << options[:Port].to_s
+          end
+          if options[:Host]
+            args << '-a'
+            args << options[:Host].to_s
+          end
+          if options[:config]
+            args << '-R'
+            args << options[:config].to_s
+          end
+          args
+        end
+
+        def rb_config
+          if defined?(::RbConfig)
+            ::RbConfig::CONFIG
+          else
+            ::Config::CONFIG
+          end
+        end
+
+        def ruby_executable
+          @ruby_executable ||= rb_config['bindir'] + '/' +
+            rb_config['RUBY_INSTALL_NAME'] + rb_config['EXEEXT']
+        end
+
+        def find_passenger_standalone
+          ::File.join(::PhusionPassenger.bin_dir, 'passenger')
+        end
+      end
+    end
+
+    register 'passenger', 'Rack::Handler::PhusionPassenger'
+
+    def self.default(options = {})
+      Rack::Handler::PhusionPassenger
+    end
+  end
+end