diff options
| author | Sascha Schumann <sas@php.net> | 2000-10-27 12:52:38 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-10-27 12:52:38 +0000 |
| commit | 50500e680be26fb8e5cff2ac32aeeac5dc1cb319 (patch) | |
| tree | 69552e140fbba75f073a501e59f65fcabf186a3e | |
| parent | 4f97ff0096eb42782cb482e3d008c83b5506fedf (diff) | |
| download | php-git-50500e680be26fb8e5cff2ac32aeeac5dc1cb319.tar.gz | |
Apache 2.0 does some funky internal caching which works for static
content, but fails miserably in our context.
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 9 |
1 files changed, 8 insertions, 1 deletions
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 */ |