From: Sascha Schumann <sas@php.net>
Date: Fri, 27 Oct 2000 12:52:38 +0000 (+0000)
Subject: Apache 2.0 does some funky internal caching which works for static
X-Git-Tag: php-4.0.4RC3~496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50500e680be26fb8e5cff2ac32aeeac5dc1cb319;p=php

Apache 2.0 does some funky internal caching which works for static
content, but fails miserably in our context.
---

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 37cf4a26ae..00eae02366 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -212,8 +212,10 @@ static int php_filter(ap_filter_t *f, ap_bucket_brigade *bb)
 		content_type = sapi_get_default_content_type(SLS_C);
 		f->r->content_type = apr_pstrdup(f->r->pool, content_type);
 		efree(content_type);
-		apr_table_set(f->r->headers_in, "Connection", "close");
+		apr_table_unset(f->r->headers_in, "Connection");
 		apr_table_unset(f->r->headers_out, "Content-Length");
+		apr_table_unset(f->r->headers_out, "Last-Modified");
+		apr_table_unset(f->r->headers_out, "Expires");
 		auth = apr_table_get(f->r->headers_in, "Authorization");
 		php_handle_auth_data(auth SLS_CC);
 	}
@@ -282,7 +284,12 @@ static int php_filter(ap_filter_t *f, ap_bucket_brigade *bb)
 #endif
 
 		smart_str_free(&content);
+		goto ok;
 skip_execution:
+#define NO_DATA "php_filter did not get ANY data"
+		eos = ap_bucket_create_transient(NO_DATA, sizeof(NO_DATA)-1);
+		AP_BRIGADE_INSERT_HEAD(bb, eos);
+ok:
 		php_request_shutdown(NULL);
 
 		/* Pass EOS bucket to next filter to signal end of request */