You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2006/08/28 20:57:09 UTC

svn commit: r437781 - /httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c

Author: jim
Date: Mon Aug 28 11:57:09 2006
New Revision: 437781

URL: http://svn.apache.org/viewvc?rev=437781&view=rev
Log:
Merge r437768 from trunk:

Minor nit: why make the logic more complex than it needs to
be ? :)

Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=437781&r1=437780&r2=437781&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Mon Aug 28 11:57:09 2006
@@ -1393,7 +1393,7 @@
          * ProxyPassReverse/etc from here to ap_proxy_read_headers
          */
 
-        if ((r->status == 401) && (conf->error_override != 0)) {
+        if ((r->status == 401) && (conf->error_override)) {
             const char *buf;
             const char *wa = "WWW-Authenticate";
             if ((buf = apr_table_get(r->headers_out, wa))) {
@@ -1452,7 +1452,7 @@
              * if we are overriding the errors, we can't put the content
              * of the page into the brigade
              */
-            if (conf->error_override == 0 || ap_is_HTTP_SUCCESS(r->status)) {
+            if (!conf->error_override || ap_is_HTTP_SUCCESS(r->status)) {
                 /* read the body, pass it to the output filters */
                 apr_read_type_e mode = APR_NONBLOCK_READ;
                 int finish = FALSE;

Re: svn commit: r437781 - /httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c

Posted by Joe Orton <jo...@redhat.com>.
On Tue, Aug 29, 2006 at 09:12:02AM -0400, Jim Jagielski wrote:
> Joe Orton wrote:
> > On Mon, Aug 28, 2006 at 06:57:09PM -0000, Jim Jagielski wrote:
> > > Author: jim
> > > Date: Mon Aug 28 11:57:09 2006
> > > New Revision: 437781
> > > 
> > > URL: http://svn.apache.org/viewvc?rev=437781&view=rev
> > > Log:
> > > Merge r437768 from trunk:
> > > 
> > > Minor nit: why make the logic more complex than it needs to
> > > be ? :)
> > > 
> > > Reviewed by: jim
> > 
> > Why commit this stuff?  2.2.x is RTC.  Merging pointless changes like
> > this will screw up any future merges from earlier code on the trunk.
> 
> Because, IMO, logical fixes, esp those in trunk should be always
> backported to 2.2 to avoid stupid divergence that would cause problems
> with future backports.

So submit the proposals and follow the RTC process.  Today's "obvious 
logical fix" which bypasses the RTC process is tomorrow's "oops I typoed 
it" regresssion.

joe

Re: svn commit: r437781 - /httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c

Posted by Joe Orton <jo...@redhat.com>.
On Mon, Aug 28, 2006 at 06:57:09PM -0000, Jim Jagielski wrote:
> Author: jim
> Date: Mon Aug 28 11:57:09 2006
> New Revision: 437781
> 
> URL: http://svn.apache.org/viewvc?rev=437781&view=rev
> Log:
> Merge r437768 from trunk:
> 
> Minor nit: why make the logic more complex than it needs to
> be ? :)
> 
> Reviewed by: jim

Why commit this stuff?  2.2.x is RTC.  Merging pointless changes like
this will screw up any future merges from earlier code on the trunk.

joe