diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-02 18:29:30 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-02 18:29:30 +0000 |
| commit | d2bf1c1338d322cf81e0c460c7ed79db5dc23253 (patch) | |
| tree | 556903b5c98c268cd4b051496d791e7c524416eb | |
| parent | ede834c8b1e3d20ee6287ec9afa1b9b469638b35 (diff) | |
| download | php-git-d2bf1c1338d322cf81e0c460c7ed79db5dc23253.tar.gz | |
Fixed bug #24177 (Status not set correctly after flush() in Apache 2)
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 1295d1ceef..fde7fbb488 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -241,7 +241,9 @@ php_apache_sapi_flush(void *server_context) * then don't bother flushing. */ if (!server_context) return; - + + ctx->r->status = SG(sapi_headers).http_response_code; + f = ctx->f; /* Send a flush bucket down the filter chain. The current default diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 8021064990..b23cb3799c 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -255,6 +255,8 @@ php_apache_sapi_flush(void *server_context) r = ctx->r; brigade = ctx->brigade; + r->status = SG(sapi_headers).http_response_code; + /* Send a flush bucket down the filter chain. */ bucket = apr_bucket_flush_create(r->connection->bucket_alloc); APR_BRIGADE_INSERT_TAIL(brigade, bucket); |