passenger 4.0.56 → 4.0.57

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc1ZGFjMmE1MjQ3ZmVmOWFiYjg3NWQzNTk2Y2EzY2FjMmE2MTgxOQ==
+    ZTM5NzNkMzVmMDVjY2U5ZjUzNTU1ZGEzY2RmZjRlMTg1Yzc0MGMyMA==
   data.tar.gz: !binary |-
-    ZTQ2NDEwYjc3NTI3ZGUyOWNhOTJmZTFiMzRjZDU2ZDQwODM5ZDUxNw==
+    M2E1ODE5YTMyNTI4NGZiOWJkMmQyNjlhN2M2YzFkNTg0ZTUxNjI5Mw==
 SHA512:
   metadata.gz: !binary |-
-    Yzg1OWRjNzQ2ZDA3ZjAxYWI0YzQ3NWUxOWYyMjIyM2MyYTAwZjU0MDVlMjc0
-    M2JlYWJmMzk0MWNkNjVkNmM5Nzc2N2I0NTg1ZmMxMDllMTA5NmZlYzJjYmFm
-    ODE3NWI0NjUxOGRkNTM5ODQ4NWI2ODQ5OTBjYTY2YzEzMzA3NjQ=
+    MDk4MjQ5ODcwODMxODdhZGFlMjcxNGVhZWU3ODY1Yjk4MzIyYmQ3MzliNjg0
+    OGFiZmIxNzFjMzdiY2U2NmFhNjk1ZjdkNmEzYjBjYTU5NmJiZTMzNzIzYTkz
+    MDk4YjIzZTIzYTU1YzRhY2M1ZGNiMDg3MDA5NGY5M2NhNjVjMDI=
   data.tar.gz: !binary |-
