Author: Adrian Chadd <adrian@creative.net.au>

Bug 2558: pt 1: Connect forwarding setting error too early

This does not appear to be all of the cause of 2558, but its part of the
problem anyway. Request forwarding should not be setting a connection
failed error page until all attempts at making a connection have failed.
This patch does not correct the place its being set, but clears err before
re-trying a connection.

From IRC:
(13:09:03) adri: no idea about v4-only hostnames
but the bug is still valid; you're creating errors on
the connect fail, but not clearing them before the next connect

diff --git a/src/forward.cc b/src/forward.cc
index 7d20e19bdd9b22d7ea95fc9dced5aa90f13458dc..a03a8fa014e9f0875ffba0f7070440f5c03ca24d 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -527,6 +527,10 @@ FwdState::retryOrBail()
             }
         }
 
+        /* Ditch error page if it was created before.
+         * A new one will be created if there's another problem */
+        err = NULL;
+
         /* use eventAdd to break potential call sequence loops and to slow things down a little */
         eventAdd("fwdConnectStart", fwdConnectStartWrapper, this, originserver ? 0.05 : 0.005, 0);