diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:43:09 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:43:09 +0100 |
| commit | 5b56d06a01a150fc9685e6f913774be3f9deb49f (patch) | |
| tree | 9fbfbe0313b782941f1c2c4d3cb5203817144108 /modules/http/http_protocol.c | |
| parent | 498ea95018b369e62646a98c7d7d5413b56e170c (diff) | |
| download | apache2-upstream/2.2.19.tar.gz | |
Upstream tarball 2.2.19upstream/2.2.19
Diffstat (limited to 'modules/http/http_protocol.c')
| -rw-r--r-- | modules/http/http_protocol.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index fdd7d757..be864e82 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -174,6 +174,9 @@ AP_DECLARE(int) ap_set_keepalive(request_rec *r) * body should use the HTTP/1.1 chunked transfer-coding. In English, * * IF we have not marked this connection as errored; + * and the client isn't expecting 100-continue (PR47087 - more + * input here could be the client continuing when we're + * closing the request). * and the response body has a defined length due to the status code * being 304 or 204, the request method being HEAD, already * having defined Content-Length or Transfer-Encoding: chunked, or @@ -195,6 +198,7 @@ AP_DECLARE(int) ap_set_keepalive(request_rec *r) * Note that the condition evaluation order is extremely important. */ if ((r->connection->keepalive != AP_CONN_CLOSE) + && !r->expecting_100 && ((r->status == HTTP_NOT_MODIFIED) || (r->status == HTTP_NO_CONTENT) || r->header_only |