cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c
| From: | Rasmus Lerdorf | Date: | Sat, 08 Nov 2008 22:45:29 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54078@lists.php.net to get a copy of this message | ||
rasmus Sat Nov 8 22:45:29 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
Potential fix for bug #46525
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.64&r2=1.267.2.15.2.65&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.64 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.65
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.64 Mon Nov 3 23:26:23 2008
+++ php-src/sapi/cgi/cgi_main.c Sat Nov 8 22:45:29 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.64 2008/11/03 23:26:23 lbarnaud Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.65 2008/11/08 22:45:29 rasmus Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -447,6 +447,7 @@
}
} else if (response_status == 304 && h->header_len >
sizeof("Content-Type:")-1 &&
strncasecmp(h->header, "Content-Type:", sizeof("Content-Type:")-1) ==
0) {
+ h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
continue;
} else {
PHPWRITE_H(h->header, h->header_len);