1. store the httpproxycode in the loop after it is parsed

2. made Curl_http_auth_act() reset 'authavail' unconditionally
This commit is contained in:
Daniel Stenberg 2003-09-04 10:18:12 +00:00
Родитель 7410210f19
Коммит 8fae12b2f1
1 изменённых файлов: 4 добавлений и 7 удалений

Просмотреть файл

@ -175,10 +175,9 @@ void Curl_http_auth_act(struct connectdata *conn)
data->state.authwant = CURLAUTH_NONE; /* none */
if(data->state.authwant)
conn->newurl = strdup(data->change.url); /* clone string */
data->state.authavail = CURLAUTH_NONE; /* clear it here */
conn->newurl = strdup(data->change.url); /* clone URL */
}
data->state.authavail = CURLAUTH_NONE; /* clear it here */
}
/*
@ -827,7 +826,8 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
else if(2 == sscanf(line_start, "HTTP/1.%d %d",
&subversion,
&httpcode)) {
;
/* store the HTTP code */
data->info.httpproxycode = httpcode;
}
/* put back the letter we blanked out before */
line_start[perline]= letter;
@ -850,9 +850,6 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
} while(conn->newurl);
/* store the HTTP code after the looping is done */
data->info.httpproxycode = httpcode;
if(200 != httpcode) {
failf(data, "Received HTTP code %d from proxy after CONNECT", httpcode);
return CURLE_RECV_ERROR;