summaryrefslogtreecommitdiff
path: root/sapi/fpm
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2012-08-20 08:34:35 +0200
committerOndřej Surý <ondrej@sury.org>2012-08-20 08:34:35 +0200
commit45c0aa447e02c80bd21a23245574231a110cf5a1 (patch)
treeb801de455f164afbf40fbbc995ab9751163eee84 /sapi/fpm
parent3365f28adf90110ca7475df889720fc244820f4b (diff)
downloadphp-45c0aa447e02c80bd21a23245574231a110cf5a1.tar.gz
Imported Upstream version 5.4.6upstream/5.4.6
Diffstat (limited to 'sapi/fpm')
-rw-r--r--sapi/fpm/fpm/fpm_sockets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index d24dcccc9..f56b9cfbd 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;
}