Commit: cd176e045219373a10f32ed412092992cdbcc5b6 Author: Felipe Pena <felipe...@gmail.com> Wed, 26 Jun 2013 15:06:27 -0300 Parents: 7e33b5d2fa89a6bf167fc4061dcf6aedab1cc6b8 Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd176e045219373a10f32ed412092992cdbcc5b6 Log: - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de Bugs: https://bugs.php.net/63983 Changed paths: M sapi/fpm/fpm/fpm_sockets.c Diff: diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index f959cf3..145b255 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -405,7 +405,19 @@ int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq) zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket"); return -1; } +#if defined(__FreeBSD__) + 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 +430,7 @@ int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq) if (max_lq) { *max_lq = info.tcpi_sacked; } +#endif return 0; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
