generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When basic is the only auth wanted (which it is by default), the auth phase

Browse Source 
is always considered done immediately as Basic needs to extra passes.

This fix corrects bug report #848371.
This commit is contained in:
Daniel Stenberg
2003-11-25 09:05:15 +00:00
parent b3803903d1
commit 1d977b7848
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/http.c
View File

@@ -227,13 +227,15 @@ CURLcode http_auth_headers(struct connectdata *conn,
}
else
#endif
if((data->state.authwant == CURLAUTH_BASIC) && /* Basic */
conn->bits.proxy_user_passwd &&
!checkheaders(data, "Proxy-authorization:")) {
auth=(char *)"Basic";
result = Curl_output_basic_proxy(conn);
if(result)
return result;
if(data->state.authwant == CURLAUTH_BASIC) {
/* Basic */
if(conn->bits.proxy_user_passwd &&
!checkheaders(data, "Proxy-authorization:")) {
auth=(char *)"Basic";
result = Curl_output_basic_proxy(conn);
if(result)
return result;
}
*ready = TRUE;
/* Switch to web authentication after proxy authentication is done */
Curl_http_auth_stage(data, 401);
@@ -276,13 +278,15 @@ CURLcode http_auth_headers(struct connectdata *conn,
return result;
*ready = TRUE;
}
else if((data->state.authwant == CURLAUTH_BASIC) && /* Basic */
conn->bits.user_passwd &&
!checkheaders(data, "Authorization:")) {
auth=(char *)"Basic";
result = Curl_output_basic(conn);
if(result)
return result;
else if(data->state.authwant == CURLAUTH_BASIC) {/* Basic */
if(conn->bits.user_passwd &&
!checkheaders(data, "Authorization:")) {
auth=(char *)"Basic";
result = Curl_output_basic(conn);
if(result)
return result;
}
/* basic is always ready */
*ready = TRUE;
}
}