Commit:    5f224412fa6892645ca548ac75f20ff8743ed916
Author:    Rasmus Lerdorf <ras...@php.net>         Tue, 24 Jul 2012 16:28:49 
-0700
Parents:   54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=5f224412fa6892645ca548ac75f20ff8743ed916

Log:
Fix bug #62654

Bugs:
https://bugs.php.net/62654

Changed paths:
  M  sapi/fpm/fpm/fpm_sockets.c


Diff:
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dccc..f56b9cf 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int sock, unsigned 
*cur_lq, unsigned *max_lq)
 
 #endif
 
-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) /* 
{{{ */
 {
        int fd;
 
-       if (!sun || sun->sun_family != AF_UNIX) {
+       if (!sock || sock->sun_family != AF_UNIX) {
                return -1;
        }
 
@@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sun, 
size_t socklen) /* {{{
                return -1;
        }
 
-       if (connect(fd, (struct sockaddr *)sun, socklen) == -1) {
+       if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
                return -1;
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to