[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
Commit:5f224412fa6892645ca548ac75f20ff8743ed916
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49
-0700
Parents: 54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5f224412fa6892645ca548ac75f20ff8743ed916
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
Commit:a05e07ea1f75b8021c9b64bf93ff970873375d97
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49
-0700
Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a05e07ea1f75b8021c9b64bf93ff970873375d97
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
Commit:0fbc8561e687689f796d95584cea1fa959eee83b
Author:Rasmus Lerdorf ras...@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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c
Commit:5799ebdb0cafb2de1dbb18cfe780976c98dbaeac
Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49
-0700
Committer: Gustavo André dos Santos Lopes cataphr...@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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
