cvs: php4 /sapi/apache2filter sapi_apache2.c

sas Thu Nov 2 16:11:42 2000 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c Log: 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. Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.19 php4/sapi/apache2filter/sapi_apache2.c:1.20 --- php4/sapi/apache2filter/sapi_apache2.c:1.19 Thu Nov 2 07:47:02 2000 +++ php4/sapi/apache2filter/sapi_apache2.c Thu Nov 2 16:11:42 2000 @@ -302,13 +302,15 @@ 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);