Skip to content

Commit f63a9f6

Browse files
committed
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).
1 parent c077074 commit f63a9f6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ PHP NEWS
2626
. Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV).
2727
(Laruence, Derick)
2828

29+
- FPM:
30+
. Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)
31+
2932
20 Dec 2012, PHP 5.3.20
3033

3134
- Zend Engine:

sapi/fpm/fpm/fpm_sockets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
2626
int fpm_sockets_init_main();
2727
int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq);
28-
int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen);
28+
int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen);
2929

3030

3131
static inline int fd_set_blocked(int fd, int blocked) /* {{{ */

0 commit comments

Comments
 (0)