From f63a9f6c11c05aa76158b6cae0e05340d303a6af Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 16 Jan 2013 10:06:56 +0800 Subject: [PATCH] Update the arguments in the prototype of fpm_socket_unix_test_connect(). Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11). --- NEWS | 3 +++ sapi/fpm/fpm/fpm_sockets.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e78af2339d..928d829d7a 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,9 @@ PHP NEWS . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV). (Laruence, Derick) +- FPM: + . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) + 20 Dec 2012, PHP 5.3.20 - Zend Engine: diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index 499ba6baf8..cce5712b8c 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -25,7 +25,7 @@ enum fpm_address_domain fpm_sockets_domain_from_address(char *addr); int fpm_sockets_init_main(); int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq); -int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen); +int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen); static inline int fd_set_blocked(int fd, int blocked) /* {{{ */ -- 2.49.0