Don't send spurious "100 Continue" response lines.

PR 38014 [Basant Kumar Kukreja]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574240 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 07fd67a7ef67d4d101a5c62742b1fa59bf5d05fc..01ac0bdcb09221e486f824f1df2ffd62ec566264 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) Don't send spurious "100 Continue" response lines.
+     PR 38014 [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
   *) mod_proxy_ftp: Don't segfault on bad line in FTP listing
      PR 40733 [Ulf Harnhammar <metaur telia.com>]
 

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index cee5d70cf8065fac8279d50efc8cfabb9ea199fb..35c6c429ac2eb68278693c19c2fbd3d4eeb257b4 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -186,7 +186,8 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
          * Only valid on chunked and C-L bodies where the C-L is > 0. */
         if ((ctx->state == BODY_CHUNK ||
             (ctx->state == BODY_LENGTH && ctx->remaining > 0)) &&
-            f->r->expecting_100 && f->r->proto_num >= HTTP_VERSION(1,1)) {
+            f->r->expecting_100 && f->r->proto_num >= HTTP_VERSION(1,1) &&
+            !(f->r->eos_sent || f->r->bytes_sent)) {
             char *tmp;
             apr_bucket_brigade *bb;