-    NTIwMzVkNjJmZWI1MDZkYmI0NjZkZGQ0MTg1OTZmOTdhNjE2MDFmZmZkYmJm
-    YTJkZWVmNzI1MGI2ZjNjNzI5MjlhODE1MDdlYTEyMTVhMzZhMGZiOTgwZDE1
-    MmY5Y2Q4OTgxNjc3YTM1MDVmMTVjNzhiMjM5N2IzM2QyZWZjNWY=
+    MGFjNWNlNjNiZTU4NGFkMWQ4Mjg0Mzk2MDk2YzU0N2RiOThhMDJhMWM1NGZj
+    NTk4Mjg0OGUyNmRkZjAyMzhjNWI4NTMxM2UwMzkxNmRkYjY4ZjFlYWZkNDVm
+    NWVmNDk5ZGNjNmRlMjU3ZTg4Y2Q0NmJlNzNiMTNjYzE5M2FlYjc=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUky9uAAoJECrHRaUKISqMxpsIAKNq+qK6wOluW76EdNew0+h9
-mHT6NVpAcDacgTy64vLxIh5bpYsOv+AW2n9c/MeBkdfXrfy54qrdm+FPocPwJ6Ta
-wKel1K9KeQwRcSs6E1P0DNw9k2Tit9ZwXVJqzT2u65U3GytgPK2yGI4hMtDKFuNA
-WvAumMdL0ffqZwr6uEqjrSnpyhkSKn2TakOIA73YyzjiRVKQRO7XpukgK19cDTF8
-5oQNdDtG2EEWspCIa5K46/J/RCvsEw3QUmEyPUBlIRRx+Nd+/G2HmUbIcxvfCwoS
-2PAvFQgync6o6r6yz+e5ge6EJ1htq1LzQDtgHv0xfGQzE3znlsoVzWoBz2JrPkY=
-=h7Sh
+iQEcBAABAgAGBQJUp9G8AAoJECrHRaUKISqMsKIIAK04etL677P2FYEF5gYnQnjW
+EDaCIBkIL7a7jVzgtN4GJz0XQjzqd29KbY0k0vqxu8uKr90sQZ2I+AFUu6oadeAd
+CS4Bt0K56HaonUJxFmJUETPKG2wQxwr6zCd4Cv7y+NlEw7EEz1kmMDF62kpcvkyw
+6iFapdKLVBjTIVrkrZOilHwDHM+xNkY3GPPVoGB2BRRrFnKxQBV8lFYDybVs6NdK
+CyUsyVz3VuVskJ7ChG9fgxN49t0KM8gG8mFos6FmZAzTgE7KAAOvUymlG7yoff5g
+yhxvm3O7cqJGKog3TYq33kRcB6ydsOnrcEMuxS8bnk6B9AvArmVjwo1yclY63/Q=
+=TOTC
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUky9uAAoJECrHRaUKISqMmBwH/A6W2oG4Zc1K9Jj81OoHTGxl
-60yCeMsvUYq9BZZoc0N44hMhjgUHV5YxxXOvHghSPQiheo9DZ/169luk5jSdO1WS
-dqAwN7rbLFieqhSlJuNa9T30USZE/WWv4T808LxLVaaIEeeS+tBtn4J4qfMxhEiY
-iqoTLhr81IWtMcQJN7B6zlaL3ITkleBMGX44Prf5o/U+6GeJr1Z7ZbpNIoI2XBCR
-CM4JYGuJRR38UaSyVdn9ufaWkgrvn7FH0Wbri+Yq4PC98zQmoR2Bb3mGWBWpbAcR
-J1hEQVev7kp/Sd8p4EhPlzH9KLf0lvPv11Pz1plo7y6pntbUdnTHIDNdQyit0oI=
-=2Wxk
+iQEcBAABAgAGBQJUp9G8AAoJECrHRaUKISqMeSsH/0+4/GSy1Sttbr0Vd+s0Ycdv
+7p91uBirdy2bEhKkgUflRffXePE/ltSktANtRLUXVFYZqtcwHpf6f4ep2QDnzVHc
+c6U870xR0uLjuzYMfxkst2sLxbfPpHm0dLCELOoCRW4NPNRAUEqNO1dKVx6KygCu
+gG/CE9UzXMvVq6PSI/man6Yj6kYNSowqk7gw/ilqoRUb2IOY7BAatW73XJmkZlIW
+ZKRDiwVXsT5P4O0xxNWnAvuLZ3Xz2rsGFNqzv3ujPm0vzlGRV/daJyWaGVna4R/q
+45sgXXh4b1aM76WMtuFtLvOK3HFgoa5epL9DS75PjARXS0mAn7JmIZ18tJpi0Vs=
+=5sxS
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,10 @@
+Release 4.0.57
+--------------
+
+ * Fixed a native extension compatibility problem with Ruby 2.2. Closes [ruby-core:67152](https://bugs.ruby-lang.org/issues/10656).
+ * Fixed compatibility with Nginx 1.7.9. Closes GH-1335.
+
+
 Release 4.0.56
 --------------
 

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.56"
+	#define PASSENGER_VERSION "4.0.57"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/nginx/Configuration.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2013 Phusion
+ * Copyright (C) 2010-2015 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -236,17 +236,29 @@ passenger_create_loc_conf(ngx_conf_t *cf)
 
     conf->upstream_config.store = NGX_CONF_UNSET;
     conf->upstream_config.store_access = NGX_CONF_UNSET_UINT;
+    #if NGINX_VERSION_NUM >= 1007005
+        conf->upstream_config.next_upstream_tries = NGX_CONF_UNSET_UINT;
+    #endif
     conf->upstream_config.buffering = NGX_CONF_UNSET;
     conf->upstream_config.ignore_client_abort = NGX_CONF_UNSET;
+    #if NGINX_VERSION_NUM >= 1007007
+        conf->upstream_config.force_ranges = NGX_CONF_UNSET;
+    #endif
 
     conf->upstream_config.local = NGX_CONF_UNSET_PTR;
 
     conf->upstream_config.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream_config.send_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream_config.read_timeout = NGX_CONF_UNSET_MSEC;
+    #if NGINX_VERSION_NUM >= 1007005
+        conf->upstream_config.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
+    #endif
 
     conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE;
     conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE;
+    #if NGINX_VERSION_NUM >= 1007007
+        conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE;
+    #endif
 
     conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
     conf->upstream_config.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
@@ -256,7 +268,11 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
 
 #if (NGX_HTTP_CACHE)
-    conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
+    #if NGINX_VERSION_NUM >= 1007009
+        conf->upstream_config.cache = NGX_CONF_UNSET;
+    #else
+        conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
+    #endif
     conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT;
     conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
@@ -265,6 +281,12 @@ passenger_create_loc_conf(ngx_conf_t *cf)
         conf->upstream_config.cache_lock = NGX_CONF_UNSET;
         conf->upstream_config.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
     #endif
+    #if NGINX_VERSION_NUM >= 1007008
+        conf->upstream_config.cache_lock_age = NGX_CONF_UNSET_MSEC;
+    #endif
+    #if NGINX_VERSION_NUM >= 1006000
+        conf->upstream_config.cache_revalidate = NGX_CONF_UNSET;
+    #endif
 #endif
 
     conf->upstream_config.intercept_errors = NGX_CONF_UNSET;
@@ -369,25 +391,54 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     /******************************/
     /******************************/
 
-    if (conf->upstream_config.store != 0) {
-        ngx_conf_merge_value(conf->upstream_config.store,
-                                  prev->upstream_config.store, 0);
+    #if (NGX_HTTP_CACHE) && NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.store > 0) {
+            conf->upstream_config.cache = 0;
+        }
+        if (conf->upstream_config.cache > 0) {
+            conf->upstream_config.store = 0;
+        }
+    #endif
+
+    #if NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.store == NGX_CONF_UNSET) {
+            ngx_conf_merge_value(conf->upstream_config.store,
+                                      prev->upstream_config.store, 0);
 
-        if (conf->upstream_config.store_lengths == NULL) {
             conf->upstream_config.store_lengths = prev->upstream_config.store_lengths;
             conf->upstream_config.store_values = prev->upstream_config.store_values;
         }
-    }
+    #else
+        if (conf->upstream_config.store != 0) {
+            ngx_conf_merge_value(conf->upstream_config.store,
+                                      prev->upstream_config.store, 0);
+
+            if (conf->upstream_config.store_lengths == NULL) {
+                conf->upstream_config.store_lengths = prev->upstream_config.store_lengths;
+                conf->upstream_config.store_values = prev->upstream_config.store_values;
+            }
+        }
+    #endif
 
     ngx_conf_merge_uint_value(conf->upstream_config.store_access,
                               prev->upstream_config.store_access, 0600);
 
