summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/php/files/4.3.11/php4.3.11-apachesapi.patch')
-rw-r--r--dev-lang/php/files/4.3.11/php4.3.11-apachesapi.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/dev-lang/php/files/4.3.11/php4.3.11-apachesapi.patch b/dev-lang/php/files/4.3.11/php4.3.11-apachesapi.patch
new file mode 100644
index 0000000..82480c7
--- /dev/null
+++ b/dev-lang/php/files/4.3.11/php4.3.11-apachesapi.patch
@@ -0,0 +1,33 @@
+--- sapi/apache/mod_php4.c 2004-07-21 18:25:28.000000000 +0200
++++ sapi/apache/mod_php4.c 2005-05-19 18:14:46.000000000 +0200
+@@ -17,7 +17,7 @@
+ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+ +----------------------------------------------------------------------+
+ */
+-/* $Id: mod_php4.c,v 1.146.2.14 2004/07/21 16:25:28 sesser Exp $ */
++/* $Id: mod_php4.c,v 1.146.2.15 2005/05/19 16:14:46 rasmus Exp $ */
+
+ #include "php_apache_http.h"
+ #include "http_conf_globals.h"
+@@ -209,12 +209,18 @@
+ */
+ 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;
+ }
+ /* }}} */