diff options
| author | Sascha Schumann <sas@php.net> | 2000-11-03 00:11:42 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-11-03 00:11:42 +0000 |
| commit | 51ec089429d232c5cf19cf03e0739b3baa39760f (patch) | |
| tree | ca955a5f6a863a52e032d005f4661f0850ade31f | |
| parent | 6da2eaf6009db558f5e8de178843170216777340 (diff) | |
| download | php-git-51ec089429d232c5cf19cf03e0739b3baa39760f.tar.gz | |
Setting no_cache causes Expires: to be send, which is not what we want.
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.
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index d7d899b031..9a5c0e1894 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -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); |