From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 19 May 2005 16:06:38 +0000 (+0000)
Subject: MFH Fix for bug #33057 - Don't send extraneous entity-headers on a 304 as per
X-Git-Tag: php-5.0.5RC1~275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feac7f8dbb95fe7d27d5a9001daca978c168bbb3;p=php

MFH Fix for bug #33057 - Don't send extraneous entity-headers on a 304 as per
RFC 2616 section 10.3.5
---

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 4aac2d2862..6eed907128 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -209,14 +209,20 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head
  */
 static int sapi_apache_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 {
-	if(SG(server_context) == NULL) { /* server_context is not here anymore */
+	request_rec *r = SG(server_context);
+
+	if(r == NULL) { /* server_context is not here anymore */
 		return SAPI_HEADER_SEND_FAILED;
 	}
 
-	((request_rec *) SG(server_context))->status = SG(sapi_headers).http_response_code;
-	send_http_header((request_rec *) SG(server_context));
+	r->status = SG(sapi_headers).http_response_code;
+	if(r->status==304) {
+		send_error_response(r,0);
+	} else {
+		send_http_header(r);
+	}   
 	return SAPI_HEADER_SENT_SUCCESSFULLY;
-}
+} 
 /* }}} */
 
 /* {{{ sapi_apache_register_server_variables