From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 9 Nov 2008 15:50:13 +0000 (+0000)
Subject: Fix for bug #46525 which fixes Ilia's fix for bug #46319
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f459896964396caba79a6ad0cb442d3b5e0c2c1b;p=php

Fix for bug #46525 which fixes Ilia's fix for bug #46319
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 2af280984b..e549042265 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -455,6 +455,7 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 				}
 			} 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);