commit 5278462c32a70cd972a8cc824a38f164151d6c6d
author Isaac Boukris <iboukris@gmail.com> Fri Jan 27 00:42:28 2017 +0200
committer Michael Kaufmann <mail@michael-kaufmann.ch> Sat Mar 11 18:12:08 2017 +0100
tree f34ed7e53b43fd64b8ead5bcd2416ed6a22bbf91
parent 381aff03857544b05c34f3f095089cd170023978

authneg: clear auth.multi flag at http_done

This flag is meant for the current request based on authentication
state, once the request is done we can clear the flag.

Also change auth.multi to auth.multipass for better readability.

Fixes https://github.com/curl/curl/issues/1095
Closes https://github.com/curl/curl/pull/1326

Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reported-by: Michael Kaufmann

lib/http.c

diff --git a/lib/http.c b/lib/http.c
index fbb0376..ebc0050 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -645,10 +645,10 @@
           proxy ? "Proxy" : "Server", auth,
           proxy ? (conn->http_proxy.user ? conn->http_proxy.user : "") :
                   (conn->user ? conn->user : ""));
-    authstatus->multi = (!authstatus->done) ? TRUE : FALSE;
+    authstatus->multipass = (!authstatus->done) ? TRUE : FALSE;
   }
   else
-    authstatus->multi = FALSE;
+    authstatus->multipass = FALSE;
 
   return CURLE_OK;
 }
@@ -1426,6 +1426,11 @@
   struct Curl_easy *data = conn->data;
   struct HTTP *http = data->req.protop;
 
+  /* Clear multipass flag. If authentication isn't done yet, then it will get
+   * a chance to be set back to true when we output the next auth header */
+  data->state.authhost.multipass = FALSE;
+  data->state.authproxy.multipass = FALSE;
+
   Curl_unencode_cleanup(conn);
 
 #ifdef USE_SPNEGO
@@ -1862,7 +1867,7 @@
   if(result)
     return result;
 
-  if((data->state.authhost.multi || data->state.authproxy.multi) &&
+  if((data->state.authhost.multipass || data->state.authproxy.multipass) &&
      (httpreq != HTTPREQ_GET) &&
      (httpreq != HTTPREQ_HEAD)) {
     /* Auth is required and we are not authenticated yet. Make a PUT or POST

lib/urldata.h

diff --git a/lib/urldata.h b/lib/urldata.h
index ef6a788..7402332 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1283,8 +1283,8 @@
                           this resource */
   bool done;  /* TRUE when the auth phase is done and ready to do the *actual*
                  request */
-  bool multi; /* TRUE if this is not yet authenticated but within the auth
-                 multipass negotiation */
+  bool multipass; /* TRUE if this is not yet authenticated but within the
+                     auth multipass negotiation */
   bool iestyle; /* TRUE if digest should be done IE-style or FALSE if it should
                    be RFC compliant */
 };