diff options
| author | Adam Harvey <aharvey@php.net> | 2013-01-16 10:18:00 +0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-01-16 10:18:00 +0800 |
| commit | 142c40f32c075a8eb706f2e630b934f39e711b70 (patch) | |
| tree | b35c6a30e38d4b49b2758e44ef2608631b5f8c3a | |
| parent | 9498cf6194496a1dd6b400e3e9a85ff005dc3dcd (diff) | |
| parent | f63a9f6c11c05aa76158b6cae0e05340d303a6af (diff) | |
| download | php-git-142c40f32c075a8eb706f2e630b934f39e711b70.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_sockets.h | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -19,6 +19,9 @@ PHP NEWS . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. (Derick) +- FPM: + . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) + - Litespeed: . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) 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) /* {{{ */ |