mirror of
https://github.com/curl/curl.git
synced 2026-06-11 17:04:16 +03:00
badger review changes
This commit is contained in:
parent
16bb5d7f5d
commit
613ffdfe12
2 changed files with 6 additions and 14 deletions
15
lib/multi.c
15
lib/multi.c
|
|
@ -2333,7 +2333,6 @@ static CURLMcode state_connect(struct Curl_multi *multi,
|
|||
static bool is_altsvc_error(CURLcode rc)
|
||||
{
|
||||
switch(rc) {
|
||||
case CURLE_URL_MALFORMAT:
|
||||
case CURLE_COULDNT_RESOLVE_PROXY:
|
||||
case CURLE_COULDNT_RESOLVE_HOST:
|
||||
case CURLE_COULDNT_CONNECT:
|
||||
|
|
@ -2689,15 +2688,13 @@ statemachine_end:
|
|||
infof(data, "Alt-Svc connection failed(%d). "
|
||||
"Retrying with original target", result);
|
||||
if(data->conn) {
|
||||
/* Do not attempt to send data over a connection that timed out */
|
||||
bool dead_connection = result == CURLE_OPERATION_TIMEDOUT;
|
||||
struct connectdata *conn = data->conn;
|
||||
struct connectdata *conn = data->conn;
|
||||
|
||||
/* This is where we make sure that the conn pointer is reset.
|
||||
We do not have to do this in every case block above where a
|
||||
failure is detected */
|
||||
Curl_detach_connection(data);
|
||||
Curl_conn_terminate(data, conn, dead_connection);
|
||||
/* This is where we make sure that the conn pointer is reset.
|
||||
We do not have to do this in every case block above where a
|
||||
failure is detected */
|
||||
Curl_detach_connection(data);
|
||||
Curl_conn_terminate(data, conn, FALSE);
|
||||
}
|
||||
|
||||
stream_error = FALSE;
|
||||
|
|
|
|||
|
|
@ -3857,11 +3857,6 @@ CURLcode Curl_connect(struct Curl_easy *data,
|
|||
struct connectdata *conn;
|
||||
bool reused = FALSE;
|
||||
|
||||
#ifndef CURL_DISABLE_ALTSVC
|
||||
if(data->asi)
|
||||
data->asi->used = FALSE;
|
||||
#endif
|
||||
|
||||
*asyncp = FALSE; /* assume synchronous resolves by default */
|
||||
*protocol_done = FALSE;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue