moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

when the multi handle was in DO and DOING states, the HTTP and HTTPS protocol

Browse Source 
handler functions didn't return that the socket should be waited for writing,
but instead it was treated as if no socket was needing monitoring so REMOVE
was called prematurely
This commit is contained in:
Daniel Stenberg 2008-05-19 20:57:28 +00:00
parent c2a84aa6f0
commit 3cb0dd6685
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/http.c
View File

@ -111,6 +111,9 @@
* Forward declarations. * Forward declarations.
*/ */
static int http_getsock_do(struct connectdata *conn,
curl_socket_t *socks,
int numsocks);
static CURLcode https_connecting(struct connectdata *conn, bool *done); static CURLcode https_connecting(struct connectdata *conn, bool *done);
#ifdef USE_SSL #ifdef USE_SSL
static int https_getsock(struct connectdata *conn, static int https_getsock(struct connectdata *conn,
@ -131,7 +134,7 @@ const struct Curl_handler Curl_handler_http = {
ZERO_NULL, /* connecting */ ZERO_NULL, /* connecting */
ZERO_NULL, /* doing */ ZERO_NULL, /* doing */
ZERO_NULL, /* proto_getsock */ ZERO_NULL, /* proto_getsock */
ZERO_NULL, /* doing_getsock */ http_getsock_do, /* doing_getsock */
ZERO_NULL, /* disconnect */ ZERO_NULL, /* disconnect */
PORT_HTTP, /* defport */ PORT_HTTP, /* defport */
PROT_HTTP, /* protocol */ PROT_HTTP, /* protocol */
@ -151,7 +154,7 @@ const struct Curl_handler Curl_handler_https = {
https_connecting, /* connecting */ https_connecting, /* connecting */
ZERO_NULL, /* doing */ ZERO_NULL, /* doing */
https_getsock, /* proto_getsock */ https_getsock, /* proto_getsock */
ZERO_NULL, /* doing_getsock */ http_getsock_do, /* doing_getsock */
ZERO_NULL, /* disconnect */ ZERO_NULL, /* disconnect */
PORT_HTTPS, /* defport */ PORT_HTTPS, /* defport */
PROT_HTTP | PROT_HTTPS | PROT_SSL /* protocol */ PROT_HTTP | PROT_HTTPS | PROT_SSL /* protocol */
@ -1726,6 +1729,19 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
return CURLE_OK; return CURLE_OK;
} }
/* this returns the socket to wait for in the DO and DOING state for the multi
interface and then we're always _sending_ a request and thus we wait for
the single socket to become writable only */
static int http_getsock_do(struct connectdata *conn,
curl_socket_t *socks,
int numsocks)
{
/* write mode */
(void)numsocks; /* unused, we trust it to be at least 1 */
socks[0] = conn->sock[FIRSTSOCKET];
return GETSOCK_WRITESOCK(0);
}
static CURLcode https_connecting(struct connectdata *conn, bool *done) static CURLcode https_connecting(struct connectdata *conn, bool *done)
{ {
CURLcode result; CURLcode result;