Permalink
Browse files

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
  • Loading branch information...
2 parents 2f7aafe + 142c40f commit 77010bf9bf45c46d844b336c18cc8102cfc7e249 @LawnGnome LawnGnome committed Jan 16, 2013
Showing with 4 additions and 1 deletion.
  1. +3 −0 NEWS
  2. +1 −1 sapi/fpm/fpm/fpm_sockets.h
View
3 NEWS
@@ -29,6 +29,9 @@ PHP NEWS
. Added DateTimeImmutable - a variant of DateTime that only returns the
modified state instead of changing itself. (Derick)
+- FPM:
+ . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)
+
- pgsql:
. Bug #46408: Locale number format settings can cause pg_query_params to
break with numerics. (asmecher, Lars)
@@ -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) /* {{{ */

0 comments on commit 77010bf

Please sign in to comment.