From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 27 May 2008 15:54:31 +0000 (+0000)
Subject: Merge r657933 from trunk:
X-Git-Tag: 2.2.9~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad229c108e5e4c5560cdb70be34703cf10e4864d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r657933 from trunk:

* Only send 100-continue if the status code so far indicates success.

PR: 43711

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick


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

diff --git a/CHANGES b/CHANGES
index 139cb002e47..05245a0c0a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) http_filters: Don't return 100-continue on redirects. PR 43711
+     [Ruediger Pluem]
+
   *) mod_ssl: Fix a memory leak with connections that have zlib compression
      turned on. PR 44975 [Joe Orton, Amund Elstad <Amund.Elstad ist.com>,
      Dr Stephen Henson <steve openssl.org>]
diff --git a/STATUS b/STATUS
index aad090962c3..fdc7fb9f819 100644
--- a/STATUS
+++ b/STATUS
@@ -134,13 +134,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~fielding/p/ab-sync.txt
   +1: fielding, jim, wrowe
 
- * http_filters: Don't return 100-continue on redirects. PR 43711
-   Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=657933&view=rev
-   Backport version for 2.2.x of patch:
-         Trunk version of patch works
-   +1: rpluem, niq, trawick
-
  * mod_dav: Return "method not allowed" if the destination URI of a WebDAV
    copy / move operation is no DAV resource. PR 44734 
    Trunk version of patch:
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 2a8761c7764..09fa220bf35 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -324,7 +324,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
             (ctx->state == BODY_LENGTH && ctx->remaining > 0)) &&
             f->r->expecting_100 && f->r->proto_num >= HTTP_VERSION(1,1) &&
             !(f->r->eos_sent || f->r->bytes_sent)) {
-            if (ap_is_HTTP_CLIENT_ERROR(f->r->status)) {
+            if (!ap_is_HTTP_SUCCESS(f->r->status)) {
                 ctx->state = BODY_NONE;
                 ctx->eos_sent = 1;
             } else {