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

[gs...@apache.org]

Author: gstein
Date: Wed Jul  3 23:06:28 2013
New Revision: 1499595

URL: http://svn.apache.org/r1499595
Log:
Don't probe for busted proxies if a redirect has occurred. We'll check
once the redirects stop.

Reported by: philip

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__open): only run the probe if a redirect did not occur

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=1499595&r1=1499594&r2=1499595&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Wed Jul  3 23:06:28 2013
@@ -505,10 +505,12 @@ 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'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)
+  /* We have set up a useful connection (that doesn't indication a redirect).
+     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 ((corrected_url == NULL || *corrected_url == NULL)
+      && serf_sess->busted_proxy && !serf_sess->http10)
     SVN_ERR(svn_ra_serf__probe_proxy(serf_sess, pool));
 
   return SVN_NO_ERROR;