+    #if NGINX_VERSION_NUM >= 1007005
+        ngx_conf_merge_uint_value(conf->upstream_config.next_upstream_tries,
+                                  prev->upstream_config.next_upstream_tries, 0);
+    #endif
+
     ngx_conf_merge_value(conf->upstream_config.buffering,
                          prev->upstream_config.buffering, 0);
 
     ngx_conf_merge_value(conf->upstream_config.ignore_client_abort,
                          prev->upstream_config.ignore_client_abort, 0);
 
+    #if NGINX_VERSION_NUM >= 1007007
+        ngx_conf_merge_value(conf->upstream_config.force_ranges,
+                             prev->upstream_config.force_ranges, 0);
+    #endif
+
     ngx_conf_merge_ptr_value(conf->upstream_config.local,
                              prev->upstream_config.local, NULL);
 
@@ -400,6 +451,11 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->upstream_config.read_timeout,
                               prev->upstream_config.read_timeout, 12000000);
 
+    #if NGINX_VERSION_NUM >= 1007005
+        ngx_conf_merge_msec_value(conf->upstream_config.next_upstream_timeout,
+                                  prev->upstream_config.next_upstream_timeout, 0);
+    #endif
+
     ngx_conf_merge_size_value(conf->upstream_config.send_lowat,
                               prev->upstream_config.send_lowat, 0);
 
@@ -407,6 +463,11 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.buffer_size,
                               16 * 1024);
 
+    #if NGINX_VERSION_NUM >= 1007007
+        ngx_conf_merge_size_value(conf->upstream_config.limit_rate,
+                                  prev->upstream_config.limit_rate, 0);
+    #endif
+
 
     ngx_conf_merge_bufs_value(conf->upstream_config.bufs, prev->upstream_config.bufs,
                               8, 16 * 1024);
@@ -521,20 +582,42 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_HTTP_CACHE)
 
-    ngx_conf_merge_ptr_value(conf->upstream_config.cache,
-                             prev->upstream_config.cache, NULL);
+    #if NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.cache == NGX_CONF_UNSET) {
+           ngx_conf_merge_value(conf->upstream_config.cache,
+                                prev->upstream_config.cache, 0);
 
-    if (conf->upstream_config.cache && conf->upstream_config.cache->data == NULL) {
-        ngx_shm_zone_t  *shm_zone;
+           conf->upstream_config.cache_zone = prev->upstream_config.cache_zone;
+           conf->upstream_config.cache_value = prev->upstream_config.cache_value;
+        }
 
-        shm_zone = conf->upstream_config.cache;
+        if (conf->upstream_config.cache_zone && conf->upstream_config.cache_zone->data == NULL) {
+            ngx_shm_zone_t  *shm_zone;
 
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"scgi_cache\" zone \"%V\" is unknown",
-                           &shm_zone->shm.name);
+            shm_zone = conf->upstream_config.cache_zone;
 
