From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 24 Jul 2012 23:28:49 +0000 (-0700)
Subject: Fix bug #62654
X-Git-Tag: php-5.5.0alpha1~20^2~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fbc8561e687689f796d95584cea1fa959eee83b;p=php

Fix bug #62654
---

diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dcccc9a..f56b9cfbd1 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;
 	}