passenger 5.0.26 → 5.0.27
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of passenger might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG +17 -0
- data/CONTRIBUTORS +1 -0
- data/build/cxx_dependency_map.rb +113 -157
- data/build/cxx_tests.rb +8 -1
- data/src/agent/Core/ApplicationPool/TestSession.h +5 -1
- data/src/agent/Core/Controller/CheckoutSession.cpp +1 -1
- data/src/agent/Core/Controller/ForwardResponse.cpp +9 -0
- data/src/agent/Core/Controller/InternalUtils.cpp +9 -1
- data/src/agent/Core/Controller/SendRequest.cpp +13 -7
- data/src/agent/Core/Controller/StateInspectionAndConfiguration.cpp +3 -2
- data/src/agent/Core/CoreMain.cpp +3 -0
- data/src/agent/Core/SpawningKit/SmartSpawner.h +1 -1
- data/src/agent/Core/SpawningKit/Spawner.h +2 -2
- data/src/agent/Core/UnionStation/StopwatchLog.h +3 -4
- data/src/agent/Shared/Base.cpp +32 -0
- data/src/agent/Shared/Base.h +2 -0
- data/src/agent/UstRouter/UstRouterMain.cpp +3 -0
- data/src/agent/Watchdog/AgentWatcher.cpp +1 -3
- data/src/agent/Watchdog/WatchdogMain.cpp +31 -6
- data/src/apache2_module/Hooks.cpp +2 -2
- data/src/cxx_supportlib/BackgroundEventLoop.cpp +12 -2
- data/src/cxx_supportlib/Constants.h +1 -1
- data/src/cxx_supportlib/DataStructures/LString.cpp +39 -0
- data/src/cxx_supportlib/DataStructures/LString.h +35 -6
- data/src/cxx_supportlib/FileDescriptor.h +3 -1
- data/src/cxx_supportlib/Integrations/LibevJsonUtils.h +92 -0
- data/src/cxx_supportlib/ResourceLocator.h +10 -8
- data/src/cxx_supportlib/ServerKit/CookieUtils.h +4 -0
- data/src/cxx_supportlib/ServerKit/FileBufferedChannel.h +2 -0
- data/src/cxx_supportlib/ServerKit/HttpServer.h +6 -2
- data/src/cxx_supportlib/Utils.cpp +4 -5
- data/src/cxx_supportlib/Utils.h +2 -2
- data/src/cxx_supportlib/Utils/IOUtils.cpp +1 -1
- data/src/cxx_supportlib/Utils/JsonUtils.h +12 -10
- data/src/cxx_supportlib/Utils/MessagePassing.h +4 -4
- data/src/cxx_supportlib/Utils/StrIntUtils.cpp +7 -3
- data/src/cxx_supportlib/Utils/SystemTime.cpp +15 -4
- data/src/cxx_supportlib/Utils/SystemTime.h +228 -54
- data/src/cxx_supportlib/Utils/Timer.h +14 -41
- data/src/cxx_supportlib/WatchdogLauncher.h +1 -1
- data/src/cxx_supportlib/vendor-copy/libuv/Makefile.in +198 -59
- data/src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/output.0 +15477 -0
- data/src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/output.1 +15477 -0
- data/src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/requests +324 -0
- data/src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/traces.0 +3105 -0
- data/src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/traces.1 +703 -0
- data/src/cxx_supportlib/vendor-copy/libuv/configure +115 -12
- data/src/cxx_supportlib/vendor-copy/libuv/ltmain.sh +15 -8
- data/src/cxx_supportlib/vendor-copy/libuv/m4/ltversion.m4 +5 -5
- data/src/cxx_supportlib/vendor-modified/psg_sysqueue.h +1 -0
- data/src/nginx_module/ngx_http_passenger_module.c +1 -1
- data/src/nodejs_supportlib/phusion_passenger/ustreporter.js +1 -1
- data/src/ruby_native_extension/passenger_native_support.c +1 -1
- data/src/ruby_supportlib/phusion_passenger.rb +15 -1
- data/src/ruby_supportlib/phusion_passenger/common_library.rb +4 -0
- data/src/ruby_supportlib/phusion_passenger/packaging.rb +1 -0
- data/src/ruby_supportlib/phusion_passenger/ruby_core_io_enhancements.rb +5 -20
- metadata +9 -2
@@ -1,6 +1,6 @@
|
|
1
1
|
#! /bin/sh
|
2
2
|
# Guess values for system-dependent variables and create Makefiles.
|
3
|
-
# Generated by GNU Autoconf 2.69 for libuv 1.
|
3
|
+
# Generated by GNU Autoconf 2.69 for libuv 1.8.0.
|
4
4
|
#
|
5
5
|
# Report bugs to <https://github.com/libuv/libuv/issues>.
|
6
6
|
#
|
@@ -587,8 +587,8 @@ MAKEFLAGS=
|
|
587
587
|
# Identity of this package.
|
588
588
|
PACKAGE_NAME='libuv'
|
589
589
|
PACKAGE_TARNAME='libuv'
|
590
|
-
PACKAGE_VERSION='1.
|
591
|
-
PACKAGE_STRING='libuv 1.
|
590
|
+
PACKAGE_VERSION='1.8.0'
|
591
|
+
PACKAGE_STRING='libuv 1.8.0'
|
592
592
|
PACKAGE_BUGREPORT='https://github.com/libuv/libuv/issues'
|
593
593
|
PACKAGE_URL=''
|
594
594
|
|
@@ -1333,7 +1333,7 @@ if test "$ac_init_help" = "long"; then
|
|
1333
1333
|
# Omit some internal or obsolete options to make the list less imposing.
|
1334
1334
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
1335
1335
|
cat <<_ACEOF
|
1336
|
-
\`configure' configures libuv 1.
|
1336
|
+
\`configure' configures libuv 1.8.0 to adapt to many kinds of systems.
|
1337
1337
|
|
1338
1338
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
1339
1339
|
|
@@ -1403,7 +1403,7 @@ fi
|
|
1403
1403
|
|
1404
1404
|
if test -n "$ac_init_help"; then
|
1405
1405
|
case $ac_init_help in
|
1406
|
-
short | recursive ) echo "Configuration of libuv 1.
|
1406
|
+
short | recursive ) echo "Configuration of libuv 1.8.0:";;
|
1407
1407
|
esac
|
1408
1408
|
cat <<\_ACEOF
|
1409
1409
|
|
@@ -1514,7 +1514,7 @@ fi
|
|
1514
1514
|
test -n "$ac_init_help" && exit $ac_status
|
1515
1515
|
if $ac_init_version; then
|
1516
1516
|
cat <<\_ACEOF
|
1517
|
-
libuv configure 1.
|
1517
|
+
libuv configure 1.8.0
|
1518
1518
|
generated by GNU Autoconf 2.69
|
1519
1519
|
|
1520
1520
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
@@ -1788,11 +1788,102 @@ $as_echo "$ac_res" >&6; }
|
|
1788
1788
|
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
1789
1789
|
|
1790
1790
|
} # ac_fn_c_check_func
|
1791
|
+
|
1792
|
+
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
1793
|
+
# -------------------------------------------------------
|
1794
|
+
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
1795
|
+
# the include files in INCLUDES and setting the cache variable VAR
|
1796
|
+
# accordingly.
|
1797
|
+
ac_fn_c_check_header_mongrel ()
|
1798
|
+
{
|
1799
|
+
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
1800
|
+
if eval \${$3+:} false; then :
|
1801
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
1802
|
+
$as_echo_n "checking for $2... " >&6; }
|
1803
|
+
if eval \${$3+:} false; then :
|
1804
|
+
$as_echo_n "(cached) " >&6
|
1805
|
+
fi
|
1806
|
+
eval ac_res=\$$3
|
1807
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
1808
|
+
$as_echo "$ac_res" >&6; }
|
1809
|
+
else
|
1810
|
+
# Is the header compilable?
|
1811
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
1812
|
+
$as_echo_n "checking $2 usability... " >&6; }
|
1813
|
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
1814
|
+
/* end confdefs.h. */
|
1815
|
+
$4
|
1816
|
+
#include <$2>
|
1817
|
+
_ACEOF
|
1818
|
+
if ac_fn_c_try_compile "$LINENO"; then :
|
1819
|
+
ac_header_compiler=yes
|
1820
|
+
else
|
1821
|
+
ac_header_compiler=no
|
1822
|
+
fi
|
1823
|
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
1824
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
1825
|
+
$as_echo "$ac_header_compiler" >&6; }
|
1826
|
+
|
1827
|
+
# Is the header present?
|
1828
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
1829
|
+
$as_echo_n "checking $2 presence... " >&6; }
|
1830
|
+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
1831
|
+
/* end confdefs.h. */
|
1832
|
+
#include <$2>
|
1833
|
+
_ACEOF
|
1834
|
+
if ac_fn_c_try_cpp "$LINENO"; then :
|
1835
|
+
ac_header_preproc=yes
|
1836
|
+
else
|
1837
|
+
ac_header_preproc=no
|
1838
|
+
fi
|
1839
|
+
rm -f conftest.err conftest.i conftest.$ac_ext
|
1840
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
1841
|
+
$as_echo "$ac_header_preproc" >&6; }
|
1842
|
+
|
1843
|
+
# So? What about this header?
|
1844
|
+
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
1845
|
+
yes:no: )
|
1846
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
1847
|
+
$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
1848
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
1849
|
+
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
1850
|
+
;;
|
1851
|
+
no:yes:* )
|
1852
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
1853
|
+
$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
1854
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
1855
|
+
$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
1856
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
1857
|
+
$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
1858
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
1859
|
+
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
1860
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
1861
|
+
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
1862
|
+
( $as_echo "## ---------------------------------------------------- ##
|
1863
|
+
## Report this to https://github.com/libuv/libuv/issues ##
|
1864
|
+
## ---------------------------------------------------- ##"
|
1865
|
+
) | sed "s/^/$as_me: WARNING: /" >&2
|
1866
|
+
;;
|
1867
|
+
esac
|
1868
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
1869
|
+
$as_echo_n "checking for $2... " >&6; }
|
1870
|
+
if eval \${$3+:} false; then :
|
1871
|
+
$as_echo_n "(cached) " >&6
|
1872
|
+
else
|
1873
|
+
eval "$3=\$ac_header_compiler"
|
1874
|
+
fi
|
1875
|
+
eval ac_res=\$$3
|
1876
|
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
1877
|
+
$as_echo "$ac_res" >&6; }
|
1878
|
+
fi
|
1879
|
+
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
1880
|
+
|
1881
|
+
} # ac_fn_c_check_header_mongrel
|
1791
1882
|
cat >config.log <<_ACEOF
|
1792
1883
|
This file contains any messages produced by compilers while
|
1793
1884
|
running configure, to aid debugging if configure makes a mistake.
|
1794
1885
|
|
1795
|
-
It was created by libuv $as_me 1.
|
1886
|
+
It was created by libuv $as_me 1.8.0, which was
|
1796
1887
|
generated by GNU Autoconf 2.69. Invocation command line was
|
1797
1888
|
|
1798
1889
|
$ $0 $@
|
@@ -2719,7 +2810,7 @@ fi
|
|
2719
2810
|
|
2720
2811
|
# Define the identity of the package.
|
2721
2812
|
PACKAGE='libuv'
|
2722
|
-
VERSION='1.
|
2813
|
+
VERSION='1.8.0'
|
2723
2814
|
|
2724
2815
|
|
2725
2816
|
cat >>confdefs.h <<_ACEOF
|
@@ -4475,8 +4566,8 @@ esac
|
|
4475
4566
|
|
4476
4567
|
|
4477
4568
|
|
4478
|
-
macro_version='2.4.
|
4479
|
-
macro_revision='2.4.
|
4569
|
+
macro_version='2.4.6'
|
4570
|
+
macro_revision='2.4.6'
|
4480
4571
|
|
4481
4572
|
|
4482
4573
|
|
@@ -13153,6 +13244,18 @@ else
|
|
13153
13244
|
WINNT_FALSE=
|
13154
13245
|
fi
|
13155
13246
|
|
13247
|
+
for ac_header in sys/ahafs_evProds.h
|
13248
|
+
do :
|
13249
|
+
ac_fn_c_check_header_mongrel "$LINENO" "sys/ahafs_evProds.h" "ac_cv_header_sys_ahafs_evProds_h" "$ac_includes_default"
|
13250
|
+
if test "x$ac_cv_header_sys_ahafs_evProds_h" = xyes; then :
|
13251
|
+
cat >>confdefs.h <<_ACEOF
|
13252
|
+
#define HAVE_SYS_AHAFS_EVPRODS_H 1
|
13253
|
+
_ACEOF
|
13254
|
+
|
13255
|
+
fi
|
13256
|
+
|
13257
|
+
done
|
13258
|
+
|
13156
13259
|
# Extract the first word of "pkg-config", so it can be a program name with args.
|
13157
13260
|
set dummy pkg-config; ac_word=$2
|
13158
13261
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
@@ -13813,7 +13916,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
13813
13916
|
# report actual input values of CONFIG_FILES etc. instead of their
|
13814
13917
|
# values after options handling.
|
13815
13918
|
ac_log="
|
13816
|
-
This file was extended by libuv $as_me 1.
|
13919
|
+
This file was extended by libuv $as_me 1.8.0, which was
|
13817
13920
|
generated by GNU Autoconf 2.69. Invocation command line was
|
13818
13921
|
|
13819
13922
|
CONFIG_FILES = $CONFIG_FILES
|
@@ -13870,7 +13973,7 @@ _ACEOF
|
|
13870
13973
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
13871
13974
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
13872
13975
|
ac_cs_version="\\
|
13873
|
-
libuv config.status 1.
|
13976
|
+
libuv config.status 1.8.0
|
13874
13977
|
configured by $0, generated by GNU Autoconf 2.69,
|
13875
13978
|
with options \\"\$ac_cs_config\\"
|
13876
13979
|
|
@@ -2,7 +2,7 @@
|
|
2
2
|
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
|
3
3
|
## by inline-source v2014-01-03.01
|
4
4
|
|
5
|
-
# libtool (GNU libtool) 2.4.
|
5
|
+
# libtool (GNU libtool) 2.4.6
|
6
6
|
# Provide generalized library-building support services.
|
7
7
|
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
8
8
|
|
@@ -31,8 +31,8 @@
|
|
31
31
|
|
32
32
|
PROGRAM=libtool
|
33
33
|
PACKAGE=libtool
|
34
|
-
VERSION=2.4.
|
35
|
-
package_revision=2.4.
|
34
|
+
VERSION=2.4.6
|
35
|
+
package_revision=2.4.6
|
36
36
|
|
37
37
|
|
38
38
|
## ------ ##
|
@@ -64,7 +64,7 @@ package_revision=2.4.5
|
|
64
64
|
# libraries, which are installed to $pkgauxdir.
|
65
65
|
|
66
66
|
# Set a version string for this script.
|
67
|
-
scriptversion=
|
67
|
+
scriptversion=2015-01-20.17; # UTC
|
68
68
|
|
69
69
|
# General shell script boiler plate, and helper functions.
|
70
70
|
# Written by Gary V. Vaughan, 2004
|
@@ -192,7 +192,7 @@ func_path_progs ()
|
|
192
192
|
|
193
193
|
_G_path_prog_max=0
|
194
194
|
_G_path_prog_found=false
|
195
|
-
_G_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
195
|
+
_G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
|
196
196
|
for _G_dir in $_G_PATH; do
|
197
197
|
IFS=$_G_save_IFS
|
198
198
|
test -z "$_G_dir" && _G_dir=.
|
@@ -1977,7 +1977,7 @@ func_version ()
|
|
1977
1977
|
# End:
|
1978
1978
|
|
1979
1979
|
# Set a version string.
|
1980
|
-
scriptversion='(GNU libtool) 2.4.
|
1980
|
+
scriptversion='(GNU libtool) 2.4.6'
|
1981
1981
|
|
1982
1982
|
|
1983
1983
|
# func_echo ARG...
|
@@ -2039,7 +2039,12 @@ usage_message="Options:
|
|
2039
2039
|
"
|
2040
2040
|
|
2041
2041
|
# Additional text appended to 'usage_message' in response to '--help'.
|
2042
|
-
|
2042
|
+
func_help ()
|
2043
|
+
{
|
2044
|
+
$debug_cmd
|
2045
|
+
|
2046
|
+
func_usage_message
|
2047
|
+
$ECHO "$long_help_message
|
2043
2048
|
|
2044
2049
|
MODE must be one of the following:
|
2045
2050
|
|
@@ -2063,13 +2068,15 @@ include the following information:
|
|
2063
2068
|
compiler: $LTCC
|
2064
2069
|
compiler flags: $LTCFLAGS
|
2065
2070
|
linker: $LD (gnu? $with_gnu_ld)
|
2066
|
-
version: $progname (GNU libtool) 2.4.
|
2071
|
+
version: $progname (GNU libtool) 2.4.6
|
2067
2072
|
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
2068
2073
|
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
2069
2074
|
|
2070
2075
|
Report bugs to <bug-libtool@gnu.org>.
|
2071
2076
|
GNU libtool home page: <http://www.gnu.org/software/libtool/>.
|
2072
2077
|
General help using GNU software: <http://www.gnu.org/gethelp/>."
|
2078
|
+
exit 0
|
2079
|
+
}
|
2073
2080
|
|
2074
2081
|
|
2075
2082
|
# func_lo2o OBJECT-NAME
|
@@ -9,15 +9,15 @@
|
|
9
9
|
|
10
10
|
# @configure_input@
|
11
11
|
|
12
|
-
# serial
|
12
|
+
# serial 4179 ltversion.m4
|
13
13
|
# This file is part of GNU Libtool
|
14
14
|
|
15
|
-
m4_define([LT_PACKAGE_VERSION], [2.4.
|
16
|
-
m4_define([LT_PACKAGE_REVISION], [2.4.
|
15
|
+
m4_define([LT_PACKAGE_VERSION], [2.4.6])
|
16
|
+
m4_define([LT_PACKAGE_REVISION], [2.4.6])
|
17
17
|
|
18
18
|
AC_DEFUN([LTVERSION_VERSION],
|
19
|
-
[macro_version='2.4.
|
20
|
-
macro_revision='2.4.
|
19
|
+
[macro_version='2.4.6'
|
20
|
+
macro_revision='2.4.6'
|
21
21
|
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
22
22
|
_LT_DECL(, macro_revision, 0)
|
23
23
|
])
|
@@ -150,7 +150,7 @@ starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
|
|
150
150
|
log_file = fopen(log_filename, "a");
|
151
151
|
if (log_file == NULL) {
|
152
152
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
|
153
|
-
"could not open the passenger log file for writing,
|
153
|
+
"could not open the passenger log file for writing during Nginx startup, some log lines might be lost (will retry from Passenger core)");
|
154
154
|
}
|
155
155
|
}
|
156
156
|
|
@@ -59,7 +59,7 @@ exports.getApplicationRoot = function() {
|
|
59
59
|
*/
|
60
60
|
exports.nowTimestamp = function() {
|
61
61
|
var secAndUsec = process.hrtime();
|
62
|
-
return (secAndUsec[0] * 1e6) + (secAndUsec[1] / 1e3);
|
62
|
+
return Math.round((secAndUsec[0] * 1e6) + (secAndUsec[1] / 1e3));
|
63
63
|
}
|
64
64
|
|
65
65
|
/**
|
@@ -62,7 +62,7 @@
|
|
62
62
|
#ifdef HAVE_ALLOCA_H
|
63
63
|
#include <alloca.h>
|
64
64
|
#endif
|
65
|
-
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
65
|
+
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
66
66
|
#define HAVE_KQUEUE
|
67
67
|
#include <sys/event.h>
|
68
68
|
#include <sys/time.h>
|
@@ -31,7 +31,7 @@ module PhusionPassenger
|
|
31
31
|
|
32
32
|
PACKAGE_NAME = 'passenger'
|
33
33
|
# Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
|
34
|
-
VERSION_STRING = '5.0.
|
34
|
+
VERSION_STRING = '5.0.27'
|
35
35
|
|
36
36
|
PREFERRED_NGINX_VERSION = '1.8.1'
|
37
37
|
NGINX_SHA256_CHECKSUM = '8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7'
|
@@ -235,6 +235,20 @@ module PhusionPassenger
|
|
235
235
|
require("#{ruby_libdir}/phusion_passenger/#{name}")
|
236
236
|
end
|
237
237
|
|
238
|
+
# Forward define public_api.rb methods for code that tries to hook
|
239
|
+
# Passenger events before an app is spawned (such as mongoid)
|
240
|
+
def on_event(name, &block)
|
241
|
+
# The definition in `public_api.rb` will override this implementation when
|
242
|
+
# a Ruby application is spawned.
|
243
|
+
nil
|
244
|
+
end
|
245
|
+
|
246
|
+
def call_event(name, *args)
|
247
|
+
# The definition in `public_api.rb` will override this implementation when
|
248
|
+
# a Ruby application is spawned.
|
249
|
+
nil
|
250
|
+
end
|
251
|
+
|
238
252
|
|
239
253
|
private
|
240
254
|
def self.infer_install_spec
|
@@ -153,6 +153,7 @@ private
|
|
153
153
|
:include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
|
154
154
|
:flags => [
|
155
155
|
LIBEV_CFLAGS,
|
156
|
+
LIBUV_CFLAGS,
|
156
157
|
optimize,
|
157
158
|
extra_compiler_flags
|
158
159
|
]
|
@@ -314,6 +315,9 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
|
|
314
315
|
:source => 'ServerKit/Implementation.cpp',
|
315
316
|
:category => :other,
|
316
317
|
:optimize => true
|
318
|
+
define_component 'DataStructures/LString.o',
|
319
|
+
:source => 'DataStructures/LString.cpp',
|
320
|
+
:category => :other
|
317
321
|
|
318
322
|
define_component 'Utils/Hasher.o',
|
319
323
|
:source => 'Utils/Hasher.cpp',
|
@@ -61,32 +61,17 @@ class IO
|
|
61
61
|
end
|
62
62
|
else
|
63
63
|
def writev(components)
|
64
|
-
return write(components.
|
64
|
+
return write(components.pack('a*' * components.size))
|
65
65
|
end
|
66
66
|
|
67
67
|
def writev2(components, components2)
|
68
|
-
|
69
|
-
|
70
|
-
data << component
|
71
|
-
end
|
72
|
-
components2.each do |component|
|
73
|
-
data << component
|
74
|
-
end
|
75
|
-
return write(data)
|
68
|
+
joined = components + components2
|
69
|
+
return write(joined.pack('a*' * joined.size))
|
76
70
|
end
|
77
71
|
|
78
72
|
def writev3(components, components2, components3)
|
79
|
-
|
80
|
-
|
81
|
-
data << component
|
82
|
-
end
|
83
|
-
components2.each do |component|
|
84
|
-
data << component
|
85
|
-
end
|
86
|
-
components3.each do |component|
|
87
|
-
data << component
|
88
|
-
end
|
89
|
-
return write(data)
|
73
|
+
joined = components + components2 + components3
|
74
|
+
return write(joined.pack('a*' * joined.size))
|
90
75
|
end
|
91
76
|
end
|
92
77
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: passenger
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.0.
|
4
|
+
version: 5.0.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Phusion - http://www.phusion.nl/
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-04-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -396,6 +396,7 @@ files:
|
|
396
396
|
- src/cxx_supportlib/Constants.h
|
397
397
|
- src/cxx_supportlib/Constants.h.erb
|
398
398
|
- src/cxx_supportlib/DataStructures/HashedStaticString.h
|
399
|
+
- src/cxx_supportlib/DataStructures/LString.cpp
|
399
400
|
- src/cxx_supportlib/DataStructures/LString.h
|
400
401
|
- src/cxx_supportlib/DataStructures/StringKeyTable.h
|
401
402
|
- src/cxx_supportlib/Exceptions.cpp
|
@@ -403,6 +404,7 @@ files:
|
|
403
404
|
- src/cxx_supportlib/FileDescriptor.h
|
404
405
|
- src/cxx_supportlib/Hooks.h
|
405
406
|
- src/cxx_supportlib/InstanceDirectory.h
|
407
|
+
- src/cxx_supportlib/Integrations/LibevJsonUtils.h
|
406
408
|
- src/cxx_supportlib/Logging.cpp
|
407
409
|
- src/cxx_supportlib/Logging.h
|
408
410
|
- src/cxx_supportlib/MemoryKit/mbuf.cpp
|
@@ -517,6 +519,11 @@ files:
|
|
517
519
|
- src/cxx_supportlib/vendor-copy/libuv/README.md
|
518
520
|
- src/cxx_supportlib/vendor-copy/libuv/aclocal.m4
|
519
521
|
- src/cxx_supportlib/vendor-copy/libuv/ar-lib
|
522
|
+
- src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/output.0
|
523
|
+
- src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/output.1
|
524
|
+
- src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/requests
|
525
|
+
- src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/traces.0
|
526
|
+
- src/cxx_supportlib/vendor-copy/libuv/autom4te.cache/traces.1
|
520
527
|
- src/cxx_supportlib/vendor-copy/libuv/checksparse.sh
|
521
528
|
- src/cxx_supportlib/vendor-copy/libuv/common.gypi
|
522
529
|
- src/cxx_supportlib/vendor-copy/libuv/compile
|