Setting no_cache causes Expires: to be send, which is not what we want.
authorSascha Schumann <sas@php.net>
Fri, 3 Nov 2000 00:11:42 +0000 (00:11 +0000)
committerSascha Schumann <sas@php.net>
Fri, 3 Nov 2000 00:11:42 +0000 (00:11 +0000)
Also disable ETag. It does not serve any purpose for dynamic pages.

Finally, disable keep-alive connections again, since we don't know
the content-length for sure.

sapi/apache2filter/sapi_apache2.c

index d7d899b031e12b5f94cd8ef9ff0b68e16f3b5b6e..9a5c0e1894baecc95f9e7c9cd6517b3f16f40b3a 100644 (file)
@@ -302,13 +302,15 @@ static int php_output_filter(ap_filter_t *f, ap_bucket_brigade *bb)
                SG(request_info).query_string = f->r->args;
                SG(request_info).request_method = f->r->method;
                SG(request_info).request_uri = f->r->uri;
-               f->r->no_cache = f->r->no_local_copy = 1;
+               f->r->no_local_copy = 1;
                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_unset(f->r->headers_out, "Content-Length");
                apr_table_unset(f->r->headers_out, "Last-Modified");
                apr_table_unset(f->r->headers_out, "Expires");
+               apr_table_unset(f->r->headers_out, "ETag");
+               apr_table_unset(f->r->headers_in, "Connection");
                auth = apr_table_get(f->r->headers_in, "Authorization");
                php_handle_auth_data(auth SLS_CC);