com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
| From: | Gustavo André dos Santos Lopes | Date: | Wed, 25 Jul 2012 00:03:47 +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-69688@lists.php.net to get a copy of this message | ||
Commit: 5799ebdb0cafb2de1dbb18cfe780976c98dbaeac
Author: Rasmus Lerdorf <rasmus@php.net> Tue, 24 Jul 2012 16:28:49 -0700
Committer: Gustavo André dos Santos Lopes <cataphract@php.net> Wed, 25 Jul 2012 02:03:47
+0200
Parents: ffa8461bfebebd8158cdb26ad5f3439c527545f7
Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5799ebdb0cafb2de1dbb18cfe780976c98dbaeac
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;
}