diff options
| -rw-r--r-- | lang/php53/distinfo | 3 | ||||
| -rw-r--r-- | lang/php53/patches/patch-sapi_fpm_fpm_fpm__sockets.c | 34 | ||||
| -rw-r--r-- | lang/php54/distinfo | 3 | ||||
| -rw-r--r-- | lang/php54/patches/patch-sapi_fpm_fpm_fpm__sockets.c (renamed from www/php-fpm/patches/patch-sapi_fpm_fpm_fpm__sockets.c) | 2 | ||||
| -rw-r--r-- | lang/php55/distinfo | 3 | ||||
| -rw-r--r-- | lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c | 13 |
6 files changed, 54 insertions, 4 deletions
diff --git a/lang/php53/distinfo b/lang/php53/distinfo index ceb57ba5abf..261ea6cfea7 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.78 2014/11/21 14:13:51 joerg Exp $ +$NetBSD: distinfo,v 1.79 2015/03/05 11:16:28 he Exp $ SHA1 (php-5.3.29.tar.bz2) = 6e9e492c6d5853d063ddb9a4dbef60b8e5d87444 RMD160 (php-5.3.29.tar.bz2) = e57beb4fdda41bca81b5856161bc97f3c5e3e9da @@ -30,4 +30,5 @@ SHA1 (patch-main_php.h) = 3f206a423a906932cb7f4662188580a9ce9fd79d SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4 SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 +SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 0cd3dce6dc6c46b67052d96b76e8b54b5e2fde0d SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 86137a37e74badf99c46d1ba7ca5d85f42bedfce diff --git a/lang/php53/patches/patch-sapi_fpm_fpm_fpm__sockets.c b/lang/php53/patches/patch-sapi_fpm_fpm_fpm__sockets.c new file mode 100644 index 00000000000..06fe4c3bef8 --- /dev/null +++ b/lang/php53/patches/patch-sapi_fpm_fpm_fpm__sockets.c @@ -0,0 +1,34 @@ +$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 11:16:28 he Exp $ + +Use the "right" fields in tcp_info struct for FreeBSD and NetBSD. + +--- sapi/fpm/fpm/fpm_sockets.c.orig 2014-08-13 19:22:50.000000000 +0000 ++++ sapi/fpm/fpm/fpm_sockets.c +@@ -406,6 +406,19 @@ int fpm_socket_get_listening_queue(int s + return -1; + } + ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ if (info.__tcpi_sacked == 0) { ++ return -1; ++ } ++ ++ if (cur_lq) { ++ *cur_lq = info.__tcpi_unacked; ++ } ++ ++ if (max_lq) { ++ *max_lq = info.__tcpi_sacked; ++ } ++#else + /* kernel >= 2.6.24 return non-zero here, that means operation is supported */ + if (info.tcpi_sacked == 0) { + return -1; +@@ -418,6 +431,7 @@ int fpm_socket_get_listening_queue(int s + if (max_lq) { + *max_lq = info.tcpi_sacked; + } ++#endif + + return 0; + } diff --git a/lang/php54/distinfo b/lang/php54/distinfo index d82873cc667..ae1b89349d1 100644 --- a/lang/php54/distinfo +++ b/lang/php54/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2015/02/19 09:37:36 taca Exp $ +$NetBSD: distinfo,v 1.54 2015/03/05 11:16:28 he Exp $ SHA1 (php-5.4.38.tar.bz2) = 863fcb872fe20d054d1a3444c27ec7f8be9f4317 RMD160 (php-5.4.38.tar.bz2) = 5cd4d7c80badd19aa7e1081e3fd190607e46e1af @@ -20,4 +20,5 @@ SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27 SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 +SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 diff --git a/www/php-fpm/patches/patch-sapi_fpm_fpm_fpm__sockets.c b/lang/php54/patches/patch-sapi_fpm_fpm_fpm__sockets.c index 84b8a4da555..b34f743c61f 100644 --- a/www/php-fpm/patches/patch-sapi_fpm_fpm_fpm__sockets.c +++ b/lang/php54/patches/patch-sapi_fpm_fpm_fpm__sockets.c @@ -1,4 +1,4 @@ -$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 09:20:47 he Exp $ +$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 11:16:28 he Exp $ --- ./sapi/fpm/fpm/fpm_sockets.c.orig 2014-09-17 07:03:27.000000000 +0000 +++ ./sapi/fpm/fpm/fpm_sockets.c diff --git a/lang/php55/distinfo b/lang/php55/distinfo index b733bdef5de..4d8a0c88416 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2015/02/19 13:35:24 taca Exp $ +$NetBSD: distinfo,v 1.36 2015/03/05 11:16:28 he Exp $ SHA1 (php-5.5.22.tar.bz2) = 76fcfc157855100e2bb09b22209e78e3088a4b11 RMD160 (php-5.5.22.tar.bz2) = 8849bc779dbb8687d83e2d50dd476d43900713d6 @@ -23,4 +23,5 @@ SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 +SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 diff --git a/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c b/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c new file mode 100644 index 00000000000..b34f743c61f --- /dev/null +++ b/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c @@ -0,0 +1,13 @@ +$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 11:16:28 he Exp $ + +--- ./sapi/fpm/fpm/fpm_sockets.c.orig 2014-09-17 07:03:27.000000000 +0000 ++++ ./sapi/fpm/fpm/fpm_sockets.c +@@ -405,7 +405,7 @@ int fpm_socket_get_listening_queue(int s + zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket"); + return -1; + } +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + if (info.__tcpi_sacked == 0) { + return -1; + } |