From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 4 Sep 2003 11:34:09 +0000 (+0000)
Subject: Jörg pointed out that I did this fix wrongly, now authwant is cleared
X-Git-Tag: curl-7_10_8~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2956fe97a023f18a6ef9a1bc29f1b641891bcabb;p=thirdparty%2Fcurl.git

Jörg pointed out that I did this fix wrongly, now authwant is cleared
properly if no auth is available
---

diff --git a/lib/http.c b/lib/http.c
index c1fc9552a0..6942383973 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -162,6 +162,8 @@ void Curl_http_auth_act(struct connectdata *conn)
 {
   struct SessionHandle *data = conn->data;
 
+  data->state.authwant = CURLAUTH_NONE; /* clear it first */
+
   if(data->state.authavail) {
     if(data->state.authavail & CURLAUTH_GSSNEGOTIATE)
       data->state.authwant = CURLAUTH_GSSNEGOTIATE;
@@ -171,13 +173,11 @@ void Curl_http_auth_act(struct connectdata *conn)
       data->state.authwant = CURLAUTH_NTLM;
     else if(data->state.authavail & CURLAUTH_BASIC)
       data->state.authwant = CURLAUTH_BASIC;
-    else
-      data->state.authwant = CURLAUTH_NONE; /* none */
 
     if(data->state.authwant)
       conn->newurl = strdup(data->change.url); /* clone URL */
+    data->state.authavail = CURLAUTH_NONE; /* clear it here */
   }
-  data->state.authavail = CURLAUTH_NONE; /* clear it here */
 }
 
 /*