-        return NGX_CONF_ERROR;
-    }
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "\"scgi_cache\" zone \"%V\" is unknown",
+                               &shm_zone->shm.name);
+
+            return NGX_CONF_ERROR;
+        }
+    #else
+        ngx_conf_merge_ptr_value(conf->upstream_config.cache,
+                                 prev->upstream_config.cache, NULL);
+
+        if (conf->upstream_config.cache && conf->upstream_config.cache->data == NULL) {
+            ngx_shm_zone_t  *shm_zone;
+
+            shm_zone = conf->upstream_config.cache;
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "\"scgi_cache\" zone \"%V\" is unknown",
+                               &shm_zone->shm.name);
+
+            return NGX_CONF_ERROR;
+        }
+    #endif
 
     ngx_conf_merge_uint_value(conf->upstream_config.cache_min_uses,
                               prev->upstream_config.cache_min_uses, 1);
@@ -580,6 +663,16 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.cache_lock_timeout, 5000);
     #endif
 
+    #if NGINX_VERSION_NUM >= 1007008
+        ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_age,
+                                  prev->upstream_config.cache_lock_age, 5000);
+    #endif
+
+    #if NGINX_VERSION_NUM >= 1006000
+        ngx_conf_merge_value(conf->upstream_config.cache_revalidate,
+                             prev->upstream_config.cache_revalidate, 0);
+    #endif
+
 #endif
 
     ngx_conf_merge_value(conf->upstream_config.pass_request_headers,

data/ext/ruby/extconf.rb

@@ -21,9 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 require 'mkmf'
-$LIBS = ""
+
+$LIBS << " -lpthread" if $LIBS !~ /-lpthread/
 $CFLAGS << " -g"
-$LIBS << " -lpthread"
 
 if RUBY_PLATFORM =~ /solaris/
 	have_library('xnet')
@@ -39,8 +39,8 @@ have_header('ruby/version.h')
 have_header('ruby/io.h')
 have_header('ruby/thread.h')
 have_var('ruby_version')
-have_func('rb_thread_io_blocking_region')
-have_func('rb_thread_call_without_gvl')
+have_func('rb_thread_io_blocking_region', 'ruby/io.h')
+have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')
@@ -64,3 +64,4 @@ with_cflags($CFLAGS) do
 		end
 	end
 end
+

data/lib/phusion_passenger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,7 +30,7 @@ module PhusionPassenger
 
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.56'
+	VERSION_STRING = '4.0.57'
 
 	PREFERRED_NGINX_VERSION = '1.6.2'
 	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.56
+  version: 4.0.57
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUky9uAAoJECrHRaUKISqM+C8H/jP/fTfjlMp/SgNU7JkqTAXS
-2KxHSwVfDlRukzy9UIqDXxiLVdA9CaYjEWgya8I/PVw1OqiRzQtcwZuOk9CPbgzD
-lzad81GwI5xpssU4YdR9mVpp1mfx3pUuMQXBvTJ0eQBo5EVb8cT3gu1KBLqIgy7r
-6LlcVOdAGA0ck4116p088Ml0qr+S/1nbF8dUdGEr70Mtx4yAXKIiKlBI7jMBiOCB
-tF8tgkow/oQvYON+RPu2H7eAY9kJKHSGJKbYQbfyeE06mHH0gtlBu5dZSkju2oJ1
-Rg7ph80agPROKL1RdK5JaRxWjQGUnIpUO4q9w1wGRZ/Q5jDCsMMaLggTkkryMtU=
-=qA8S
+iQEcBAABAgAGBQJUp9G7AAoJECrHRaUKISqMUc0IALm2PdpUqPGIZrrwwCw4C5Dr
+wEp2Lmv7NFnlf3lDMhDOU2pC7X4KgnAJN0YCWBdsf9h2vAB838GU7ScBgXIy2HkM
+3KSiwf3OPNijUeaVVdNkbn6gYbOkbeUvpZREiID9y25eYPc+XYrEpuITqRKhibSc
+glqRRa40ggee75+PmZoZhzUJZ3rvv1VJVfDMFCEv57saDLtcouEuLEOWqh8YyDIz
+2G1+3B5T8JmbzlhcVLGAOd6dGm+MOIMlhxwyoCKWq1NjTe8bBZGWzmkROEf4pSZD
+5gk98+XlgYJe6KhtpVUjEQqmKpJuY/6/mkNYOfdWE09bLk1gu8FsgzXUMipUmK8=
+=NQRN
 -----END PGP SIGNATURE-----