diff options
| author | Adam Harvey <aharvey@php.net> | 2013-01-16 10:06:56 +0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-01-16 10:06:56 +0800 |
| commit | f63a9f6c11c05aa76158b6cae0e05340d303a6af (patch) | |
| tree | d7c9034fe2c2c2b0f5cf46724558e4d49d479023 | |
| parent | c077074c1379b5faed386106fdbb53f5d17fd6e7 (diff) | |
| download | php-git-f63a9f6c11c05aa76158b6cae0e05340d303a6af.tar.gz | |
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).
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_sockets.h | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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) /* {{{ */ |