Return-Path: 
 <cvs-return-17573-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 58746 invoked from network); 15 Dec 2003 23:04:42 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 15 Dec 2003 23:04:42 -0000
Received: (qmail 32582 invoked by uid 500); 15 Dec 2003 23:04:28 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 32556 invoked by uid 500); 15 Dec 2003 23:04:28 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 32543 invoked by uid 500); 15 Dec 2003 23:04:28 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Received: (qmail 32540 invoked from network); 15 Dec 2003 23:04:28 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 15 Dec 2003 23:04:28 -0000
Received: (qmail 58698 invoked by uid 1313); 15 Dec 2003 23:04:41 -0000
Date: 15 Dec 2003 23:04:41 -0000
Message-ID: <20031215230441.58697.qmail@minotaur.apache.org>
From: ianh@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/proxy proxy_http.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

ianh        2003/12/15 15:04:41

  Modified:    .        CHANGES
               modules/proxy proxy_http.c
  Log:
  mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration attaches
  a body to the 302 response and a wrong Content-Length header.
  
  PR: 22951
  Submitted by:	Ermanno Scaglione <scaglione ..at.. starnetone.de>
  Reviewed by:	Blaise Tarr <blaise.tarr .. at .. cnet.com>
  
  Revision  Changes    Path
  1.1346    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1345
  retrieving revision 1.1346
  diff -u -r1.1345 -r1.1346
  --- CHANGES	15 Dec 2003 19:59:23 -0000	1.1345
  +++ CHANGES	15 Dec 2003 23:04:40 -0000	1.1346
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration attaches
  +     a body to the 302 response and a wrong Content-Length header. 
  +     PR: 22951 [Ermanno Scaglione scaglione ..at.. starnetone.de]
  +
     *) Bring ErrorHeader concept forward from 1.3, so that response
        header fields can be set for return even on errors or external
        redirects.  [Ken Coar]
  
  
  
  1.175     +1 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.174
  retrieving revision 1.175
  diff -u -r1.174 -r1.175
  --- proxy_http.c	12 Dec 2003 12:36:50 -0000	1.174
  +++ proxy_http.c	15 Dec 2003 23:04:40 -0000	1.175
  @@ -1020,7 +1020,7 @@
                * if we are overriding the errors, we can't put the content
                * of the page into the brigade
                */
  -            if ( (conf->error_override ==0) || r->status < 400 ) {
  +            if ( (conf->error_override ==0) || r->status < 300 ) {
   
                   /* read the body, pass it to the output filters */
                   int finish = FALSE;