svn commit: r1498012 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

[gs...@apache.org]

Author: gstein
Date: Sat Jun 29 19:28:10 2013
New Revision: 1498012

URL: http://svn.apache.org/r1498012
Log:
As pointed out on-list, the observed problem (so far) is with reverse
proxies, not forward proxies. We shouldn't key on whether we're using
a (forward) proxy.

* subversion/libsvn_ra_serf/serf.c:
  (svn_ra_serf__open): remove test for whether we're using a proxy

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/serf.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1498012&r1=1498011&r2=1498012&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Sat Jun 29 19:28:10 2013
@@ -505,9 +505,10 @@ svn_ra_serf__open(svn_ra_session_t *sess
                             _("Connection to '%s' failed"), session_URL);
   SVN_ERR(err);
 
-  /* We have set up a useful connection. If we have a proxy AND it might be busted
-     AND we switched to HTTP/1.1 (chunked requests), then probe the proxy.  */
-  if (serf_sess->using_proxy && serf_sess->busted_proxy && !serf_sess->http10)
+  /* We have set up a useful connection. If we've been told there is possibly a
+     busted proxy in our path to the server AND we switched to HTTP/1.1 (chunked
+     requests), then probe for problems in any proxy.  */
+  if (serf_sess->busted_proxy && !serf_sess->http10)
     SVN_ERR(svn_ra_serf__probe_proxy(serf_sess, pool));
 
   return SVN_NO_ERROR;