passenger 5.0.25 → 5.0.26

data/src/cxx_supportlib/vendor-copy/libuv/src/version.c

@@ -21,10 +21,6 @@
 
 #include "uv.h"
 
-#define UV_VERSION  ((UV_VERSION_MAJOR << 16) | \
-                     (UV_VERSION_MINOR <<  8) | \
-                     (UV_VERSION_PATCH))
-
 #define UV_STRINGIFY(v) UV_STRINGIFY_HELPER(v)
 #define UV_STRINGIFY_HELPER(v) #v
 
@@ -40,7 +36,7 @@
 
 
 unsigned int uv_version(void) {
-  return UV_VERSION;
+  return UV_VERSION_HEX;
 }
 
 

data/src/cxx_supportlib/vendor-copy/libuv/uv.gyp

@@ -104,12 +104,20 @@
             'src/win/winsock.c',
             'src/win/winsock.h',
           ],
+          'conditions': [
+            ['MSVS_VERSION < "2015"', {
+              'sources': [
+                'src/win/snprintf.c'
+              ]
+            }]
+          ],
           'link_settings': {
             'libraries': [
               '-ladvapi32',
               '-liphlpapi',
               '-lpsapi',
               '-lshell32',
+              '-luserenv',
               '-lws2_32'
             ],
           },
@@ -304,6 +312,7 @@
         'test/test-getnameinfo.c',
         'test/test-getsockname.c',
         'test/test-handle-fileno.c',
+        'test/test-homedir.c',
         'test/test-hrtime.c',
         'test/test-idle.c',
         'test/test-ip6-addr.c',
@@ -324,7 +333,10 @@
         'test/test-ping-pong.c',
         'test/test-pipe-bind-error.c',
         'test/test-pipe-connect-error.c',
+        'test/test-pipe-connect-multiple.c',
+        'test/test-pipe-connect-prepare.c',
         'test/test-pipe-getsockname.c',
+        'test/test-pipe-pending-instances.c',
         'test/test-pipe-sendmsg.c',
         'test/test-pipe-server-close.c',
         'test/test-pipe-close-stdout-read-stdin.c',
@@ -335,6 +347,7 @@
         'test/test-poll-close-doesnt-corrupt-stack.c',
         'test/test-poll-closesocket.c',
         'test/test-process-title.c',
+        'test/test-queue-foreach-delete.c',
         'test/test-ref.c',
         'test/test-run-nowait.c',
         'test/test-run-once.c',
@@ -353,6 +366,7 @@
         'test/test-tcp-close.c',
         'test/test-tcp-close-accept.c',
         'test/test-tcp-close-while-connecting.c',
+        'test/test-tcp-create-socket-early.c',
         'test/test-tcp-connect-error-after-write.c',
         'test/test-tcp-shutdown-after-write.c',
         'test/test-tcp-flags.c',
@@ -381,6 +395,7 @@
         'test/test-timer.c',
         'test/test-tty.c',
         'test/test-udp-bind.c',
+        'test/test-udp-create-socket-early.c',
         'test/test-udp-dgram-too-big.c',
         'test/test-udp-ipv6.c',
         'test/test-udp-open.c',
@@ -424,6 +439,9 @@
             '_XOPEN_SOURCE=500',
           ],
         }],
