Commit 58231795 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

connections: non-HTTP proxies on different ports aren't reused either 

Reported-by: Oleg Pudeyev and fuchaoqun

Fixes #648
parent 96eb9a86

lib/conncache.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static char *hashkey(struct connectdata *conn) 
  else

    hostname = conn->host.name;



  return aprintf("%s:%d", hostname, conn->localport);

  return aprintf("%s:%d", hostname, conn->port);

}



/* Look up the bundle with all the connections to the same host this

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -3376,7 +3376,7 @@ ConnectionExists(struct SessionHandle *data, 
        }

      }



      if(!needle->bits.httpproxy || (needle->handler->flags&PROTOPT_SSL) ||

      if(!needle->bits.proxy || (needle->handler->flags&PROTOPT_SSL) ||

         (needle->bits.httpproxy && check->bits.httpproxy &&

          needle->bits.tunnel_proxy && check->bits.tunnel_proxy &&

          Curl_raw_equal(needle->proxy.name, check->proxy.name) &&