diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2005-05-19 16:14:46 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2005-05-19 16:14:46 +0000 |
| commit | bb9223391e98e018e568bc229732ab33ad108a98 (patch) | |
| tree | 2bffdc573ed60a7b46b42723226cf1c270a4a479 | |
| parent | f4a39b53142d72eb911406bb6654589821968f71 (diff) | |
| download | php-git-bb9223391e98e018e568bc229732ab33ad108a98.tar.gz | |
Fix for bug #33057 - Don't send extraneous entity-headers on a 304 as per
RFC 2616 section 10.3.5
| -rw-r--r-- | sapi/apache/mod_php4.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 0851177098..da29146173 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -209,12 +209,18 @@ 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; } /* }}} */ |