com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

From: Date: Tue, 24 Jul 2012 23:40:50 +0000
Subject: com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-69687@lists.php.net to get a copy of this message
Commit: 0fbc8561e687689f796d95584cea1fa959eee83b Author: Rasmus Lerdorf <rasmus@php.net> Tue, 24 Jul 2012 16:28:49 -0700 Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0fbc8561e687689f796d95584cea1fa959eee83b 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; }

« previous php.cvs (#69687) next »