+        ['uv_library=="shared_library"', {
+          'defines': [ 'USING_UV_SHARED=1' ]
+        }],
       ],
       'msvs-settings': {
         'VCLinkerTool': {
@@ -475,7 +493,10 @@
             'test/runner-unix.c',
             'test/runner-unix.h',
           ]
-        }]
+        }],
+        ['uv_library=="shared_library"', {
+          'defines': [ 'USING_UV_SHARED=1' ]
+        }],
       ],
       'msvs-settings': {
         'VCLinkerTool': {

data/src/nginx_module/CacheLocationConfig.c

@@ -59,6 +59,30 @@ int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
 	
 
 	
+		if (conf->core_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%ui",
+				conf->core_file_descriptor_ulimit);
+			len += sizeof("!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
+	
+		if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%ui",
+				conf->app_file_descriptor_ulimit);
+			len += sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
+	
 		if (conf->ruby.data != NULL) {
 			len += sizeof("!~PASSENGER_RUBY: ") - 1;
 			len += conf->ruby.len;
@@ -359,6 +383,34 @@ if (buf == NULL) {
 	
 
 	
+		if (conf->core_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ",
+				sizeof("!~PASSENGER_CORE_FILE_DESCRIPTOR_ULIMIT: ") - 1);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%ui",
+				conf->core_file_descriptor_ulimit);
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
+	
+		if (conf->app_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ",
+				sizeof("!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT: ") - 1);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%ui",
+				conf->app_file_descriptor_ulimit);
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
+	
 		if (conf->ruby.data != NULL) {
 			pos = ngx_copy(pos,
 				"!~PASSENGER_RUBY: ",

data/src/nginx_module/CacheLocationConfig.c.erb

@@ -85,7 +85,7 @@ int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
 			len += end - int_buf;
 			len += sizeof("\r\n") - 1;
 		}
-	<% elsif option[:type] == :integer %>
+	<% elsif option[:type] == :uinteger %>
 		if (conf-><%= struct_field_for(option) %> != NGX_CONF_UNSET_UINT) {
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
@@ -136,6 +136,18 @@ if (buf == NULL) {
 			pos = ngx_copy(pos, int_buf, end - int_buf);
 			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
+	<% elsif option[:type] == :uinteger %>
+		if (conf-><%= struct_field_for(option) %> != NGX_CONF_UNSET_UINT) {
+			pos = ngx_copy(pos,
+				"!~<%= header_name_for(option) %>: ",
+				sizeof("!~<%= header_name_for(option) %>: ") - 1);
+			end = ngx_snprintf(int_buf,
+				sizeof(int_buf) - 1,
+				"%ui",
+				conf-><%= struct_field_for(option) %>);
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
 	<% elsif option[:type] == :flag %>
 		if (conf-><%= struct_field_for(option) %> != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,

data/src/nginx_module/Configuration.c

@@ -117,6 +117,7 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->pool_idle_time = NGX_CONF_UNSET_UINT;
     conf->response_buffer_high_watermark = NGX_CONF_UNSET_UINT;
     conf->stat_throttle_rate = NGX_CONF_UNSET_UINT;
+    conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
     conf->user_switching = NGX_CONF_UNSET;
     conf->show_version_in_header = NGX_CONF_UNSET;
     conf->turbocaching = NGX_CONF_UNSET;

data/src/nginx_module/Configuration.h

@@ -48,6 +48,7 @@ typedef struct {
     ngx_uint_t   pool_idle_time;
     ngx_uint_t   response_buffer_high_watermark;
     ngx_uint_t   stat_throttle_rate;
+    ngx_uint_t   core_file_descriptor_ulimit;
     ngx_flag_t   turbocaching;
     ngx_flag_t   show_version_in_header;
     ngx_flag_t   user_switching;

data/src/nginx_module/ConfigurationCommands.c

@@ -50,6 +50,26 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_core_file_descriptor_ulimit"),
+	NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_num_slot,
+	NGX_HTTP_MAIN_CONF_OFFSET,
+	offsetof(passenger_main_conf_t, core_file_descriptor_ulimit),
+	NULL
+},
+
+{
+	
+	ngx_string("passenger_app_file_descriptor_ulimit"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_num_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, app_file_descriptor_ulimit),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_enabled"),

data/src/nginx_module/ConfigurationFields.h

@@ -53,8 +53,12 @@
 
 	ngx_int_t abort_websockets_on_process_shutdown;
 
+	ngx_uint_t app_file_descriptor_ulimit;
+
 	ngx_array_t *base_uris;
 
+	ngx_uint_t core_file_descriptor_ulimit;
+
 	ngx_int_t debugger;
 
 	ngx_int_t enabled;

data/src/nginx_module/CreateLocationConfig.c

@@ -46,6 +46,14 @@ void generated_set_conf_part(passenger_loc_conf_t  *conf) {
 	
 
 	
+		conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
+	
+
+	
+		conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
+	
+
+	
 		conf->enabled = NGX_CONF_UNSET;
 	
 

data/src/nginx_module/MergeLocationConfig.c

@@ -49,6 +49,18 @@ int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev,
 	
 
 	
+		ngx_conf_merge_uint_value(conf->core_file_descriptor_ulimit,
+			prev->core_file_descriptor_ulimit,
+			NGX_CONF_UNSET_UINT);
+	
+
+	
+		ngx_conf_merge_uint_value(conf->app_file_descriptor_ulimit,
+			prev->app_file_descriptor_ulimit,
+			NGX_CONF_UNSET_UINT);
+	
+
+	
 		ngx_conf_merge_value(conf->enabled,
 			prev->enabled,
 			NGX_CONF_UNSET);

data/src/nginx_module/config

@@ -41,15 +41,8 @@ if test "x$PASSENGER_LIBS" = "x"; then
     PASSENGER_LIBS=`$PASSENGER_CONFIG --nginx-libs`
 fi
 
-ngx_addon_name=ngx_http_passenger_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
-    ${ngx_addon_dir}/ngx_http_passenger_module.c \
-    ${ngx_addon_dir}/Configuration.c \
-    ${ngx_addon_dir}/ContentHandler.c \
-    ${ngx_addon_dir}/StaticContentHandler.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
-    ${ngx_addon_dir}/Configuration.h \
+PASSENGER_MODULE_INCS="$PASSENGER_INCLUDEDIR"
+PASSENGER_MODULE_DEPS="${ngx_addon_dir}/Configuration.h \
     ${ngx_addon_dir}/ConfigurationCommands.c \
     ${ngx_addon_dir}/CreateLocationConfig.c \
     ${ngx_addon_dir}/MergeLocationConfig.c \
@@ -60,8 +53,12 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
     ${PASSENGER_INCLUDEDIR}/cxx_supportlib/Constants.h \
     ${PASSENGER_INCLUDEDIR}/cxx_supportlib/WatchdogLauncher.h \
     ${PASSENGER_INCLUDEDIR}/cxx_supportlib/AppTypes.h"
-CORE_INCS="$CORE_INCS $PASSENGER_INCLUDEDIR"
-CORE_LIBS="$CORE_LIBS $PASSENGER_LIBS -lstdc++ -lpthread"
+PASSENGER_MODULE_SRCS="${ngx_addon_dir}/ngx_http_passenger_module.c \
+    ${ngx_addon_dir}/Configuration.c \
+    ${ngx_addon_dir}/ContentHandler.c \
+    ${ngx_addon_dir}/StaticContentHandler.c"
+PASSENGER_MODULE_LIBS="$PASSENGER_LIBS -lstdc++ -lpthread"
+
 
 ngx_feature="Math library"
 ngx_feature_name=
@@ -72,7 +69,7 @@ ngx_feature_libs="-lm"
 ngx_feature_test="pow(1, 2)"
 . auto/feature
 if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lm"
+    PASSENGER_MODULE_LIBS="$PASSENGER_MODULE_LIBS -lm"
 fi
 
 ngx_feature="POSIX realtime library"
@@ -84,9 +81,10 @@ ngx_feature_libs="-lrt"
 ngx_feature_test=
 . auto/feature
 if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lrt"
+    PASSENGER_MODULE_LIBS="$PASSENGER_MODULE_LIBS -lrt"
 fi
 
+
 nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g' | head -n1`
 
 nginx_major_version=`echo "$nginx_version" | cut -d . -f 1`
@@ -100,3 +98,23 @@ have=PASSENGER_NGINX_MINOR_VERSION value="$nginx_minor_version"
 nginx_micro_version=`echo "$nginx_version" | cut -d . -f 3`
 have=PASSENGER_NGINX_MICRO_VERSION value="$nginx_micro_version"
 . auto/define
+
+
+ngx_addon_name=ngx_http_passenger_module
+
+if test -n "$ngx_module_link"; then
+    ngx_module_type=HTTP
+    ngx_module_name=ngx_http_passenger_module
+    ngx_module_incs="$PASSENGER_MODULE_INCS"
+    ngx_module_deps="$PASSENGER_MODULE_DEPS"
+    ngx_module_srcs="$PASSENGER_MODULE_SRCS"
+    ngx_module_libs="$PASSENGER_MODULE_LIBS"
+
+    . auto/module
+else
+    HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $PASSENGER_MODULE_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $PASSENGER_MODULE_DEPS"
+    CORE_INCS="$CORE_INCS $PASSENGER_MODULE_INCS"
+    CORE_LIBS="$CORE_LIBS $PASSENGER_MODULE_LIBS"
+fi

data/src/nginx_module/ngx_http_passenger_module.c

@@ -286,6 +286,10 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
     psg_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);
 
+    if (passenger_main_conf.core_file_descriptor_ulimit != NGX_CONF_UNSET_UINT) {
+        psg_variant_map_set_int(params, "core_file_descriptor_ulimit", passenger_main_conf.core_file_descriptor_ulimit);
+    }
+
     if (passenger_main_conf.log_file.len > 0) {
         psg_variant_map_set_ngx_str(params, "log_file", &passenger_main_conf.log_file);
     } else if (cycle->new_log.file == NULL) {

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.25'
+  VERSION_STRING = '5.0.26'
 
   PREFERRED_NGINX_VERSION = '1.8.1'
   NGINX_SHA256_CHECKSUM = '8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7'

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -44,7 +44,7 @@ module PhusionPassenger
     # Default config values
     DEFAULT_LOG_LEVEL = 3
     DEFAULT_INTEGRATION_MODE = "standalone"
-    DEFAULT_SOCKET_BACKLOG = 1024
+    DEFAULT_SOCKET_BACKLOG = 2048
     DEFAULT_RUBY = "ruby"
     DEFAULT_PYTHON = "python"
     DEFAULT_NODEJS = "node"

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2015 Phusion Holding B.V.
+#  Copyright (c) 2013-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -92,6 +92,16 @@ LOCATION_CONFIGURATION_OPTIONS = [
     :context   => [:main],
     :struct   => "NGX_HTTP_MAIN_CONF_OFFSET"
   },
+  {
+    :name     => 'passenger_core_file_descriptor_ulimit',
+    :type     => :uinteger,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_app_file_descriptor_ulimit',
+    :type     => :uinteger
+  },
   {
     :name     => 'passenger_enabled',
     :context  => [:srv, :loc, :lif],

data/src/ruby_supportlib/phusion_passenger/platform_info/apache.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -608,6 +608,11 @@ module PhusionPassenger
           apxs2_flags.gsub!('-m32 -march=i386 -mtune=generic', '')
         end
 
+        # Some Apache installations include '-pie' in CFLAGS, which
+        # won't work on shared libraries.
+        # https://github.com/phusion/passenger/issues/1756
+        apxs2_flags.gsub!('-pie', '')
+
         apxs2_flags.strip!
         flags << apxs2_flags
       end

data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -215,7 +215,7 @@ module PhusionPassenger
             if !body.is_a?(Array) || headers.has_key?(X_SENDFILE_HEADER) ||
                headers.has_key?(X_ACCEL_REDIRECT_HEADER)
               # If X-Sendfile or X-Accel-Redirect is set, don't check the
-              # body size. PassengerAgent's RequestHandler will ignore the
+              # body size. Passenger's Core Controller will ignore the
               # body anyway. See
               # ServerKit::HttpHeaderParser::processParseResult(const HttpParseResponse &)
               @can_keepalive = false
@@ -241,7 +241,10 @@ module PhusionPassenger
             # Disallowed by the HTTP spec
             raise "Response object may not contain both Content-Length and Transfer-Encoding"
           end
-        elsif output_body
+        elsif status_code_allows_body?(status)
+          # This is a response for which a body is allowed, although the request
+          # may be one which does not expect a body (HEAD requests).
+          #
           # The app has set neither the Content-Length nor the Transfer-Encoding
           # header. This means we'll have to add one of those headers. We know exactly how
           # big our body will be, so we can keep-alive the connection.
@@ -270,37 +273,33 @@ module PhusionPassenger
         # If this is a request without body, write out headers without body.
         if !output_body
           connection.writev(headers_output)
-          signal_keep_alive_allowed!
-          return
-        end
-
-        # Otherwise, write out headers and body, then verify at the end whether what
-        # we wrote is matches the message length. Only keep-alive connection if it
-        # is the case.
-        case message_length_type
-        when :content_length
-          if body.is_a?(Array)
-            connection.writev2(headers_output, body)
-          else
+        else
+          # Otherwise, write out headers and body.
+          case message_length_type
+          when :content_length
+            if body.is_a?(Array)
+              connection.writev2(headers_output, body)
+            else
+              connection.writev(headers_output)
+              body.each do |part|
+                connection.write(part.to_s)
+              end
+            end
+          when :chunked_by_app
             connection.writev(headers_output)
             body.each do |part|
               connection.write(part.to_s)
             end
-          end
-        when :chunked_by_app
-          connection.writev(headers_output)
-          body.each do |part|
-            connection.write(part.to_s)
-          end
-        when :needs_chunking
-          connection.writev(headers_output)
-          body.each do |part|
-            size = bytesize(part.to_s)
-            if size != 0
-              connection.writev(chunk_data(part.to_s, size))
+          when :needs_chunking
+            connection.writev(headers_output)
+            body.each do |part|
+              size = bytesize(part.to_s)
+              if size != 0
+                connection.writev(chunk_data(part.to_s, size))
+              end
             end
+            connection.write(TERMINATION_CHUNK)
           end
-          connection.write(TERMINATION_CHUNK)
         end
 
         signal_keep_alive_allowed!
@@ -360,10 +359,12 @@ module PhusionPassenger
         nil
       end
 
+      def status_code_allows_body?(status)
+        status < 100 || (status >= 200 && status != 204 && status != 304)
+      end
+
       def should_output_body?(status, is_head_request)
-        return (status < 100 ||
-          (status >= 200 && status != 204 && status != 304)) &&
-          !is_head_request
+        status_code_allows_body?(status) && !is_head_request
       end
 
       def chunk_data(data, size)