summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@lerdorf.com>2013-10-31 03:18:36 -0700
committerRasmus Lerdorf <rasmus@lerdorf.com>2013-10-31 03:18:36 -0700
commita0244a69ccc3777053002c68c68f3d896206ed2a (patch)
treea0d034b43a1a0830a6c9abb23dd734b578a87db8
parent3b2ca392f1df71364b07b1c1e522aed5f8c00795 (diff)
parent812dfbc4315d38a4ee6669e8b7de50493a8bb3bd (diff)
downloadphp-git-a0244a69ccc3777053002c68c68f3d896206ed2a.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Fix bug #66008
-rw-r--r--sapi/fpm/fpm/fpm_sockets.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index 145b2550c3..e056565ea4 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -487,6 +487,7 @@ int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen) /* {{
}
if (connect(fd, (struct sockaddr *)sock, socklen) == -1) {
+ close(fd);
return -1;
}