httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r660569 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/http/http_filters.c
Date Tue, 27 May 2008 15:54:34 GMT
Author: rpluem
Date: Tue May 27 08:54:31 2008
New Revision: 660569

URL: http://svn.apache.org/viewvc?rev=660569&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/http/http_filters.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=660569&r1=660568&r2=660569&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue May 27 08:54:31 2008
@@ -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>]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=660569&r1=660568&r2=660569&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue May 27 08:54:31 2008
@@ -134,13 +134,6 @@
        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:

Modified: httpd/httpd/branches/2.2.x/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/http_filters.c?rev=660569&r1=660568&r2=660569&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_filters.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_filters.c Tue May 27 08:54:31 2008
@@ -324,7 +324,7 @@
             (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 {



Mime
View raw message