Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- Stefan Krause reported a busy-looping case when using the multi int…
…erface

  and doing CONNECT to a proxy. The app would then busy-loop until the proxy
  completed its response.
  • Loading branch information
bagder committed May 9, 2008
1 parent 6d5cca5 commit 0510759
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Expand Up @@ -7,6 +7,11 @@
Changelog


Daniel Stenberg (9 May 2008)
- Stefan Krause reported a busy-looping case when using the multi interface
and doing CONNECT to a proxy. The app would then busy-loop until the proxy
completed its response.

Michal Marek (9 May 2008)
- Make Curl_write and it's callees accept a const pointer, in preparation
of tetetest's patch for curl_easy_send()
Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES
Expand Up @@ -32,6 +32,7 @@ This release includes the following bugfixes:
o configure detecting debug-enabled c-ares
o microsecond resolution keys for internal splay trees
o krb4 and krb5 ftp segfault
o multi interface busy loop for CONNECT requests

This release includes the following known bugs:

Expand Down
6 changes: 6 additions & 0 deletions lib/multi.c
Expand Up @@ -722,6 +722,12 @@ static int waitconnect_getsock(struct connectdata *conn,
return GETSOCK_BLANK;

sock[0] = conn->sock[FIRSTSOCKET];

/* when we've sent a CONNECT to a proxy, we should rather wait for the
socket to become readable to be able to get the response headers */
if(conn->bits.tunnel_connecting)
return GETSOCK_READSOCK(0);

return GETSOCK_WRITESOCK(0);
}

Expand Down

0 comments on commit 0510759

Please sign in to comment.