iliaa Wed, 26 Aug 2009 15:29:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287762
Log:
Fixed variable clobbering
Changed paths:
U php/php-src/branches/PHP_5_2/sapi/cgi/fastcgi.c
U php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c
U php/php-src/trunk/sapi/cgi/fastcgi.c
Modified: php/php-src/branches/PHP_5_2/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/branches/PHP_5_2/sapi/cgi/fastcgi.c 2009-08-26 15:22:25 UTC
(rev 287761)
+++ php/php-src/branches/PHP_5_2/sapi/cgi/fastcgi.c 2009-08-26 15:29:06 UTC
(rev 287762)
@@ -397,21 +397,21 @@
}
} else {
#ifdef _WIN32
- SECURITY_DESCRIPTOR sd;
- SECURITY_ATTRIBUTES sa;
- PACL acl;
+ SECURITY_DESCRIPTOR sd;
+ SECURITY_ATTRIBUTES saw;
+ PACL acl;
HANDLE namedPipe;
- memset(&sa, 0, sizeof(sa));
- sa.nLength = sizeof(sa);
+ memset(&sa, 0, sizeof(saw));
+ sa.nLength = sizeof(saw);
sa.bInheritHandle = FALSE;
- acl = prepare_named_pipe_acl(&sd, &sa);
+ acl = prepare_named_pipe_acl(&sd, &saw);
namedPipe = CreateNamedPipe(path,
PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
PIPE_UNLIMITED_INSTANCES,
- 8192, 8192, 0, &sa);
+ 8192, 8192, 0, &saw);
if (namedPipe == INVALID_HANDLE_VALUE) {
return -1;
}
Modified: php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c 2009-08-26 15:22:25 UTC
(rev 287761)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c 2009-08-26 15:29:06 UTC
(rev 287762)
@@ -398,20 +398,20 @@
} else {
#ifdef _WIN32
SECURITY_DESCRIPTOR sd;
- SECURITY_ATTRIBUTES sa;
+ SECURITY_ATTRIBUTES saw;
PACL acl;
HANDLE namedPipe;
- memset(&sa, 0, sizeof(sa));
- sa.nLength = sizeof(sa);
+ memset(&sa, 0, sizeof(saw));
+ sa.nLength = sizeof(saw);
sa.bInheritHandle = FALSE;
- acl = prepare_named_pipe_acl(&sd, &sa);
+ acl = prepare_named_pipe_acl(&sd, &saw);
namedPipe = CreateNamedPipe(path,
PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
PIPE_UNLIMITED_INSTANCES,
- 8192, 8192, 0, &sa);
+ 8192, 8192, 0, &saw);
if (namedPipe == INVALID_HANDLE_VALUE) {
return -1;
}
Modified: php/php-src/trunk/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/trunk/sapi/cgi/fastcgi.c 2009-08-26 15:22:25 UTC (rev
287761)
+++ php/php-src/trunk/sapi/cgi/fastcgi.c 2009-08-26 15:29:06 UTC (rev
287762)
@@ -397,21 +397,21 @@
}
} else {
#ifdef _WIN32
- SECURITY_DESCRIPTOR sd;
- SECURITY_ATTRIBUTES sa;
- PACL acl;
+ SECURITY_DESCRIPTOR sd;
+ SECURITY_ATTRIBUTES saw;
+ PACL acl;
HANDLE namedPipe;
- memset(&sa, 0, sizeof(sa));
- sa.nLength = sizeof(sa);
+ memset(&sa, 0, sizeof(saw));
+ sa.nLength = sizeof(saw);
sa.bInheritHandle = FALSE;
- acl = prepare_named_pipe_acl(&sd, &sa);
+ acl = prepare_named_pipe_acl(&sd, &saw);
namedPipe = CreateNamedPipe(path,
PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
PIPE_UNLIMITED_INSTANCES,
- 8192, 8192, 0, &sa);
+ 8192, 8192, 0, &saw);
if (namedPipe == INVALID_HANDLE_VALUE) {
return -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
