All pastes #773310 Raw Edit

Stuff

public text v1 · immutable
·published 2007-11-14 13:11 UTC
rendered paste body
    int proxy_port = m_proxyURL.port();
+    bool socks_disabled=false;
+
+    // kio_http uses its own proxying:
+    if( KSocks::self()->usingSocks() && KSocks::self()->hasSocks() ) {
+       socks_disabled=true;
+       KSocks::self()->disableSocks();
+    }

    kdDebug(7113) << "(" << m_pid << ") Connecting to proxy server: "
                  << proxy_host << ", port: " << proxy_port << endl;
@@ -2065,6 +2071,11 @@

    if ( !connectToHost(proxy_host, proxy_port, false) )
    {
+
+      // might as well re-enable it:
+      if(socks_disabled)
+       KSocks::self()->enableSocks();
+
      if (userAborted()) {
        error(ERR_NO_CONTENT, "");
        return false;