curl_close is a new function pointer that can be set to a protocol-specific

function to get called in the curl_close() function for cleanup
auth_host is added to store the original (first) host name used

lib/urldata.h

@@ -170,6 +170,11 @@ struct connectdata {
    */ 
   CURLcode (*curl_connect)(struct connectdata *connect);
 
+  /* This function *MAY* be set to a protocol-dependent function that is run
+   * in the curl_close() function if protocol-specific cleanups are required.
+   */ 
+  CURLcode (*curl_close)(struct connectdata *connect);
+
   /**** curl_get() phase fields */
 
   /* READ stuff */
@@ -264,6 +269,7 @@ struct Configbits {
   bool use_netrc;
   bool user_passwd;
   bool verbose;
+  bool this_is_a_follow; /* this is a followed Location: request */
 };
 
 /* What type of interface that intiated this struct */
@@ -417,6 +423,11 @@ struct UrlData {
 #define MAX_CURL_USER_LENGTH 128
 #define MAX_CURL_PASSWORD_LENGTH 128
 
+  char *auth_host; /* if set, this is the allocated string to the host name
+                    * to which to send the authorization data to, and no other
+                    * host (which location-following otherwise could lead to)
+                    */
+
   char user[MAX_CURL_USER_LENGTH];
   char passwd[MAX_CURL_PASSWORD_LENGTH];
   char proxyuser[MAX_CURL_USER_LENGTH];