Merge r574240 from trunk:

Don't send spurious "100 Continue" response lines.
PR 38014 [Basant Kumar Kukreja]

Submitted by: niq
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@574950 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 7b6d36be32f24994c2c82f8b785f2aff892951b2..92b8ac133a85a2fff58cb6b0937bc063e1da4f5c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) 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/STATUS b/STATUS
index 983c9aea79e0372820a5205b8eda3ca2d4ef5873..2481b8e968ea4f4077923592c766e10a0ac16132 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,15 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * core:  Don't send spurious "100 Continue" response lines.
-      PR 38014
-      http://svn.apache.org/viewvc?view=rev&revision=574240
-      +1: niq, rpluem, jim
-
-    * mod_proxy_ftp: Don't segfault on bad line in FTP listing
-      PR 40733
-      http://svn.apache.org/viewvc?view=rev&revision=574100
-      +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 185f50f83d06536296fccdfb07f13be3484791cb..85924054739e7cc738bc2e8b28eec8d1a2cf8a8f 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -185,7 +185,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;