Commit 9d114559 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Bruce Mitchener identified (bug report #1099640) the never-ending SOCKS5 

problem with the version byte and the check for bad versions. Bruce has lots
of clues on this, and based on his suggestion I've now removed the check of
that byte since it seems to be able to contain 1 or 5.
parent 065e466f

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
                                  Changelog





Daniel (11 January 2005)

- Bruce Mitchener identified (bug report #1099640) the never-ending SOCKS5

  problem with the version byte and the check for bad versions. Bruce has lots

  of clues on this, and based on his suggestion I've now removed the check of

  that byte since it seems to be able to contain 1 or 5.



Daniel (10 January 2005)

- Pavel Orehov reported memory problems with the multi interface in bug report

  #1098843. In short, a shared DNS cache was setup for a multi handle and when

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ This release includes the following changes: 


This release includes the following bugfixes:



 o SOCKS5 version check

 o memory problem with cleaning up multi interface

 o SSL certificate name memory leak

 o -d with -G to multiple URLs crashed
@@ -34,6 +35,6 @@ advice from friends like these: 


 Dan Fandrich, Peter Pentchev, Marcin Konicki, Rune Kleveland, David Shaw,

 Werner Koch, Gisle Vanem, Alex Neblett, Kai Sommerfeld, Marty Kuhrt,

 Hzhijun, Pavel Orehov

 Hzhijun, Pavel Orehov, Bruce Mitchener



        Thanks! (and sorry if I forgot to mention someone)

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -1829,8 +1829,8 @@ static int handleSock5Proxy(const char *proxy_name, 
      return 1;

    }



    if ((socksreq[0] != 5) || /* version */

        (socksreq[1] != 0)) { /* status */

    /* ignore the first (VER) byte */

    if (socksreq[1] != 0) { /* status */

      failf(conn->data, "User was rejected by the SOCKS5 server (%d %d).",

            socksreq[0], socksreq[1]);

      return 1;