Skip to content

Commit

Permalink
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Browse files Browse the repository at this point in the history
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
  • Loading branch information
LawnGnome committed Jan 16, 2013
1 parent c077074 commit f63a9f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_sockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) /* {{{ */
Expand Down

0 comments on commit f63a9f6

Please sign in to comment.