Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 1 of 2.

1 files changed, 1664 insertions, 1664 deletions

diff --git a/contrib/libs/curl/lib/url.c b/contrib/libs/curl/lib/url.c
index 95e37dfeed..ab9ad7bf26 100644
--- a/contrib/libs/curl/lib/url.c
+++ b/contrib/libs/curl/lib/url.c
@@ -1,136 +1,136 @@
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
+/*************************************************************************** 
+ *                                  _   _ ____  _ 
+ *  Project                     ___| | | |  _ \| | 
+ *                             / __| | | | |_) | | 
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____| 
+ * 
  * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
+ * 
+ * This software is licensed as described in the file COPYING, which 
+ * you should have received as part of this distribution. The terms 
  * are also available at https://curl.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include "curl_setup.h"
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell 
+ * copies of the Software, and permit persons to whom the Software is 
+ * furnished to do so, under the terms of the COPYING file. 
+ * 
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY 
+ * KIND, either express or implied. 
+ * 
+ ***************************************************************************/ 
+ 
+#include "curl_setup.h" 
+ 
+#ifdef HAVE_NETINET_IN_H 
+#include <netinet/in.h> 
+#endif 
+#ifdef HAVE_NETDB_H 
+#include <netdb.h> 
+#endif 
+#ifdef HAVE_ARPA_INET_H 
+#include <arpa/inet.h> 
+#endif 
+#ifdef HAVE_NET_IF_H 
+#include <net/if.h> 
+#endif 
 #ifdef HAVE_IPHLPAPI_H
 #include <Iphlpapi.h>
 #endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifdef __VMS
-#include <in.h>
-#include <inet.h>
-#endif
-
+#ifdef HAVE_SYS_IOCTL_H 
+#include <sys/ioctl.h> 
+#endif 
+#ifdef HAVE_SYS_PARAM_H 
+#include <sys/param.h> 
+#endif 
+ 
+#ifdef __VMS 
+#include <in.h> 
+#include <inet.h> 
+#endif 
+ 
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
 
-#ifndef HAVE_SOCKET
-#error "We can't compile without socket() support!"
-#endif
-
-#include <limits.h>
-
+#ifndef HAVE_SOCKET 
+#error "We can't compile without socket() support!" 
+#endif 
+ 
+#include <limits.h> 
+ 
 #ifdef USE_LIBIDN2
 #error #include <idn2.h>
 
-#elif defined(USE_WIN32_IDN)
-/* prototype for curl_win32_idn_to_ascii() */
+#elif defined(USE_WIN32_IDN) 
+/* prototype for curl_win32_idn_to_ascii() */ 
 bool curl_win32_idn_to_ascii(const char *in, char **out);
 #endif  /* USE_LIBIDN2 */
-
-#include "urldata.h"
-#include "netrc.h"
-
-#include "formdata.h"
+ 
+#include "urldata.h" 
+#include "netrc.h" 
+ 
+#include "formdata.h" 
 #include "mime.h"
 #include "vtls/vtls.h"
-#include "hostip.h"
-#include "transfer.h"
-#include "sendf.h"
-#include "progress.h"
-#include "cookie.h"
+#include "hostip.h" 
+#include "transfer.h" 
+#include "sendf.h" 
+#include "progress.h" 
+#include "cookie.h" 
 #include "strcase.h"
-#include "strerror.h"
-#include "escape.h"
-#include "strtok.h"
-#include "share.h"
-#include "content_encoding.h"
-#include "http_digest.h"
-#include "http_negotiate.h"
-#include "select.h"
-#include "multiif.h"
-#include "easyif.h"
-#include "speedcheck.h"
-#include "warnless.h"
-#include "non-ascii.h"
-#include "inet_pton.h"
+#include "strerror.h" 
+#include "escape.h" 
+#include "strtok.h" 
+#include "share.h" 
+#include "content_encoding.h" 
+#include "http_digest.h" 
+#include "http_negotiate.h" 
+#include "select.h" 
+#include "multiif.h" 
+#include "easyif.h" 
+#include "speedcheck.h" 
+#include "warnless.h" 
+#include "non-ascii.h" 
+#include "inet_pton.h" 
 #include "getinfo.h"
 #include "urlapi-int.h"
 #include "system_win32.h"
 #include "hsts.h"
-
-/* And now for the protocols */
-#include "ftp.h"
-#include "dict.h"
-#include "telnet.h"
-#include "tftp.h"
-#include "http.h"
+ 
+/* And now for the protocols */ 
+#include "ftp.h" 
+#include "dict.h" 
+#include "telnet.h" 
+#include "tftp.h" 
+#include "http.h" 
 #include "http2.h"
-#include "file.h"
-#include "curl_ldap.h"
+#include "file.h" 
+#include "curl_ldap.h" 
 #include "vssh/ssh.h"
-#include "imap.h"
-#include "url.h"
-#include "connect.h"
-#include "inet_ntop.h"
+#include "imap.h" 
+#include "url.h" 
+#include "connect.h" 
+#include "inet_ntop.h" 
 #include "http_ntlm.h"
-#include "curl_rtmp.h"
-#include "gopher.h"
+#include "curl_rtmp.h" 
+#include "gopher.h" 
 #include "mqtt.h"
-#include "http_proxy.h"
-#include "conncache.h"
-#include "multihandle.h"
-#include "dotdot.h"
+#include "http_proxy.h" 
+#include "conncache.h" 
+#include "multihandle.h" 
+#include "dotdot.h" 
 #include "strdup.h"
 #include "setopt.h"
 #include "altsvc.h"
 #include "dynbuf.h"
-
+ 
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
-#include "curl_memory.h"
-#include "memdebug.h"
-
-static void conn_free(struct connectdata *conn);
+#include "curl_memory.h" 
+#include "memdebug.h" 
+ 
+static void conn_free(struct connectdata *conn); 
 
 /* Some parts of the code (e.g. chunked encoding) assume this buffer has at
  * more than just a few bytes to play with. Don't let it become too small or
@@ -159,38 +159,38 @@ static unsigned int get_protocol_family(const struct Curl_handler *h)
 }
 
 
-/*
+/* 
  * Protocol table. Schemes (roughly) in 2019 popularity order:
  *
  * HTTPS, HTTP, FTP, FTPS, SFTP, FILE, SCP, SMTP, LDAP, IMAPS, TELNET, IMAP,
  * LDAPS, SMTPS, TFTP, SMB, POP3, GOPHER POP3S, RTSP, RTMP, SMBS, DICT
- */
-static const struct Curl_handler * const protocols[] = {
-
+ */ 
+static const struct Curl_handler * const protocols[] = { 
+ 
 #if defined(USE_SSL) && !defined(CURL_DISABLE_HTTP)
   &Curl_handler_https,
 #endif
 
-#ifndef CURL_DISABLE_HTTP
-  &Curl_handler_http,
-#endif
-
-#ifndef CURL_DISABLE_FTP
-  &Curl_handler_ftp,
-#endif
-
-#if defined(USE_SSL) && !defined(CURL_DISABLE_FTP)
-  &Curl_handler_ftps,
-#endif
-
+#ifndef CURL_DISABLE_HTTP 
+  &Curl_handler_http, 
+#endif 
+ 
+#ifndef CURL_DISABLE_FTP 
+  &Curl_handler_ftp, 
+#endif 
+ 
+#if defined(USE_SSL) && !defined(CURL_DISABLE_FTP) 
+  &Curl_handler_ftps, 
+#endif 
+ 
 #if defined(USE_SSH)
   &Curl_handler_sftp,
-#endif
-
+#endif 
+ 
 #ifndef CURL_DISABLE_FILE
   &Curl_handler_file,
-#endif
-
+#endif 
+ 
 #if defined(USE_SSH) && !defined(USE_WOLFSSH)
   &Curl_handler_scp,
 #endif
@@ -202,37 +202,37 @@ static const struct Curl_handler * const protocols[] = {
 #endif
 #endif
 
-#ifndef CURL_DISABLE_LDAP
-  &Curl_handler_ldap,
-#if !defined(CURL_DISABLE_LDAPS) && \
-    ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \
-     (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))
-  &Curl_handler_ldaps,
-#endif
-#endif
-
+#ifndef CURL_DISABLE_LDAP 
+  &Curl_handler_ldap, 
+#if !defined(CURL_DISABLE_LDAPS) && \ 
+    ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \ 
+     (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))) 
+  &Curl_handler_ldaps, 
+#endif 
+#endif 
+ 
 #ifndef CURL_DISABLE_IMAP
   &Curl_handler_imap,
 #ifdef USE_SSL
   &Curl_handler_imaps,
-#endif
-#endif
-
+#endif 
+#endif 
+ 
 #ifndef CURL_DISABLE_TELNET
   &Curl_handler_telnet,
 #endif
 
 #ifndef CURL_DISABLE_TFTP
   &Curl_handler_tftp,
-#endif
-
-#ifndef CURL_DISABLE_POP3
-  &Curl_handler_pop3,
-#ifdef USE_SSL
-  &Curl_handler_pop3s,
-#endif
-#endif
-
+#endif 
+ 
+#ifndef CURL_DISABLE_POP3 
+  &Curl_handler_pop3, 
+#ifdef USE_SSL 
+  &Curl_handler_pop3s, 
+#endif 
+#endif 
+ 
 #if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \
    (CURL_SIZEOF_CURL_OFF_T > 4)
   &Curl_handler_smb,
@@ -241,91 +241,91 @@ static const struct Curl_handler * const protocols[] = {
 #endif
 #endif
 
-#ifndef CURL_DISABLE_RTSP
-  &Curl_handler_rtsp,
-#endif
-
+#ifndef CURL_DISABLE_RTSP 
+  &Curl_handler_rtsp, 
+#endif 
+ 
 #ifndef CURL_DISABLE_MQTT
   &Curl_handler_mqtt,
 #endif
 
-#ifndef CURL_DISABLE_GOPHER
-  &Curl_handler_gopher,
-#endif
-
-#ifdef USE_LIBRTMP
-  &Curl_handler_rtmp,
-  &Curl_handler_rtmpt,
-  &Curl_handler_rtmpe,
-  &Curl_handler_rtmpte,
-  &Curl_handler_rtmps,
-  &Curl_handler_rtmpts,
-#endif
-
+#ifndef CURL_DISABLE_GOPHER 
+  &Curl_handler_gopher, 
+#endif 
+ 
+#ifdef USE_LIBRTMP 
+  &Curl_handler_rtmp, 
+  &Curl_handler_rtmpt, 
+  &Curl_handler_rtmpe, 
+  &Curl_handler_rtmpte, 
+  &Curl_handler_rtmps, 
+  &Curl_handler_rtmpts, 
+#endif 
+ 
 #ifndef CURL_DISABLE_DICT
   &Curl_handler_dict,
 #endif
 
-  (struct Curl_handler *) NULL
-};
-
-/*
- * Dummy handler for undefined protocol schemes.
- */
-
-static const struct Curl_handler Curl_handler_dummy = {
-  "<no protocol>",                      /* scheme */
-  ZERO_NULL,                            /* setup_connection */
-  ZERO_NULL,                            /* do_it */
-  ZERO_NULL,                            /* done */
-  ZERO_NULL,                            /* do_more */
-  ZERO_NULL,                            /* connect_it */
-  ZERO_NULL,                            /* connecting */
-  ZERO_NULL,                            /* doing */
-  ZERO_NULL,                            /* proto_getsock */
-  ZERO_NULL,                            /* doing_getsock */
-  ZERO_NULL,                            /* domore_getsock */
-  ZERO_NULL,                            /* perform_getsock */
-  ZERO_NULL,                            /* disconnect */
-  ZERO_NULL,                            /* readwrite */
+  (struct Curl_handler *) NULL 
+}; 
+ 
+/* 
+ * Dummy handler for undefined protocol schemes. 
+ */ 
+ 
+static const struct Curl_handler Curl_handler_dummy = { 
+  "<no protocol>",                      /* scheme */ 
+  ZERO_NULL,                            /* setup_connection */ 
+  ZERO_NULL,                            /* do_it */ 
+  ZERO_NULL,                            /* done */ 
+  ZERO_NULL,                            /* do_more */ 
+  ZERO_NULL,                            /* connect_it */ 
+  ZERO_NULL,                            /* connecting */ 
+  ZERO_NULL,                            /* doing */ 
+  ZERO_NULL,                            /* proto_getsock */ 
+  ZERO_NULL,                            /* doing_getsock */ 
+  ZERO_NULL,                            /* domore_getsock */ 
+  ZERO_NULL,                            /* perform_getsock */ 
+  ZERO_NULL,                            /* disconnect */ 
+  ZERO_NULL,                            /* readwrite */ 
   ZERO_NULL,                            /* connection_check */
-  0,                                    /* defport */
-  0,                                    /* protocol */
+  0,                                    /* defport */ 
+  0,                                    /* protocol */ 
   0,                                    /* family */
-  PROTOPT_NONE                          /* flags */
-};
-
+  PROTOPT_NONE                          /* flags */ 
+}; 
+ 
 void Curl_freeset(struct Curl_easy *data)
-{
-  /* Free all dynamic strings stored in the data->set substructure. */
-  enum dupstring i;
+{ 
+  /* Free all dynamic strings stored in the data->set substructure. */ 
+  enum dupstring i; 
   enum dupblob j;
 
   for(i = (enum dupstring)0; i < STRING_LAST; i++) {
-    Curl_safefree(data->set.str[i]);
+    Curl_safefree(data->set.str[i]); 
   }
-
+ 
   for(j = (enum dupblob)0; j < BLOB_LAST; j++) {
     Curl_safefree(data->set.blobs[j]);
   }
 
-  if(data->change.referer_alloc) {
-    Curl_safefree(data->change.referer);
-    data->change.referer_alloc = FALSE;
-  }
-  data->change.referer = NULL;
+  if(data->change.referer_alloc) { 
+    Curl_safefree(data->change.referer); 
+    data->change.referer_alloc = FALSE; 
+  } 
+  data->change.referer = NULL; 
   if(data->change.url_alloc) {
     Curl_safefree(data->change.url);
     data->change.url_alloc = FALSE;
-  }
+  } 
   data->change.url = NULL;
-
+ 
   Curl_mime_cleanpart(&data->set.mimepost);
-}
-
+} 
+ 
 /* free the URL pieces */
 static void up_free(struct Curl_easy *data)
-{
+{ 
   struct urlpieces *up = &data->state.up;
   Curl_safefree(up->scheme);
   Curl_safefree(up->hostname);
@@ -337,74 +337,74 @@ static void up_free(struct Curl_easy *data)
   Curl_safefree(up->query);
   curl_url_cleanup(data->state.uh);
   data->state.uh = NULL;
-}
-
-/*
- * This is the internal function curl_easy_cleanup() calls. This should
- * cleanup and free all resources associated with this sessionhandle.
- *
- * NOTE: if we ever add something that attempts to write to a socket or
- * similar here, we must ignore SIGPIPE first. It is currently only done
- * when curl_easy_perform() is invoked.
- */
-
+} 
+ 
+/* 
+ * This is the internal function curl_easy_cleanup() calls. This should 
+ * cleanup and free all resources associated with this sessionhandle. 
+ * 
+ * NOTE: if we ever add something that attempts to write to a socket or 
+ * similar here, we must ignore SIGPIPE first. It is currently only done 
+ * when curl_easy_perform() is invoked. 
+ */ 
+ 
 CURLcode Curl_close(struct Curl_easy **datap)
-{
-  struct Curl_multi *m;
+{ 
+  struct Curl_multi *m; 
   struct Curl_easy *data;
-
+ 
   if(!datap || !*datap)
-    return CURLE_OK;
-
+    return CURLE_OK; 
+ 
   data = *datap;
   *datap = NULL;
 
   Curl_expire_clear(data); /* shut off timers */
-
-  m = data->multi;
-  if(m)
-    /* This handle is still part of a multi handle, take care of this first
-       and detach this handle from there. */
-    curl_multi_remove_handle(data->multi, data);
-
+ 
+  m = data->multi; 
+  if(m) 
+    /* This handle is still part of a multi handle, take care of this first 
+       and detach this handle from there. */ 
+    curl_multi_remove_handle(data->multi, data); 
+ 
   if(data->multi_easy) {
-    /* when curl_easy_perform() is used, it creates its own multi handle to
-       use and this is the one */
-    curl_multi_cleanup(data->multi_easy);
+    /* when curl_easy_perform() is used, it creates its own multi handle to 
+       use and this is the one */ 
+    curl_multi_cleanup(data->multi_easy); 
     data->multi_easy = NULL;
   }
-
-  /* Destroy the timeout list that is held in the easy handle. It is
-     /normally/ done by curl_multi_remove_handle() but this is "just in
-     case" */
+ 
+  /* Destroy the timeout list that is held in the easy handle. It is 
+     /normally/ done by curl_multi_remove_handle() but this is "just in 
+     case" */ 
   Curl_llist_destroy(&data->state.timeoutlist, NULL);
-
-  data->magic = 0; /* force a clear AFTER the possibly enforced removal from
-                      the multi handle, since that function uses the magic
-                      field! */
-
-  if(data->state.rangestringalloc)
-    free(data->state.range);
-
-  /* freed here just in case DONE wasn't called */
-  Curl_free_request_state(data);
-
-  /* Close down all open SSL info and sessions */
-  Curl_ssl_close_all(data);
-  Curl_safefree(data->state.first_host);
-  Curl_safefree(data->state.scratch);
-  Curl_ssl_free_certinfo(data);
-
+ 
+  data->magic = 0; /* force a clear AFTER the possibly enforced removal from 
+                      the multi handle, since that function uses the magic 
+                      field! */ 
+ 
+  if(data->state.rangestringalloc) 
+    free(data->state.range); 
+ 
+  /* freed here just in case DONE wasn't called */ 
+  Curl_free_request_state(data); 
+ 
+  /* Close down all open SSL info and sessions */ 
+  Curl_ssl_close_all(data); 
+  Curl_safefree(data->state.first_host); 
+  Curl_safefree(data->state.scratch); 
+  Curl_ssl_free_certinfo(data); 
+ 
   /* Cleanup possible redirect junk */
   free(data->req.newurl);
   data->req.newurl = NULL;
 
-  if(data->change.referer_alloc) {
-    Curl_safefree(data->change.referer);
-    data->change.referer_alloc = FALSE;
-  }
-  data->change.referer = NULL;
-
+  if(data->change.referer_alloc) { 
+    Curl_safefree(data->change.referer); 
+    data->change.referer_alloc = FALSE; 
+  } 
+  data->change.referer = NULL; 
+ 
   up_free(data);
   Curl_safefree(data->state.buffer);
   Curl_dyn_free(&data->state.headerb);
@@ -417,22 +417,22 @@ CURLcode Curl_close(struct Curl_easy **datap)
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
   Curl_http_auth_cleanup_digest(data);
 #endif
-  Curl_safefree(data->info.contenttype);
-  Curl_safefree(data->info.wouldredirect);
-
-  /* this destroys the channel and we cannot use it anymore after this */
-  Curl_resolver_cleanup(data->state.resolver);
-
+  Curl_safefree(data->info.contenttype); 
+  Curl_safefree(data->info.wouldredirect); 
+ 
+  /* this destroys the channel and we cannot use it anymore after this */ 
+  Curl_resolver_cleanup(data->state.resolver); 
+ 
   Curl_http2_cleanup_dependencies(data);
-  Curl_convert_close(data);
-
-  /* No longer a dirty share, if it exists */
-  if(data->share) {
-    Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE);
-    data->share->dirty--;
-    Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
-  }
-
+  Curl_convert_close(data); 
+ 
+  /* No longer a dirty share, if it exists */ 
+  if(data->share) { 
+    Curl_share_lock(data, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE); 
+    data->share->dirty--; 
+    Curl_share_unlock(data, CURL_LOCK_DATA_SHARE); 
+  } 
+ 
   Curl_safefree(data->state.aptr.proxyuserpwd);
   Curl_safefree(data->state.aptr.uagent);
   Curl_safefree(data->state.aptr.userpwd);
@@ -452,106 +452,106 @@ CURLcode Curl_close(struct Curl_easy **datap)
 
   /* destruct wildcard structures if it is needed */
   Curl_wildcard_dtor(&data->wildcard);
-  Curl_freeset(data);
-  free(data);
-  return CURLE_OK;
-}
-
-/*
+  Curl_freeset(data); 
+  free(data); 
+  return CURLE_OK; 
+} 
+ 
+/* 
  * Initialize the UserDefined fields within a Curl_easy.
  * This may be safely called on a new or existing Curl_easy.
- */
+ */ 
 CURLcode Curl_init_userdefined(struct Curl_easy *data)
-{
+{ 
   struct UserDefined *set = &data->set;
   CURLcode result = CURLE_OK;
-
-  set->out = stdout; /* default output to stdout */
+ 
+  set->out = stdout; /* default output to stdout */ 
   set->in_set = stdin;  /* default input from stdin */
-  set->err  = stderr;  /* default stderr to stderr */
-
-  /* use fwrite as default function to store output */
-  set->fwrite_func = (curl_write_callback)fwrite;
-
-  /* use fread as default function to read input */
+  set->err  = stderr;  /* default stderr to stderr */ 
+ 
+  /* use fwrite as default function to store output */ 
+  set->fwrite_func = (curl_write_callback)fwrite; 
+ 
+  /* use fread as default function to read input */ 
   set->fread_func_set = (curl_read_callback)fread;
-  set->is_fread_set = 0;
-  set->is_fwrite_set = 0;
-
-  set->seek_func = ZERO_NULL;
-  set->seek_client = ZERO_NULL;
-
-  /* conversion callbacks for non-ASCII hosts */
-  set->convfromnetwork = ZERO_NULL;
-  set->convtonetwork   = ZERO_NULL;
-  set->convfromutf8    = ZERO_NULL;
-
+  set->is_fread_set = 0; 
+  set->is_fwrite_set = 0; 
+ 
+  set->seek_func = ZERO_NULL; 
+  set->seek_client = ZERO_NULL; 
+ 
+  /* conversion callbacks for non-ASCII hosts */ 
+  set->convfromnetwork = ZERO_NULL; 
+  set->convtonetwork   = ZERO_NULL; 
+  set->convfromutf8    = ZERO_NULL; 
+ 
   set->filesize = -1;        /* we don't know the size */
-  set->postfieldsize = -1;   /* unknown size */
-  set->maxredirs = -1;       /* allow any amount by default */
-
+  set->postfieldsize = -1;   /* unknown size */ 
+  set->maxredirs = -1;       /* allow any amount by default */ 
+ 
   set->method = HTTPREQ_GET; /* Default HTTP request */
-  set->rtspreq = RTSPREQ_OPTIONS; /* Default RTSP request */
+  set->rtspreq = RTSPREQ_OPTIONS; /* Default RTSP request */ 
 #ifndef CURL_DISABLE_FTP
-  set->ftp_use_epsv = TRUE;   /* FTP defaults to EPSV operations */
-  set->ftp_use_eprt = TRUE;   /* FTP defaults to EPRT operations */
-  set->ftp_use_pret = FALSE;  /* mainly useful for drftpd servers */
-  set->ftp_filemethod = FTPFILE_MULTICWD;
+  set->ftp_use_epsv = TRUE;   /* FTP defaults to EPSV operations */ 
+  set->ftp_use_eprt = TRUE;   /* FTP defaults to EPRT operations */ 
+  set->ftp_use_pret = FALSE;  /* mainly useful for drftpd servers */ 
+  set->ftp_filemethod = FTPFILE_MULTICWD; 
   set->ftp_skip_ip = TRUE;    /* skip PASV IP by default */
 #endif
-  set->dns_cache_timeout = 60; /* Timeout every 60 seconds by default */
-
-  /* Set the default size of the SSL session ID cache */
+  set->dns_cache_timeout = 60; /* Timeout every 60 seconds by default */ 
+ 
+  /* Set the default size of the SSL session ID cache */ 
   set->general_ssl.max_ssl_sessions = 5;
-
+ 
   set->proxyport = 0;
-  set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
-  set->httpauth = CURLAUTH_BASIC;  /* defaults to basic */
-  set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */
-
+  set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */ 
+  set->httpauth = CURLAUTH_BASIC;  /* defaults to basic */ 
+  set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */ 
+ 
   /* SOCKS5 proxy auth defaults to username/password + GSS-API */
   set->socks5auth = CURLAUTH_BASIC | CURLAUTH_GSSAPI;
 
-  /* make libcurl quiet by default: */
-  set->hide_progress = TRUE;  /* CURLOPT_NOPROGRESS changes these */
-
+  /* make libcurl quiet by default: */ 
+  set->hide_progress = TRUE;  /* CURLOPT_NOPROGRESS changes these */ 
+ 
   Curl_mime_initpart(&set->mimepost, data);
 
-  /*
-   * libcurl 7.10 introduced SSL verification *by default*! This needs to be
-   * switched off unless wanted.
-   */
+  /* 
+   * libcurl 7.10 introduced SSL verification *by default*! This needs to be 
+   * switched off unless wanted. 
+   */ 
   set->ssl.primary.verifypeer = TRUE;
   set->ssl.primary.verifyhost = TRUE;
-#ifdef USE_TLS_SRP
-  set->ssl.authtype = CURL_TLSAUTH_NONE;
-#endif
-  set->ssh_auth_types = CURLSSH_AUTH_DEFAULT; /* defaults to any auth
-                                                      type */
+#ifdef USE_TLS_SRP 
+  set->ssl.authtype = CURL_TLSAUTH_NONE; 
+#endif 
+  set->ssh_auth_types = CURLSSH_AUTH_DEFAULT; /* defaults to any auth 
+                                                      type */ 
   set->ssl.primary.sessionid = TRUE; /* session ID caching enabled by
                                         default */
 #ifndef CURL_DISABLE_PROXY
   set->proxy_ssl = set->ssl;
 #endif
-
-  set->new_file_perms = 0644;    /* Default permissions */
-  set->new_directory_perms = 0755; /* Default permissions */
-
-  /* for the *protocols fields we don't use the CURLPROTO_ALL convenience
-     define since we internally only use the lower 16 bits for the passed
-     in bitmask to not conflict with the private bits */
-  set->allowed_protocols = CURLPROTO_ALL;
+ 
+  set->new_file_perms = 0644;    /* Default permissions */ 
+  set->new_directory_perms = 0755; /* Default permissions */ 
+ 
+  /* for the *protocols fields we don't use the CURLPROTO_ALL convenience 
+     define since we internally only use the lower 16 bits for the passed 
+     in bitmask to not conflict with the private bits */ 
+  set->allowed_protocols = CURLPROTO_ALL; 
   set->redir_protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP |
                          CURLPROTO_FTPS;
-
-#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
-  /*
-   * disallow unprotected protection negotiation NEC reference implementation
-   * seem not to follow rfc1961 section 4.3/4.4
-   */
-  set->socks5_gssapi_nec = FALSE;
-#endif
-
+ 
+#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) 
+  /* 
+   * disallow unprotected protection negotiation NEC reference implementation 
+   * seem not to follow rfc1961 section 4.3/4.4 
+   */ 
+  set->socks5_gssapi_nec = FALSE; 
+#endif 
+ 
   /* Set the default CA cert bundle/path detected/specified at build time.
    *
    * If Schannel is the selected SSL backend then these locations are
@@ -559,7 +559,7 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
    * specified by the user via CURLOPT_CAINFO / --cacert.
    */
   if(Curl_ssl_backend() != CURLSSLBACKEND_SCHANNEL) {
-#if defined(CURL_CA_BUNDLE)
+#if defined(CURL_CA_BUNDLE) 
     result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_ORIG], CURL_CA_BUNDLE);
     if(result)
       return result;
@@ -568,12 +568,12 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
                             CURL_CA_BUNDLE);
     if(result)
       return result;
-#endif
+#endif 
 #if defined(CURL_CA_PATH)
     result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_ORIG], CURL_CA_PATH);
     if(result)
       return result;
-
+ 
     result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], CURL_CA_PATH);
     if(result)
       return result;
@@ -581,11 +581,11 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
   }
 
   set->wildcard_enabled = FALSE;
-  set->chunk_bgn      = ZERO_NULL;
-  set->chunk_end      = ZERO_NULL;
-  set->tcp_keepalive = FALSE;
-  set->tcp_keepintvl = 60;
-  set->tcp_keepidle = 60;
+  set->chunk_bgn      = ZERO_NULL; 
+  set->chunk_end      = ZERO_NULL; 
+  set->tcp_keepalive = FALSE; 
+  set->tcp_keepintvl = 60; 
+  set->tcp_keepidle = 60; 
   set->tcp_fastopen = FALSE;
   set->tcp_nodelay = TRUE;
   set->ssl_enable_npn = TRUE;
@@ -609,67 +609,67 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
     ;
   Curl_http2_init_userset(set);
   return result;
-}
-
-/**
- * Curl_open()
- *
- * @param curl is a pointer to a sessionhandle pointer that gets set by this
- * function.
- * @return CURLcode
- */
-
+} 
+ 
+/** 
+ * Curl_open() 
+ * 
+ * @param curl is a pointer to a sessionhandle pointer that gets set by this 
+ * function. 
+ * @return CURLcode 
+ */ 
+ 
 CURLcode Curl_open(struct Curl_easy **curl)
-{
+{ 
   CURLcode result;
   struct Curl_easy *data;
-
-  /* Very simple start-up: alloc the struct, init it with zeroes and return */
+ 
+  /* Very simple start-up: alloc the struct, init it with zeroes and return */ 
   data = calloc(1, sizeof(struct Curl_easy));
-  if(!data) {
-    /* this is a very serious error */
+  if(!data) { 
+    /* this is a very serious error */ 
     DEBUGF(fprintf(stderr, "Error: calloc of Curl_easy failed\n"));
-    return CURLE_OUT_OF_MEMORY;
-  }
-
-  data->magic = CURLEASY_MAGIC_NUMBER;
-
+    return CURLE_OUT_OF_MEMORY; 
+  } 
+ 
+  data->magic = CURLEASY_MAGIC_NUMBER; 
+ 
   result = Curl_resolver_init(data, &data->state.resolver);
   if(result) {
-    DEBUGF(fprintf(stderr, "Error: resolver_init failed\n"));
-    free(data);
+    DEBUGF(fprintf(stderr, "Error: resolver_init failed\n")); 
+    free(data); 
     return result;
-  }
-
+  } 
+ 
   result = Curl_init_userdefined(data);
   if(!result) {
     Curl_dyn_init(&data->state.headerb, CURL_MAX_HTTP_HEADER);
     Curl_convert_init(data);
     Curl_initinfo(data);
-
+ 
     /* most recent connection is not yet defined */
     data->state.lastconnect_id = -1;
-
+ 
     data->progress.flags |= PGRS_HIDE;
     data->state.current_speed = -1; /* init to negative == impossible */
-  }
-
+  } 
+ 
   if(result) {
-    Curl_resolver_cleanup(data->state.resolver);
+    Curl_resolver_cleanup(data->state.resolver); 
     Curl_dyn_free(&data->state.headerb);
-    Curl_freeset(data);
-    free(data);
-    data = NULL;
-  }
-  else
-    *curl = data;
-
+    Curl_freeset(data); 
+    free(data); 
+    data = NULL; 
+  } 
+  else 
+    *curl = data; 
+ 
   return result;
-}
-
+} 
+ 
 #ifdef USE_RECV_BEFORE_SEND_WORKAROUND
 static void conn_reset_postponed_data(struct connectdata *conn, int num)
-{
+{ 
   struct postponed_data * const psnd = &(conn->postponed[num]);
   if(psnd->buffer) {
     DEBUGASSERT(psnd->allocated_size > 0);
@@ -686,51 +686,51 @@ static void conn_reset_postponed_data(struct connectdata *conn, int num)
 #ifdef DEBUGBUILD
     psnd->bindsock = CURL_SOCKET_BAD; /* used only for DEBUGASSERT */
 #endif /* DEBUGBUILD */
-  }
+  } 
   else {
     DEBUGASSERT(psnd->allocated_size == 0);
     DEBUGASSERT(psnd->recv_size == 0);
     DEBUGASSERT(psnd->recv_processed == 0);
     DEBUGASSERT(psnd->bindsock == CURL_SOCKET_BAD);
-  }
+  } 
 }
-
+ 
 static void conn_reset_all_postponed_data(struct connectdata *conn)
 {
   conn_reset_postponed_data(conn, 0);
   conn_reset_postponed_data(conn, 1);
-}
+} 
 #else  /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
 /* Use "do-nothing" macro instead of function when workaround not used */
 #define conn_reset_all_postponed_data(c) do {} while(0)
 #endif /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-
+ 
 
 static void conn_shutdown(struct connectdata *conn)
-{
+{ 
   DEBUGASSERT(conn);
   infof(conn->data, "Closing connection %ld\n", conn->connection_id);
   DEBUGASSERT(conn->data);
 
-  /* possible left-overs from the async name resolvers */
-  Curl_resolver_cancel(conn);
-
-  /* close the SSL stuff before we close any sockets since they will/may
-     write to the sockets */
-  Curl_ssl_close(conn, FIRSTSOCKET);
-  Curl_ssl_close(conn, SECONDARYSOCKET);
-
-  /* close possibly still open sockets */
-  if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
-    Curl_closesocket(conn, conn->sock[SECONDARYSOCKET]);
-  if(CURL_SOCKET_BAD != conn->sock[FIRSTSOCKET])
-    Curl_closesocket(conn, conn->sock[FIRSTSOCKET]);
+  /* possible left-overs from the async name resolvers */ 
+  Curl_resolver_cancel(conn); 
+ 
+  /* close the SSL stuff before we close any sockets since they will/may 
+     write to the sockets */ 
+  Curl_ssl_close(conn, FIRSTSOCKET); 
+  Curl_ssl_close(conn, SECONDARYSOCKET); 
+ 
+  /* close possibly still open sockets */ 
+  if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET]) 
+    Curl_closesocket(conn, conn->sock[SECONDARYSOCKET]); 
+  if(CURL_SOCKET_BAD != conn->sock[FIRSTSOCKET]) 
+    Curl_closesocket(conn, conn->sock[FIRSTSOCKET]); 
   if(CURL_SOCKET_BAD != conn->tempsock[0])
     Curl_closesocket(conn, conn->tempsock[0]);
   if(CURL_SOCKET_BAD != conn->tempsock[1])
     Curl_closesocket(conn, conn->tempsock[1]);
 }
-
+ 
 static void conn_free(struct connectdata *conn)
 {
   DEBUGASSERT(conn);
@@ -748,22 +748,22 @@ static void conn_free(struct connectdata *conn)
   Curl_safefree(conn->socks_proxy.host.rawalloc); /* socks proxy name buffer */
   Curl_free_primary_ssl_config(&conn->proxy_ssl_config);
 #endif
-  Curl_safefree(conn->user);
-  Curl_safefree(conn->passwd);
+  Curl_safefree(conn->user); 
+  Curl_safefree(conn->passwd); 
   Curl_safefree(conn->sasl_authzid);
-  Curl_safefree(conn->options);
+  Curl_safefree(conn->options); 
   Curl_dyn_free(&conn->trailer);
-  Curl_safefree(conn->host.rawalloc); /* host name buffer */
+  Curl_safefree(conn->host.rawalloc); /* host name buffer */ 
   Curl_safefree(conn->conn_to_host.rawalloc); /* host name buffer */
   Curl_safefree(conn->hostname_resolve);
   Curl_safefree(conn->secondaryhostname);
   Curl_safefree(conn->connect_state);
-
+ 
   conn_reset_all_postponed_data(conn);
   Curl_llist_destroy(&conn->easyq, NULL);
-  Curl_safefree(conn->localdev);
+  Curl_safefree(conn->localdev); 
   Curl_free_primary_ssl_config(&conn->ssl_config);
-
+ 
 #ifdef USE_UNIX_SOCKETS
   Curl_safefree(conn->unix_domain_socket);
 #endif
@@ -771,9 +771,9 @@ static void conn_free(struct connectdata *conn)
 #ifdef USE_SSL
   Curl_safefree(conn->ssl_extra);
 #endif
-  free(conn); /* free all the connection oriented data */
-}
-
+  free(conn); /* free all the connection oriented data */ 
+} 
+ 
 /*
  * Disconnects the given connection. Note the connection may not be the
  * primary connection, like when freeing room in the connection cache or
@@ -790,13 +790,13 @@ static void conn_free(struct connectdata *conn)
 
 CURLcode Curl_disconnect(struct Curl_easy *data,
                          struct connectdata *conn, bool dead_connection)
-{
+{ 
   /* there must be a connection to close */
   DEBUGASSERT(conn);
-
+ 
   /* it must be removed from the connection cache */
   DEBUGASSERT(!conn->bundle);
-
+ 
   /* there must be an associated transfer */
   DEBUGASSERT(data);
 
@@ -812,17 +812,17 @@ CURLcode Curl_disconnect(struct Curl_easy *data,
     return CURLE_OK;
   }
 
-  if(conn->dns_entry != NULL) {
-    Curl_resolv_unlock(data, conn->dns_entry);
-    conn->dns_entry = NULL;
-  }
-
-  /* Cleanup NTLM connection-related data */
+  if(conn->dns_entry != NULL) { 
+    Curl_resolv_unlock(data, conn->dns_entry); 
+    conn->dns_entry = NULL; 
+  } 
+ 
+  /* Cleanup NTLM connection-related data */ 
   Curl_http_auth_cleanup_ntlm(conn);
 
   /* Cleanup NEGOTIATE connection-related data */
   Curl_http_auth_cleanup_negotiate(conn);
-
+ 
   /* the protocol specific disconnect handler and conn_shutdown need a transfer
      for the connection! */
   conn->data = data;
@@ -831,33 +831,33 @@ CURLcode Curl_disconnect(struct Curl_easy *data,
     /* treat the connection as dead in CONNECT_ONLY situations */
     dead_connection = TRUE;
 
-  if(conn->handler->disconnect)
-    /* This is set if protocol-specific cleanups should be made */
-    conn->handler->disconnect(conn, dead_connection);
-
+  if(conn->handler->disconnect) 
+    /* This is set if protocol-specific cleanups should be made */ 
+    conn->handler->disconnect(conn, dead_connection); 
+ 
   conn_shutdown(conn);
-  conn_free(conn);
-  return CURLE_OK;
-}
-
-/*
- * This function should return TRUE if the socket is to be assumed to
- * be dead. Most commonly this happens when the server has closed the
- * connection due to inactivity.
- */
-static bool SocketIsDead(curl_socket_t sock)
-{
-  int sval;
-  bool ret_val = TRUE;
-
+  conn_free(conn); 
+  return CURLE_OK; 
+} 
+ 
+/* 
+ * This function should return TRUE if the socket is to be assumed to 
+ * be dead. Most commonly this happens when the server has closed the 
+ * connection due to inactivity. 
+ */ 
+static bool SocketIsDead(curl_socket_t sock) 
+{ 
+  int sval; 
+  bool ret_val = TRUE; 
+ 
   sval = SOCKET_READABLE(sock, 0);
-  if(sval == 0)
-    /* timeout */
-    ret_val = FALSE;
-
-  return ret_val;
-}
-
+  if(sval == 0) 
+    /* timeout */ 
+    ret_val = FALSE; 
+ 
+  return ret_val; 
+} 
+ 
 /*
  * IsMultiplexingPossible()
  *
@@ -866,33 +866,33 @@ static bool SocketIsDead(curl_socket_t sock)
  */
 static int IsMultiplexingPossible(const struct Curl_easy *handle,
                                   const struct connectdata *conn)
-{
+{ 
   int avail = 0;
-
+ 
   /* If a HTTP protocol and multiplexing is enabled */
   if((conn->handler->protocol & PROTO_FAMILY_HTTP) &&
      (!conn->bits.protoconnstart || !conn->bits.close)) {
-
+ 
     if(Curl_multiplex_wanted(handle->multi) &&
        (handle->set.httpversion >= CURL_HTTP_VERSION_2))
       /* allows HTTP/2 */
       avail |= CURLPIPE_MULTIPLEX;
   }
   return avail;
-}
-
+} 
+ 
 #ifndef CURL_DISABLE_PROXY
 static bool
 proxy_info_matches(const struct proxy_info *data,
                    const struct proxy_info *needle)
-{
+{ 
   if((data->proxytype == needle->proxytype) &&
      (data->port == needle->port) &&
      Curl_safe_strcasecompare(data->host.name, needle->host.name))
     return TRUE;
-
+ 
   return FALSE;
-}
+} 
 
 static bool
 socks_proxy_info_matches(const struct proxy_info *data,
@@ -925,7 +925,7 @@ socks_proxy_info_matches(const struct proxy_info *data,
 #define proxy_info_matches(x,y) FALSE
 #define socks_proxy_info_matches(x,y) FALSE
 #endif
-
+ 
 /* A connection has to have been idle for a shorter time than 'maxage_conn' to
    be subject for reuse. The success rate is just too low after this. */
 
@@ -946,18 +946,18 @@ static bool conn_maxage(struct Curl_easy *data,
   return FALSE;
 }
 
-/*
+/* 
  * This function checks if the given connection is dead and extracts it from
  * the connection cache if so.
- *
+ * 
  * When this is called as a Curl_conncache_foreach() callback, the connection
  * cache lock is held!
  *
  * Returns TRUE if the connection was dead and extracted.
- */
+ */ 
 static bool extract_if_dead(struct connectdata *conn,
                             struct Curl_easy *data)
-{
+{ 
   if(!CONN_INUSE(conn) && !conn->data) {
     /* The check for a dead socket makes sense only if the connection isn't in
        use */
@@ -980,27 +980,27 @@ static bool extract_if_dead(struct connectdata *conn,
       /* Use the general method for determining the death of a connection */
       dead = SocketIsDead(conn->sock[FIRSTSOCKET]);
     }
-
+ 
     if(dead) {
       infof(data, "Connection %ld seems to be dead!\n", conn->connection_id);
       Curl_conncache_remove_conn(data, conn, FALSE);
       return TRUE;
-    }
-  }
+    } 
+  } 
   return FALSE;
-}
-
+} 
+ 
 struct prunedead {
   struct Curl_easy *data;
   struct connectdata *extracted;
 };
 
-/*
+/* 
  * Wrapper to use extract_if_dead() function in Curl_conncache_foreach()
- *
- */
+ * 
+ */ 
 static int call_extract_if_dead(struct connectdata *conn, void *param)
-{
+{ 
   struct prunedead *p = (struct prunedead *)param;
   if(extract_if_dead(conn, p->data)) {
     /* stop the iteration here, pass back the connection that was extracted */
@@ -1009,7 +1009,7 @@ static int call_extract_if_dead(struct connectdata *conn, void *param)
   }
   return 0; /* continue iteration */
 }
-
+ 
 /*
  * This function scans the connection cache for half-open/dead connections,
  * closes and removes them.
@@ -1024,7 +1024,7 @@ static void prune_dead_connections(struct Curl_easy *data)
   elapsed =
     Curl_timediff(now, data->state.conn_cache->last_cleanup);
   CONNCACHE_UNLOCK(data);
-
+ 
   if(elapsed >= 1000L) {
     struct prunedead prune;
     prune.data = data;
@@ -1038,38 +1038,38 @@ static void prune_dead_connections(struct Curl_easy *data)
 
       /* disconnect it */
       (void)Curl_disconnect(data, prune.extracted, TRUE);
-    }
+    } 
     CONNCACHE_LOCK(data);
     data->state.conn_cache->last_cleanup = now;
     CONNCACHE_UNLOCK(data);
-  }
+  } 
 }
-
-/*
- * Given one filled in connection struct (named needle), this function should
- * detect if there already is one that has all the significant details
- * exactly the same and thus should be used instead.
- *
- * If there is a match, this function returns TRUE - and has marked the
- * connection as 'in-use'. It must later be called with ConnectionDone() to
- * return back to 'idle' (unused) state.
- *
+ 
+/* 
+ * Given one filled in connection struct (named needle), this function should 
+ * detect if there already is one that has all the significant details 
+ * exactly the same and thus should be used instead. 
+ * 
+ * If there is a match, this function returns TRUE - and has marked the 
+ * connection as 'in-use'. It must later be called with ConnectionDone() to 
+ * return back to 'idle' (unused) state. 
+ * 
  * The force_reuse flag is set if the connection must be used.
- */
-static bool
+ */ 
+static bool 
 ConnectionExists(struct Curl_easy *data,
-                 struct connectdata *needle,
-                 struct connectdata **usethis,
+                 struct connectdata *needle, 
+                 struct connectdata **usethis, 
                  bool *force_reuse,
                  bool *waitpipe)
-{
-  struct connectdata *check;
-  struct connectdata *chosen = 0;
+{ 
+  struct connectdata *check; 
+  struct connectdata *chosen = 0; 
   bool foundPendingCandidate = FALSE;
   bool canmultiplex = IsMultiplexingPossible(data, needle);
-  struct connectbundle *bundle;
+  struct connectbundle *bundle; 
   const char *hostbundle;
-
+ 
 #ifdef USE_NTLM
   bool wantNTLMhttp = ((data->state.authhost.want &
                       (CURLAUTH_NTLM | CURLAUTH_NTLM_WB)) &&
@@ -1084,21 +1084,21 @@ ConnectionExists(struct Curl_easy *data,
 #endif
 #endif
 
-  *force_reuse = FALSE;
+  *force_reuse = FALSE; 
   *waitpipe = FALSE;
-
+ 
   /* Look up the bundle with all the connections to this particular host.
      Locks the connection cache, beware of early returns! */
   bundle = Curl_conncache_find_bundle(needle, data->state.conn_cache,
                                       &hostbundle);
-  if(bundle) {
+  if(bundle) { 
     /* Max pipe length is zero (unlimited) for multiplexed connections */
     struct Curl_llist_element *curr;
-
+ 
     infof(data, "Found bundle for host %s: %p [%s]\n",
           hostbundle, (void *)bundle, (bundle->multiuse == BUNDLE_MULTIPLEX ?
                                        "can multiplex" : "serially"));
-
+ 
     /* We can't multiplex if we don't know anything about the server */
     if(canmultiplex) {
       if(bundle->multiuse == BUNDLE_UNKNOWN) {
@@ -1121,63 +1121,63 @@ ConnectionExists(struct Curl_easy *data,
         infof(data, "Can not multiplex, even if we wanted to!\n");
         canmultiplex = FALSE;
       }
-    }
-
+    } 
+ 
     curr = bundle->conn_list.head;
-    while(curr) {
-      bool match = FALSE;
+    while(curr) { 
+      bool match = FALSE; 
       size_t multiplexed = 0;
-
-      /*
+ 
+      /* 
        * Note that if we use a HTTP proxy in normal mode (no tunneling), we
        * check connections to that proxy and not to the actual remote server.
-       */
-      check = curr->ptr;
-      curr = curr->next;
-
+       */ 
+      check = curr->ptr; 
+      curr = curr->next; 
+ 
       if(check->bits.connect_only || check->bits.close)
         /* connect-only or to-be-closed connections will not be reused */
         continue;
-
+ 
       if(extract_if_dead(check, data)) {
         /* disconnect it */
         (void)Curl_disconnect(data, check, TRUE);
         continue;
       }
-
+ 
       if(bundle->multiuse == BUNDLE_MULTIPLEX)
         multiplexed = CONN_INUSE(check);
 
       if(canmultiplex) {
         ;
-      }
-      else {
+      } 
+      else { 
         if(multiplexed) {
-          /* can only happen within multi handles, and means that another easy
-             handle is using this connection */
-          continue;
-        }
-
-        if(Curl_resolver_asynch()) {
-          /* ip_addr_str[0] is NUL only if the resolving of the name hasn't
-             completed yet and until then we don't re-use this connection */
-          if(!check->ip_addr_str[0]) {
-            infof(data,
-                  "Connection #%ld is still name resolving, can't reuse\n",
-                  check->connection_id);
-            continue;
-          }
-        }
-
+          /* can only happen within multi handles, and means that another easy 
+             handle is using this connection */ 
+          continue; 
+        } 
+ 
+        if(Curl_resolver_asynch()) { 
+          /* ip_addr_str[0] is NUL only if the resolving of the name hasn't 
+             completed yet and until then we don't re-use this connection */ 
+          if(!check->ip_addr_str[0]) { 
+            infof(data, 
+                  "Connection #%ld is still name resolving, can't reuse\n", 
+                  check->connection_id); 
+            continue; 
+          } 
+        } 
+ 
         if(check->sock[FIRSTSOCKET] == CURL_SOCKET_BAD) {
           foundPendingCandidate = TRUE;
           /* Don't pick a connection that hasn't connected yet */
-          infof(data, "Connection #%ld isn't open enough, can't reuse\n",
-                check->connection_id);
-          continue;
-        }
-      }
-
+          infof(data, "Connection #%ld isn't open enough, can't reuse\n", 
+                check->connection_id); 
+          continue; 
+        } 
+      } 
+ 
 #ifdef USE_UNIX_SOCKETS
       if(needle->unix_domain_socket) {
         if(!check->unix_domain_socket)
@@ -1192,14 +1192,14 @@ ConnectionExists(struct Curl_easy *data,
         continue;
 #endif
 
-      if((needle->handler->flags&PROTOPT_SSL) !=
-         (check->handler->flags&PROTOPT_SSL))
-        /* don't do mixed SSL and non-SSL connections */
+      if((needle->handler->flags&PROTOPT_SSL) != 
+         (check->handler->flags&PROTOPT_SSL)) 
+        /* don't do mixed SSL and non-SSL connections */ 
         if(get_protocol_family(check->handler) !=
            needle->handler->protocol || !check->bits.tls_upgraded)
-          /* except protocols that have been upgraded via TLS */
-          continue;
-
+          /* except protocols that have been upgraded via TLS */ 
+          continue; 
+ 
 #ifndef CURL_DISABLE_PROXY
       if(needle->bits.httpproxy != check->bits.httpproxy ||
          needle->bits.socksproxy != check->bits.socksproxy)
@@ -1223,7 +1223,7 @@ ConnectionExists(struct Curl_easy *data,
 #ifndef CURL_DISABLE_PROXY
       if(needle->bits.httpproxy) {
         if(!proxy_info_matches(&needle->http_proxy, &check->http_proxy))
-          continue;
+          continue; 
 
         if(needle->bits.tunnel_proxy != check->bits.tunnel_proxy)
           continue;
@@ -1246,40 +1246,40 @@ ConnectionExists(struct Curl_easy *data,
               continue;
           }
         }
-      }
+      } 
 #endif
-
+ 
       DEBUGASSERT(!check->data || GOOD_EASY_HANDLE(check->data));
 
       if(!canmultiplex && check->data)
         /* this request can't be multiplexed but the checked connection is
-           already in use so we skip it */
-        continue;
-
+           already in use so we skip it */ 
+        continue; 
+ 
       if(check->data && (check->data->multi != needle->data->multi))
         /* this could be subject for multiplex use, but only if they belong to
          * the same multi handle */
         continue;
 
-      if(needle->localdev || needle->localport) {
-        /* If we are bound to a specific local end (IP+port), we must not
-           re-use a random other one, although if we didn't ask for a
-           particular one we can reuse one that was bound.
-
-           This comparison is a bit rough and too strict. Since the input
-           parameters can be specified in numerous ways and still end up the
-           same it would take a lot of processing to make it really accurate.
-           Instead, this matching will assume that re-uses of bound connections
-           will most likely also re-use the exact same binding parameters and
-           missing out a few edge cases shouldn't hurt anyone very much.
-        */
-        if((check->localport != needle->localport) ||
-           (check->localportrange != needle->localportrange) ||
+      if(needle->localdev || needle->localport) { 
+        /* If we are bound to a specific local end (IP+port), we must not 
+           re-use a random other one, although if we didn't ask for a 
+           particular one we can reuse one that was bound. 
+ 
+           This comparison is a bit rough and too strict. Since the input 
+           parameters can be specified in numerous ways and still end up the 
+           same it would take a lot of processing to make it really accurate. 
+           Instead, this matching will assume that re-uses of bound connections 
+           will most likely also re-use the exact same binding parameters and 
+           missing out a few edge cases shouldn't hurt anyone very much. 
+        */ 
+        if((check->localport != needle->localport) || 
+           (check->localportrange != needle->localportrange) || 
            (needle->localdev &&
             (!check->localdev || strcmp(check->localdev, needle->localdev))))
-          continue;
-      }
-
+          continue; 
+      } 
+ 
       if(!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) {
         /* This protocol requires credentials per connection,
            so verify that we're using the same name and password as well */
@@ -1288,17 +1288,17 @@ ConnectionExists(struct Curl_easy *data,
           /* one of them was different */
           continue;
         }
-      }
-
+      } 
+ 
       if((needle->handler->flags&PROTOPT_SSL)
 #ifndef CURL_DISABLE_PROXY
          || !needle->bits.httpproxy || needle->bits.tunnel_proxy
 #endif
         ) {
-        /* The requested connection does not use a HTTP proxy or it uses SSL or
+        /* The requested connection does not use a HTTP proxy or it uses SSL or 
            it is a non-SSL protocol tunneled or it is a non-SSL protocol which
            is allowed to be upgraded via TLS */
-
+ 
         if((strcasecompare(needle->handler->scheme, check->handler->scheme) ||
             (get_protocol_family(check->handler) ==
              needle->handler->protocol && check->bits.tls_upgraded)) &&
@@ -1307,40 +1307,40 @@ ConnectionExists(struct Curl_easy *data,
            (!needle->bits.conn_to_port ||
              needle->conn_to_port == check->conn_to_port) &&
            strcasecompare(needle->host.name, check->host.name) &&
-           needle->remote_port == check->remote_port) {
+           needle->remote_port == check->remote_port) { 
           /* The schemes match or the protocol family is the same and the
              previous connection was TLS upgraded, and the hostname and host
              port match */
-          if(needle->handler->flags & PROTOPT_SSL) {
-            /* This is a SSL connection so verify that we're using the same
-               SSL options as well */
-            if(!Curl_ssl_config_matches(&needle->ssl_config,
-                                        &check->ssl_config)) {
-              DEBUGF(infof(data,
-                           "Connection #%ld has different SSL parameters, "
-                           "can't reuse\n",
-                           check->connection_id));
-              continue;
-            }
+          if(needle->handler->flags & PROTOPT_SSL) { 
+            /* This is a SSL connection so verify that we're using the same 
+               SSL options as well */ 
+            if(!Curl_ssl_config_matches(&needle->ssl_config, 
+                                        &check->ssl_config)) { 
+              DEBUGF(infof(data, 
+                           "Connection #%ld has different SSL parameters, " 
+                           "can't reuse\n", 
+                           check->connection_id)); 
+              continue; 
+            } 
             if(check->ssl[FIRSTSOCKET].state != ssl_connection_complete) {
               foundPendingCandidate = TRUE;
-              DEBUGF(infof(data,
-                           "Connection #%ld has not started SSL connect, "
-                           "can't reuse\n",
-                           check->connection_id));
-              continue;
-            }
-          }
-          match = TRUE;
-        }
-      }
+              DEBUGF(infof(data, 
+                           "Connection #%ld has not started SSL connect, " 
+                           "can't reuse\n", 
+                           check->connection_id)); 
+              continue; 
+            } 
+          } 
+          match = TRUE; 
+        } 
+      } 
       else {
         /* The requested connection is using the same HTTP proxy in normal
            mode (no tunneling) */
         match = TRUE;
-      }
-
-      if(match) {
+      } 
+ 
+      if(match) { 
 #if defined(USE_NTLM)
         /* If we are looking for an HTTP+NTLM connection, check if this is
            already authenticating with the right credentials. If not, keep
@@ -1362,7 +1362,7 @@ ConnectionExists(struct Curl_easy *data,
           /* Connection is using NTLM auth but we don't want NTLM */
           continue;
         }
-
+ 
 #ifndef CURL_DISABLE_PROXY
         /* Same for Proxy NTLM authentication */
         if(wantProxyNTLMhttp) {
@@ -1388,25 +1388,25 @@ ConnectionExists(struct Curl_easy *data,
              (check->http_ntlm_state != NTLMSTATE_NONE)) ||
               (wantProxyNTLMhttp &&
                (check->proxy_ntlm_state != NTLMSTATE_NONE))) {
-            /* We must use this connection, no other */
-            *force_reuse = TRUE;
-            break;
-          }
+            /* We must use this connection, no other */ 
+            *force_reuse = TRUE; 
+            break; 
+          } 
 
           /* Continue look up for a better connection */
           continue;
-        }
+        } 
 #endif
         if(canmultiplex) {
           /* We can multiplex if we want to. Let's continue looking for
              the optimal connection to use. */
-
+ 
           if(!multiplexed) {
-            /* We have the optimal connection. Let's stop looking. */
-            chosen = check;
-            break;
-          }
-
+            /* We have the optimal connection. Let's stop looking. */ 
+            chosen = check; 
+            break; 
+          } 
+ 
 #ifdef USE_NGHTTP2
           /* If multiplexed, make sure we don't go over concurrency limit */
           if(check->bits.multiplex) {
@@ -1430,102 +1430,102 @@ ConnectionExists(struct Curl_easy *data,
           chosen = check;
           infof(data, "Multiplexed connection found!\n");
           break;
-        }
-        else {
-          /* We have found a connection. Let's stop searching. */
-          chosen = check;
-          break;
-        }
-      }
-    }
-  }
-
-  if(chosen) {
+        } 
+        else { 
+          /* We have found a connection. Let's stop searching. */ 
+          chosen = check; 
+          break; 
+        } 
+      } 
+    } 
+  } 
+ 
+  if(chosen) { 
     /* mark it as used before releasing the lock */
     chosen->data = data; /* own it! */
     Curl_attach_connnection(data, chosen);
     CONNCACHE_UNLOCK(data);
-    *usethis = chosen;
-    return TRUE; /* yes, we found one to use! */
-  }
+    *usethis = chosen; 
+    return TRUE; /* yes, we found one to use! */ 
+  } 
   CONNCACHE_UNLOCK(data);
-
+ 
   if(foundPendingCandidate && data->set.pipewait) {
     infof(data,
           "Found pending candidate for reuse and CURLOPT_PIPEWAIT is set\n");
     *waitpipe = TRUE;
-  }
-
+  } 
+ 
   return FALSE; /* no matching connecting exists */
-}
-
-/*
- * verboseconnect() displays verbose information after a connect
- */
-#ifndef CURL_DISABLE_VERBOSE_STRINGS
-void Curl_verboseconnect(struct connectdata *conn)
-{
-  if(conn->data->set.verbose)
-    infof(conn->data, "Connected to %s (%s) port %ld (#%ld)\n",
+} 
+ 
+/* 
+ * verboseconnect() displays verbose information after a connect 
+ */ 
+#ifndef CURL_DISABLE_VERBOSE_STRINGS 
+void Curl_verboseconnect(struct connectdata *conn) 
+{ 
+  if(conn->data->set.verbose) 
+    infof(conn->data, "Connected to %s (%s) port %ld (#%ld)\n", 
 #ifndef CURL_DISABLE_PROXY
           conn->bits.socksproxy ? conn->socks_proxy.host.dispname :
           conn->bits.httpproxy ? conn->http_proxy.host.dispname :
 #endif
           conn->bits.conn_to_host ? conn->conn_to_host.dispname :
           conn->host.dispname,
-          conn->ip_addr_str, conn->port, conn->connection_id);
-}
-#endif
-
-/*
+          conn->ip_addr_str, conn->port, conn->connection_id); 
+} 
+#endif 
+ 
+/* 
  * Helpers for IDNA conversions.
- */
+ */ 
 bool Curl_is_ASCII_name(const char *hostname)
-{
+{ 
   /* get an UNSIGNED local version of the pointer */
   const unsigned char *ch = (const unsigned char *)hostname;
-
+ 
   if(!hostname) /* bad input, consider it ASCII! */
     return TRUE;
 
-  while(*ch) {
-    if(*ch++ & 0x80)
-      return FALSE;
-  }
-  return TRUE;
-}
-
-/*
+  while(*ch) { 
+    if(*ch++ & 0x80) 
+      return FALSE; 
+  } 
+  return TRUE; 
+} 
+ 
+/* 
  * Strip single trailing dot in the hostname,
  * primarily for SNI and http host header.
- */
+ */ 
 static void strip_trailing_dot(struct hostname *host)
-{
+{ 
   size_t len;
   if(!host || !host->name)
     return;
   len = strlen(host->name);
   if(len && (host->name[len-1] == '.'))
     host->name[len-1] = 0;
-}
-
-/*
- * Perform any necessary IDN conversion of hostname
- */
+} 
+ 
+/* 
+ * Perform any necessary IDN conversion of hostname 
+ */ 
 CURLcode Curl_idnconvert_hostname(struct connectdata *conn,
                                   struct hostname *host)
-{
+{ 
   struct Curl_easy *data = conn->data;
 
 #ifndef USE_LIBIDN2
-  (void)data;
-  (void)conn;
-#elif defined(CURL_DISABLE_VERBOSE_STRINGS)
-  (void)conn;
-#endif
-
-  /* set the name we use to display the host name */
-  host->dispname = host->name;
+  (void)data; 
+  (void)conn; 
+#elif defined(CURL_DISABLE_VERBOSE_STRINGS) 
+  (void)conn; 
+#endif 
+ 
+  /* set the name we use to display the host name */ 
+  host->dispname = host->name; 
 
   /* Check name for non-ASCII and convert hostname to ACE form if we can */
   if(!Curl_is_ASCII_name(host->name)) {
@@ -1553,26 +1553,26 @@ CURLcode Curl_idnconvert_hostname(struct connectdata *conn,
       }
     }
 #elif defined(USE_WIN32_IDN)
-    char *ace_hostname = NULL;
-
+    char *ace_hostname = NULL; 
+ 
     if(curl_win32_idn_to_ascii(host->name, &ace_hostname)) {
-      host->encalloc = ace_hostname;
-      /* change the name pointer to point to the encoded hostname */
-      host->name = host->encalloc;
-    }
-    else {
+      host->encalloc = ace_hostname; 
+      /* change the name pointer to point to the encoded hostname */ 
+      host->name = host->encalloc; 
+    } 
+    else { 
       char buffer[STRERROR_LEN];
       failf(data, "Failed to convert %s to ACE; %s\n", host->name,
             Curl_winapi_strerror(GetLastError(), buffer, sizeof(buffer)));
       return CURLE_URL_MALFORMAT;
-    }
-#else
-    infof(data, "IDN support not present, can't parse Unicode domains\n");
-#endif
-  }
+    } 
+#else 
+    infof(data, "IDN support not present, can't parse Unicode domains\n"); 
+#endif 
+  } 
   return CURLE_OK;
-}
-
+} 
+ 
 /*
  * Frees data allocated by idnconvert_hostname()
  */
@@ -1593,15 +1593,15 @@ void Curl_free_idnconverted_hostname(struct hostname *host)
 #endif
 }
 
-/*
- * Allocate and initialize a new connectdata object.
- */
+/* 
+ * Allocate and initialize a new connectdata object. 
+ */ 
 static struct connectdata *allocate_conn(struct Curl_easy *data)
-{
-  struct connectdata *conn = calloc(1, sizeof(struct connectdata));
-  if(!conn)
-    return NULL;
-
+{ 
+  struct connectdata *conn = calloc(1, sizeof(struct connectdata)); 
+  if(!conn) 
+    return NULL; 
+ 
 #ifdef USE_SSL
   /* The SSL backend-specific data (ssl_backend_data) objects are allocated as
      a separate array to ensure suitable alignment.
@@ -1624,50 +1624,50 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
   }
 #endif
 
-  conn->handler = &Curl_handler_dummy;  /* Be sure we have a handler defined
-                                           already from start to avoid NULL
-                                           situations and checks */
-
-  /* and we setup a few fields in case we end up actually using this struct */
-
-  conn->sock[FIRSTSOCKET] = CURL_SOCKET_BAD;     /* no file descriptor */
-  conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; /* no file descriptor */
+  conn->handler = &Curl_handler_dummy;  /* Be sure we have a handler defined 
+                                           already from start to avoid NULL 
+                                           situations and checks */ 
+ 
+  /* and we setup a few fields in case we end up actually using this struct */ 
+ 
+  conn->sock[FIRSTSOCKET] = CURL_SOCKET_BAD;     /* no file descriptor */ 
+  conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD; /* no file descriptor */ 
   conn->tempsock[0] = CURL_SOCKET_BAD; /* no file descriptor */
   conn->tempsock[1] = CURL_SOCKET_BAD; /* no file descriptor */
-  conn->connection_id = -1;    /* no ID */
-  conn->port = -1; /* unknown at this point */
+  conn->connection_id = -1;    /* no ID */ 
+  conn->port = -1; /* unknown at this point */ 
   conn->remote_port = -1; /* unknown at this point */
 #if defined(USE_RECV_BEFORE_SEND_WORKAROUND) && defined(DEBUGBUILD)
   conn->postponed[0].bindsock = CURL_SOCKET_BAD; /* no file descriptor */
   conn->postponed[1].bindsock = CURL_SOCKET_BAD; /* no file descriptor */
 #endif /* USE_RECV_BEFORE_SEND_WORKAROUND && DEBUGBUILD */
-
-  /* Default protocol-independent behavior doesn't support persistent
-     connections, so we set this to force-close. Protocols that support
-     this need to set this to FALSE in their "curl_do" functions. */
+ 
+  /* Default protocol-independent behavior doesn't support persistent 
+     connections, so we set this to force-close. Protocols that support 
+     this need to set this to FALSE in their "curl_do" functions. */ 
   connclose(conn, "Default to force-close");
-
-  /* Store creation time to help future close decision making */
+ 
+  /* Store creation time to help future close decision making */ 
   conn->created = Curl_now();
-
+ 
   /* Store current time to give a baseline to keepalive connection times. */
   conn->keepalive = Curl_now();
 
   /* Store off the configured connection upkeep time. */
   conn->upkeep_interval_ms = data->set.upkeep_interval_ms;
 
-  conn->data = data; /* Setup the association between this connection
+  conn->data = data; /* Setup the association between this connection 
                         and the Curl_easy */
-
+ 
 #ifndef CURL_DISABLE_PROXY
   conn->http_proxy.proxytype = data->set.proxytype;
   conn->socks_proxy.proxytype = CURLPROXY_SOCKS4;
-
-  /* note that these two proxy bits are now just on what looks to be
-     requested, they may be altered down the road */
-  conn->bits.proxy = (data->set.str[STRING_PROXY] &&
+ 
+  /* note that these two proxy bits are now just on what looks to be 
+     requested, they may be altered down the road */ 
+  conn->bits.proxy = (data->set.str[STRING_PROXY] && 
                       *data->set.str[STRING_PROXY]) ? TRUE : FALSE;
-  conn->bits.httpproxy = (conn->bits.proxy &&
+  conn->bits.httpproxy = (conn->bits.proxy && 
                           (conn->http_proxy.proxytype == CURLPROXY_HTTP ||
                            conn->http_proxy.proxytype == CURLPROXY_HTTP_1_0 ||
                            conn->http_proxy.proxytype == CURLPROXY_HTTPS)) ?
@@ -1680,15 +1680,15 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
     conn->bits.socksproxy = TRUE;
   }
 
-  conn->bits.proxy_user_passwd =
+  conn->bits.proxy_user_passwd = 
     (data->set.str[STRING_PROXYUSERNAME]) ? TRUE : FALSE;
-  conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy;
-#endif /* CURL_DISABLE_PROXY */
-
+  conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy; 
+#endif /* CURL_DISABLE_PROXY */ 
+ 
   conn->bits.user_passwd = (data->set.str[STRING_USERNAME]) ? TRUE : FALSE;
 #ifndef CURL_DISABLE_FTP
-  conn->bits.ftp_use_epsv = data->set.ftp_use_epsv;
-  conn->bits.ftp_use_eprt = data->set.ftp_use_eprt;
+  conn->bits.ftp_use_epsv = data->set.ftp_use_epsv; 
+  conn->bits.ftp_use_eprt = data->set.ftp_use_eprt; 
 #endif
   conn->ssl_config.verifystatus = data->set.ssl.primary.verifystatus;
   conn->ssl_config.verifypeer = data->set.ssl.primary.verifypeer;
@@ -1699,65 +1699,65 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
   conn->proxy_ssl_config.verifypeer = data->set.proxy_ssl.primary.verifypeer;
   conn->proxy_ssl_config.verifyhost = data->set.proxy_ssl.primary.verifyhost;
 #endif
-  conn->ip_version = data->set.ipver;
+  conn->ip_version = data->set.ipver; 
   conn->bits.connect_only = data->set.connect_only;
   conn->transport = TRNSPRT_TCP; /* most of them are TCP streams */
-
+ 
 #if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) && \
     defined(NTLM_WB_ENABLED)
   conn->ntlm.ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;
   conn->proxyntlm.ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;
-#endif
-
+#endif 
+ 
   /* Initialize the easy handle list */
   Curl_llist_init(&conn->easyq, NULL);
-
-#ifdef HAVE_GSSAPI
-  conn->data_prot = PROT_CLEAR;
-#endif
-
-  /* Store the local bind parameters that will be used for this connection */
-  if(data->set.str[STRING_DEVICE]) {
-    conn->localdev = strdup(data->set.str[STRING_DEVICE]);
-    if(!conn->localdev)
-      goto error;
-  }
-  conn->localportrange = data->set.localportrange;
-  conn->localport = data->set.localport;
-
-  /* the close socket stuff needs to be copied to the connection struct as
+ 
+#ifdef HAVE_GSSAPI 
+  conn->data_prot = PROT_CLEAR; 
+#endif 
+ 
+  /* Store the local bind parameters that will be used for this connection */ 
+  if(data->set.str[STRING_DEVICE]) { 
+    conn->localdev = strdup(data->set.str[STRING_DEVICE]); 
+    if(!conn->localdev) 
+      goto error; 
+  } 
+  conn->localportrange = data->set.localportrange; 
+  conn->localport = data->set.localport; 
+ 
+  /* the close socket stuff needs to be copied to the connection struct as 
      it may live on without (this specific) Curl_easy */
-  conn->fclosesocket = data->set.fclosesocket;
-  conn->closesocket_client = data->set.closesocket_client;
+  conn->fclosesocket = data->set.fclosesocket; 
+  conn->closesocket_client = data->set.closesocket_client; 
   conn->lastused = Curl_now(); /* used now */
-
-  return conn;
-  error:
-
+ 
+  return conn; 
+  error: 
+ 
   Curl_llist_destroy(&conn->easyq, NULL);
   free(conn->localdev);
 #ifdef USE_SSL
   free(conn->ssl_extra);
 #endif
   free(conn);
-  return NULL;
-}
-
+  return NULL; 
+} 
+ 
 /* returns the handler if the given scheme is built-in */
 const struct Curl_handler *Curl_builtin_scheme(const char *scheme)
-{
-  const struct Curl_handler * const *pp;
-  const struct Curl_handler *p;
+{ 
+  const struct Curl_handler * const *pp; 
+  const struct Curl_handler *p; 
   /* Scan protocol handler table and match against 'scheme'. The handler may
      be changed later when the protocol specific setup function is called. */
   for(pp = protocols; (p = *pp) != NULL; pp++)
     if(strcasecompare(p->scheme, scheme))
-      /* Protocol found in table. Check if allowed */
+      /* Protocol found in table. Check if allowed */ 
       return p;
   return NULL; /* not found */
 }
-
-
+ 
+ 
 static CURLcode findprotocol(struct Curl_easy *data,
                              struct connectdata *conn,
                              const char *protostr)
@@ -1774,23 +1774,23 @@ static CURLcode findprotocol(struct Curl_easy *data,
       /* nope, get out */
       ;
     else {
-      /* Perform setup complement if some. */
-      conn->handler = conn->given = p;
-
-      /* 'port' and 'remote_port' are set in setup_connection_internals() */
-      return CURLE_OK;
-    }
-  }
-
-  /* The protocol was not found in the table, but we don't have to assign it
-     to anything since it is already assigned to a dummy-struct in the
-     create_conn() function when the connectdata struct is allocated. */
+      /* Perform setup complement if some. */ 
+      conn->handler = conn->given = p; 
+ 
+      /* 'port' and 'remote_port' are set in setup_connection_internals() */ 
+      return CURLE_OK; 
+    } 
+  } 
+ 
+  /* The protocol was not found in the table, but we don't have to assign it 
+     to anything since it is already assigned to a dummy-struct in the 
+     create_conn() function when the connectdata struct is allocated. */ 
   failf(data, "Protocol \"%s\" not supported or disabled in " LIBCURL_NAME,
-        protostr);
-
-  return CURLE_UNSUPPORTED_PROTOCOL;
-}
-
+        protostr); 
+ 
+  return CURLE_UNSUPPORTED_PROTOCOL; 
+} 
+ 
 
 CURLcode Curl_uc_to_curlcode(CURLUcode uc)
 {
@@ -1806,7 +1806,7 @@ CURLcode Curl_uc_to_curlcode(CURLUcode uc)
   }
 }
 
-/*
+/* 
  * If the URL was set with an IPv6 numerical address with a zone id part, set
  * the scope_id based on that!
  */
@@ -1851,30 +1851,30 @@ static void zonefrom_url(CURLU *uh, struct connectdata *conn)
 }
 
 /*
- * Parse URL and fill in the relevant members of the connection struct.
- */
+ * Parse URL and fill in the relevant members of the connection struct. 
+ */ 
 static CURLcode parseurlandfillconn(struct Curl_easy *data,
                                     struct connectdata *conn)
-{
-  CURLcode result;
+{ 
+  CURLcode result; 
   CURLU *uh;
   CURLUcode uc;
   char *hostname;
   bool use_set_uh = (data->set.uh && !data->state.this_is_a_follow);
-
+ 
   up_free(data); /* cleanup previous leftovers first */
-
+ 
   /* parse the URL */
   if(use_set_uh) {
     uh = data->state.uh = curl_url_dup(data->set.uh);
-  }
-  else {
+  } 
+  else { 
     uh = data->state.uh = curl_url();
   }
-
+ 
   if(!uh)
     return CURLE_OUT_OF_MEMORY;
-
+ 
   if(data->set.str[STRING_DEFAULT_PROTOCOL] &&
      !Curl_is_absolute_url(data->change.url, NULL, MAX_SCHEME_LEN)) {
     char *url;
@@ -1887,7 +1887,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
     data->change.url = url;
     data->change.url_alloc = TRUE;
   }
-
+ 
   if(!use_set_uh) {
     char *newurl;
     uc = curl_url_set(uh, CURLUPART_URL, data->change.url,
@@ -1910,11 +1910,11 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
     data->change.url = newurl;
     data->change.url_alloc = TRUE;
   }
-
+ 
   uc = curl_url_get(uh, CURLUPART_SCHEME, &data->state.up.scheme, 0);
   if(uc)
     return Curl_uc_to_curlcode(uc);
-
+ 
   uc = curl_url_get(uh, CURLUPART_HOST, &data->state.up.hostname, 0);
   if(uc) {
     if(!strcasecompare("file", data->state.up.scheme))
@@ -1949,7 +1949,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
   result = findprotocol(data, conn, data->state.up.scheme);
   if(result)
     return result;
-
+ 
   /* we don't use the URL API's URL decoder option here since it rejects
      control codes and we want to allow them for some schemes in the user and
      password fields */
@@ -1963,10 +1963,10 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
       return result;
     conn->user = decoded;
     conn->bits.user_passwd = TRUE;
-  }
+  } 
   else if(uc != CURLUE_NO_USER)
     return Curl_uc_to_curlcode(uc);
-
+ 
   uc = curl_url_get(uh, CURLUPART_PASSWORD, &data->state.up.password, 0);
   if(!uc) {
     char *decoded;
@@ -1980,34 +1980,34 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
   }
   else if(uc != CURLUE_NO_PASSWORD)
     return Curl_uc_to_curlcode(uc);
-
+ 
   uc = curl_url_get(uh, CURLUPART_OPTIONS, &data->state.up.options,
                     CURLU_URLDECODE);
   if(!uc) {
     conn->options = strdup(data->state.up.options);
     if(!conn->options)
       return CURLE_OUT_OF_MEMORY;
-  }
+  } 
   else if(uc != CURLUE_NO_OPTIONS)
     return Curl_uc_to_curlcode(uc);
-
+ 
   uc = curl_url_get(uh, CURLUPART_PATH, &data->state.up.path, 0);
   if(uc)
     return Curl_uc_to_curlcode(uc);
-
+ 
   uc = curl_url_get(uh, CURLUPART_PORT, &data->state.up.port,
                     CURLU_DEFAULT_PORT);
   if(uc) {
     if(!strcasecompare("file", data->state.up.scheme))
-      return CURLE_OUT_OF_MEMORY;
+      return CURLE_OUT_OF_MEMORY; 
   }
   else {
     unsigned long port = strtoul(data->state.up.port, NULL, 10);
     conn->port = conn->remote_port = curlx_ultous(port);
   }
-
+ 
   (void)curl_url_get(uh, CURLUPART_QUERY, &data->state.up.query, 0);
-
+ 
   hostname = data->state.up.hostname;
   if(hostname && hostname[0] == '[') {
     /* This looks like an IPv6 address literal. See if there is an address
@@ -2020,8 +2020,8 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
     hostname[hlen - 1] = 0;
 
     zonefrom_url(uh, conn);
-  }
-
+  } 
+ 
   /* make sure the connect struct gets its own copy of the host name */
   conn->host.rawalloc = strdup(hostname ? hostname : "");
   if(!conn->host.rawalloc)
@@ -2029,86 +2029,86 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
   conn->host.name = conn->host.rawalloc;
 
   if(data->set.scope_id)
-    /* Override any scope that was set above.  */
+    /* Override any scope that was set above.  */ 
     conn->scope_id = data->set.scope_id;
-
+ 
   return CURLE_OK;
 }
-
-
-/*
- * If we're doing a resumed transfer, we need to setup our stuff
- * properly.
- */
+ 
+ 
+/* 
+ * If we're doing a resumed transfer, we need to setup our stuff 
+ * properly. 
+ */ 
 static CURLcode setup_range(struct Curl_easy *data)
-{
-  struct UrlState *s = &data->state;
-  s->resume_from = data->set.set_resume_from;
-  if(s->resume_from || data->set.str[STRING_SET_RANGE]) {
-    if(s->rangestringalloc)
-      free(s->range);
-
-    if(s->resume_from)
+{ 
+  struct UrlState *s = &data->state; 
+  s->resume_from = data->set.set_resume_from; 
+  if(s->resume_from || data->set.str[STRING_SET_RANGE]) { 
+    if(s->rangestringalloc) 
+      free(s->range); 
+ 
+    if(s->resume_from) 
       s->range = aprintf("%" CURL_FORMAT_CURL_OFF_T "-", s->resume_from);
-    else
-      s->range = strdup(data->set.str[STRING_SET_RANGE]);
-
+    else 
+      s->range = strdup(data->set.str[STRING_SET_RANGE]); 
+ 
     s->rangestringalloc = (s->range) ? TRUE : FALSE;
-
-    if(!s->range)
-      return CURLE_OUT_OF_MEMORY;
-
-    /* tell ourselves to fetch this range */
-    s->use_range = TRUE;        /* enable range download */
-  }
-  else
-    s->use_range = FALSE; /* disable range download */
-
-  return CURLE_OK;
-}
-
-
-/*
- * setup_connection_internals() -
- *
- * Setup connection internals specific to the requested protocol in the
+ 
+    if(!s->range) 
+      return CURLE_OUT_OF_MEMORY; 
+ 
+    /* tell ourselves to fetch this range */ 
+    s->use_range = TRUE;        /* enable range download */ 
+  } 
+  else 
+    s->use_range = FALSE; /* disable range download */ 
+ 
+  return CURLE_OK; 
+} 
+ 
+ 
+/* 
+ * setup_connection_internals() - 
+ * 
+ * Setup connection internals specific to the requested protocol in the 
  * Curl_easy. This is inited and setup before the connection is made but
- * is about the particular protocol that is to be used.
- *
- * This MUST get called after proxy magic has been figured out.
- */
-static CURLcode setup_connection_internals(struct connectdata *conn)
-{
+ * is about the particular protocol that is to be used. 
+ * 
+ * This MUST get called after proxy magic has been figured out. 
+ */ 
+static CURLcode setup_connection_internals(struct connectdata *conn) 
+{ 
   const struct Curl_handler *p;
-  CURLcode result;
-
-  /* Perform setup complement if some. */
-  p = conn->handler;
-
-  if(p->setup_connection) {
-    result = (*p->setup_connection)(conn);
-
+  CURLcode result; 
+ 
+  /* Perform setup complement if some. */ 
+  p = conn->handler; 
+ 
+  if(p->setup_connection) { 
+    result = (*p->setup_connection)(conn); 
+ 
     if(result)
-      return result;
-
-    p = conn->handler;              /* May have changed. */
-  }
-
-  if(conn->port < 0)
-    /* we check for -1 here since if proxy was detected already, this
-       was very likely already set to the proxy port */
-    conn->port = p->defport;
-
-  return CURLE_OK;
-}
-
-/*
- * Curl_free_request_state() should free temp data that was allocated in the
+      return result; 
+ 
+    p = conn->handler;              /* May have changed. */ 
+  } 
+ 
+  if(conn->port < 0) 
+    /* we check for -1 here since if proxy was detected already, this 
+       was very likely already set to the proxy port */ 
+    conn->port = p->defport; 
+ 
+  return CURLE_OK; 
+} 
+ 
+/* 
+ * Curl_free_request_state() should free temp data that was allocated in the 
  * Curl_easy for this single request.
- */
-
+ */ 
+ 
 void Curl_free_request_state(struct Curl_easy *data)
-{
+{ 
   Curl_safefree(data->req.p.http);
   Curl_safefree(data->req.newurl);
 
@@ -2116,22 +2116,22 @@ void Curl_free_request_state(struct Curl_easy *data)
   Curl_close(&data->req.doh.probe[0].easy);
   Curl_close(&data->req.doh.probe[1].easy);
 #endif
-}
-
-
-#ifndef CURL_DISABLE_PROXY
-/****************************************************************
-* Checks if the host is in the noproxy list. returns true if it matches
-* and therefore the proxy should NOT be used.
-****************************************************************/
+} 
+ 
+ 
+#ifndef CURL_DISABLE_PROXY 
+/**************************************************************** 
+* Checks if the host is in the noproxy list. returns true if it matches 
+* and therefore the proxy should NOT be used. 
+****************************************************************/ 
 static bool check_noproxy(const char *name, const char *no_proxy)
-{
-  /* no_proxy=domain1.dom,host.domain2.dom
-   *   (a comma-separated list of hosts which should
-   *   not be proxied, or an asterisk to override
-   *   all proxy variables)
-   */
-  if(no_proxy && no_proxy[0]) {
+{ 
+  /* no_proxy=domain1.dom,host.domain2.dom 
+   *   (a comma-separated list of hosts which should 
+   *   not be proxied, or an asterisk to override 
+   *   all proxy variables) 
+   */ 
+  if(no_proxy && no_proxy[0]) { 
     size_t tok_start;
     size_t tok_end;
     const char *separator = ", ";
@@ -2139,107 +2139,107 @@ static bool check_noproxy(const char *name, const char *no_proxy)
     size_t namelen;
     char *endptr;
     if(strcasecompare("*", no_proxy)) {
-      return TRUE;
-    }
-
-    /* NO_PROXY was specified and it wasn't just an asterisk */
-
-    no_proxy_len = strlen(no_proxy);
+      return TRUE; 
+    } 
+ 
+    /* NO_PROXY was specified and it wasn't just an asterisk */ 
+ 
+    no_proxy_len = strlen(no_proxy); 
     if(name[0] == '[') {
       /* IPv6 numerical address */
       endptr = strchr(name, ']');
       if(!endptr)
         return FALSE;
       name++;
-      namelen = endptr - name;
-    }
-    else
-      namelen = strlen(name);
-
-    for(tok_start = 0; tok_start < no_proxy_len; tok_start = tok_end + 1) {
-      while(tok_start < no_proxy_len &&
-            strchr(separator, no_proxy[tok_start]) != NULL) {
-        /* Look for the beginning of the token. */
-        ++tok_start;
-      }
-
-      if(tok_start == no_proxy_len)
-        break; /* It was all trailing separator chars, no more tokens. */
-
-      for(tok_end = tok_start; tok_end < no_proxy_len &&
-            strchr(separator, no_proxy[tok_end]) == NULL; ++tok_end)
-        /* Look for the end of the token. */
-        ;
-
-      /* To match previous behaviour, where it was necessary to specify
-       * ".local.com" to prevent matching "notlocal.com", we will leave
-       * the '.' off.
-       */
-      if(no_proxy[tok_start] == '.')
-        ++tok_start;
-
-      if((tok_end - tok_start) <= namelen) {
-        /* Match the last part of the name to the domain we are checking. */
-        const char *checkn = name + namelen - (tok_end - tok_start);
+      namelen = endptr - name; 
+    }
+    else 
+      namelen = strlen(name); 
+ 
+    for(tok_start = 0; tok_start < no_proxy_len; tok_start = tok_end + 1) { 
+      while(tok_start < no_proxy_len && 
+            strchr(separator, no_proxy[tok_start]) != NULL) { 
+        /* Look for the beginning of the token. */ 
+        ++tok_start; 
+      } 
+ 
+      if(tok_start == no_proxy_len) 
+        break; /* It was all trailing separator chars, no more tokens. */ 
+ 
+      for(tok_end = tok_start; tok_end < no_proxy_len && 
+            strchr(separator, no_proxy[tok_end]) == NULL; ++tok_end) 
+        /* Look for the end of the token. */ 
+        ; 
+ 
+      /* To match previous behaviour, where it was necessary to specify 
+       * ".local.com" to prevent matching "notlocal.com", we will leave 
+       * the '.' off. 
+       */ 
+      if(no_proxy[tok_start] == '.') 
+        ++tok_start; 
+ 
+      if((tok_end - tok_start) <= namelen) { 
+        /* Match the last part of the name to the domain we are checking. */ 
+        const char *checkn = name + namelen - (tok_end - tok_start); 
         if(strncasecompare(no_proxy + tok_start, checkn,
-                           tok_end - tok_start)) {
-          if((tok_end - tok_start) == namelen || *(checkn - 1) == '.') {
-            /* We either have an exact match, or the previous character is a .
-             * so it is within the same domain, so no proxy for this host.
-             */
-            return TRUE;
-          }
-        }
-      } /* if((tok_end - tok_start) <= namelen) */
-    } /* for(tok_start = 0; tok_start < no_proxy_len;
-         tok_start = tok_end + 1) */
-  } /* NO_PROXY was specified and it wasn't just an asterisk */
-
-  return FALSE;
-}
-
+                           tok_end - tok_start)) { 
+          if((tok_end - tok_start) == namelen || *(checkn - 1) == '.') { 
+            /* We either have an exact match, or the previous character is a . 
+             * so it is within the same domain, so no proxy for this host. 
+             */ 
+            return TRUE; 
+          } 
+        } 
+      } /* if((tok_end - tok_start) <= namelen) */ 
+    } /* for(tok_start = 0; tok_start < no_proxy_len; 
+         tok_start = tok_end + 1) */ 
+  } /* NO_PROXY was specified and it wasn't just an asterisk */ 
+ 
+  return FALSE; 
+} 
+ 
 #ifndef CURL_DISABLE_HTTP
-/****************************************************************
-* Detect what (if any) proxy to use. Remember that this selects a host
-* name and is not limited to HTTP proxies only.
-* The returned pointer must be freed by the caller (unless NULL)
-****************************************************************/
-static char *detect_proxy(struct connectdata *conn)
-{
-  char *proxy = NULL;
-
-  /* If proxy was not specified, we check for default proxy environment
-   * variables, to enable i.e Lynx compliance:
-   *
-   * http_proxy=http://some.server.dom:port/
-   * https_proxy=http://some.server.dom:port/
-   * ftp_proxy=http://some.server.dom:port/
-   * no_proxy=domain1.dom,host.domain2.dom
-   *   (a comma-separated list of hosts which should
-   *   not be proxied, or an asterisk to override
-   *   all proxy variables)
-   * all_proxy=http://some.server.dom:port/
-   *   (seems to exist for the CERN www lib. Probably
-   *   the first to check for.)
-   *
-   * For compatibility, the all-uppercase versions of these variables are
-   * checked if the lowercase versions don't exist.
-   */
-  char proxy_env[128];
+/**************************************************************** 
+* Detect what (if any) proxy to use. Remember that this selects a host 
+* name and is not limited to HTTP proxies only. 
+* The returned pointer must be freed by the caller (unless NULL) 
+****************************************************************/ 
+static char *detect_proxy(struct connectdata *conn) 
+{ 
+  char *proxy = NULL; 
+ 
+  /* If proxy was not specified, we check for default proxy environment 
+   * variables, to enable i.e Lynx compliance: 
+   * 
+   * http_proxy=http://some.server.dom:port/ 
+   * https_proxy=http://some.server.dom:port/ 
+   * ftp_proxy=http://some.server.dom:port/ 
+   * no_proxy=domain1.dom,host.domain2.dom 
+   *   (a comma-separated list of hosts which should 
+   *   not be proxied, or an asterisk to override 
+   *   all proxy variables) 
+   * all_proxy=http://some.server.dom:port/ 
+   *   (seems to exist for the CERN www lib. Probably 
+   *   the first to check for.) 
+   * 
+   * For compatibility, the all-uppercase versions of these variables are 
+   * checked if the lowercase versions don't exist. 
+   */ 
+  char proxy_env[128]; 
   const char *protop = conn->handler->scheme;
   char *envp = proxy_env;
   char *prox;
-
+ 
   /* Now, build <protocol>_proxy and check for such a one to use */
   while(*protop)
     *envp++ = (char)tolower((int)*protop++);
-
+ 
   /* append _proxy */
   strcpy(envp, "_proxy");
-
+ 
   /* read the protocol proxy: */
   prox = curl_getenv(proxy_env);
-
+ 
   /*
    * We don't try the uppercase version of HTTP_PROXY because of
    * security reasons:
@@ -2257,7 +2257,7 @@ static char *detect_proxy(struct connectdata *conn)
     Curl_strntoupper(proxy_env, proxy_env, sizeof(proxy_env));
     prox = curl_getenv(proxy_env);
   }
-
+ 
   envp = proxy_env;
   if(prox) {
     proxy = prox; /* use this */
@@ -2268,24 +2268,24 @@ static char *detect_proxy(struct connectdata *conn)
     if(!proxy) {
       envp = (char *)"ALL_PROXY";
       proxy = curl_getenv(envp);
-    }
+    } 
   }
   if(proxy)
     infof(conn->data, "Uses proxy env variable %s == '%s'\n", envp, proxy);
-
-  return proxy;
-}
+ 
+  return proxy; 
+} 
 #endif /* CURL_DISABLE_HTTP */
-
-/*
- * If this is supposed to use a proxy, we need to figure out the proxy
- * host name, so that we can re-use an existing connection
- * that may exist registered to the same proxy host.
- */
+ 
+/* 
+ * If this is supposed to use a proxy, we need to figure out the proxy 
+ * host name, so that we can re-use an existing connection 
+ * that may exist registered to the same proxy host. 
+ */ 
 static CURLcode parse_proxy(struct Curl_easy *data,
                             struct connectdata *conn, char *proxy,
                             curl_proxytype proxytype)
-{
+{ 
   char *portptr = NULL;
   long port = -1;
   char *proxyuser = NULL;
@@ -2297,7 +2297,7 @@ static CURLcode parse_proxy(struct Curl_easy *data,
   CURLU *uhp = curl_url();
   CURLcode result = CURLE_OK;
   char *scheme = NULL;
-
+ 
   /* When parsing the proxy, allowing non-supported schemes since we have
      these made up ones for proxies. Guess scheme for URLs without it. */
   uc = curl_url_set(uhp, CURLUPART_URL, proxy,
@@ -2309,7 +2309,7 @@ static CURLcode parse_proxy(struct Curl_easy *data,
       result = CURLE_OUT_OF_MEMORY;
       goto error;
     }
-
+ 
     if(strcasecompare("https", scheme))
       proxytype = CURLPROXY_HTTPS;
     else if(strcasecompare("socks5h", scheme))
@@ -2329,13 +2329,13 @@ static CURLcode parse_proxy(struct Curl_easy *data,
       result = CURLE_COULDNT_CONNECT;
       goto error;
     }
-  }
+  } 
   else {
     failf(data, "Unsupported proxy syntax in \'%s\'", proxy);
     result = CURLE_COULDNT_RESOLVE_PROXY;
     goto error;
   }
-
+ 
 #ifdef USE_SSL
   if(!(Curl_ssl->supports & SSLSUPP_HTTPS_PROXY))
 #endif
@@ -2355,7 +2355,7 @@ static CURLcode parse_proxy(struct Curl_easy *data,
   proxyinfo = sockstype ? &conn->socks_proxy : &conn->http_proxy;
   proxyinfo->proxytype = proxytype;
 
-  /* Is there a username and password given in this proxy url? */
+  /* Is there a username and password given in this proxy url? */ 
   curl_url_get(uhp, CURLUPART_USER, &proxyuser, CURLU_URLDECODE);
   curl_url_get(uhp, CURLUPART_PASSWORD, &proxypasswd, CURLU_URLDECODE);
   if(proxyuser || proxypasswd) {
@@ -2371,18 +2371,18 @@ static CURLcode parse_proxy(struct Curl_easy *data,
     }
     proxyinfo->passwd = proxypasswd;
     conn->bits.proxy_user_passwd = TRUE; /* enable it */
-  }
-
+  } 
+ 
   curl_url_get(uhp, CURLUPART_PORT, &portptr, 0);
 
   if(portptr) {
     port = strtol(portptr, NULL, 10);
     free(portptr);
-  }
-  else {
-    if(data->set.proxyport)
-      /* None given in the proxy string, then get the default one if it is
-         given */
+  } 
+  else { 
+    if(data->set.proxyport) 
+      /* None given in the proxy string, then get the default one if it is 
+         given */ 
       port = data->set.proxyport;
     else {
       if(proxytype == CURLPROXY_HTTPS)
@@ -2390,13 +2390,13 @@ static CURLcode parse_proxy(struct Curl_easy *data,
       else
         port = CURL_DEFAULT_PROXY_PORT;
     }
-  }
+  } 
   if(port >= 0) {
     proxyinfo->port = port;
     if(conn->port < 0 || sockstype || !conn->socks_proxy.host.rawalloc)
       conn->port = port;
   }
-
+ 
   /* now, clone the proxy host name */
   uc = curl_url_get(uhp, CURLUPART_HOST, &host, CURLU_URLDECODE);
   if(uc) {
@@ -2418,20 +2418,20 @@ static CURLcode parse_proxy(struct Curl_easy *data,
   free(scheme);
   curl_url_cleanup(uhp);
   return result;
-}
-
-/*
- * Extract the user and password from the authentication string
- */
+} 
+ 
+/* 
+ * Extract the user and password from the authentication string 
+ */ 
 static CURLcode parse_proxy_auth(struct Curl_easy *data,
-                                 struct connectdata *conn)
-{
+                                 struct connectdata *conn) 
+{ 
   const char *proxyuser = data->set.str[STRING_PROXYUSERNAME] ?
     data->set.str[STRING_PROXYUSERNAME] : "";
   const char *proxypasswd = data->set.str[STRING_PROXYPASSWORD] ?
     data->set.str[STRING_PROXYPASSWORD] : "";
   CURLcode result = CURLE_OK;
-
+ 
   if(proxyuser)
     result = Curl_urldecode(data, proxyuser, 0, &conn->http_proxy.user, NULL,
                             REJECT_ZERO);
@@ -2439,18 +2439,18 @@ static CURLcode parse_proxy_auth(struct Curl_easy *data,
     result = Curl_urldecode(data, proxypasswd, 0, &conn->http_proxy.passwd,
                             NULL, REJECT_ZERO);
   return result;
-}
-
+} 
+ 
 /* create_conn helper to parse and init proxy values. to be called after unix
    socket init but before any proxy vars are evaluated. */
 static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
-{
+{ 
   char *proxy = NULL;
   char *socksproxy = NULL;
   char *no_proxy = NULL;
-  CURLcode result = CURLE_OK;
+  CURLcode result = CURLE_OK; 
   struct Curl_easy *data = conn->data;
-
+ 
   /*************************************************************
    * Extract the user and password from the authentication string
    *************************************************************/
@@ -2459,7 +2459,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
     if(result)
       goto out;
   }
-
+ 
   /*************************************************************
    * Detect what (if any) proxy to use
    *************************************************************/
@@ -2472,7 +2472,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       goto out;
     }
   }
-
+ 
   if(data->set.str[STRING_PRE_PROXY]) {
     socksproxy = strdup(data->set.str[STRING_PRE_PROXY]);
     /* if global socks proxy is set, this is it */
@@ -2482,7 +2482,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       goto out;
     }
   }
-
+ 
   if(!data->set.str[STRING_NOPROXY]) {
     const char *p = "no_proxy";
     no_proxy = curl_getenv(p);
@@ -2494,7 +2494,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       infof(conn->data, "Uses proxy env variable %s == '%s'\n", p, no_proxy);
     }
   }
-
+ 
   if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY] ?
       data->set.str[STRING_NOPROXY] : no_proxy)) {
     Curl_safefree(proxy);
@@ -2505,9 +2505,9 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
     /* if the host is not in the noproxy list, detect proxy. */
     proxy = detect_proxy(conn);
 #endif /* CURL_DISABLE_HTTP */
-
+ 
   Curl_safefree(no_proxy);
-
+ 
 #ifdef USE_UNIX_SOCKETS
   /* For the time being do not mix proxy and unix domain sockets. See #1274 */
   if(proxy && conn->unix_domain_socket) {
@@ -2515,7 +2515,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
     proxy = NULL;
   }
 #endif
-
+ 
   if(proxy && (!*proxy || (conn->handler->flags & PROTOPT_NONETWORK))) {
     free(proxy);  /* Don't bother with an empty proxy string or if the
                      protocol doesn't work with network */
@@ -2527,7 +2527,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
                           the protocol doesn't work with network */
     socksproxy = NULL;
   }
-
+ 
   /***********************************************************************
    * If this is supposed to use a proxy, we need to figure out the proxy host
    * name, proxy type and port number, so that we can re-use an existing
@@ -2540,7 +2540,7 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       if(result)
         goto out;
     }
-
+ 
     if(socksproxy) {
       result = parse_proxy(data, conn, socksproxy,
                            conn->socks_proxy.proxytype);
@@ -2549,12 +2549,12 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       if(result)
         goto out;
     }
-
+ 
     if(conn->http_proxy.host.rawalloc) {
 #ifdef CURL_DISABLE_HTTP
       /* asking for a HTTP proxy is a bit funny when HTTP is disabled... */
       result = CURLE_UNSUPPORTED_PROTOCOL;
-      goto out;
+      goto out; 
 #else
       /* force this connection's protocol to become HTTP if compatible */
       if(!(conn->handler->protocol & PROTO_FAMILY_HTTP)) {
@@ -2567,12 +2567,12 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
       }
       conn->bits.httpproxy = TRUE;
 #endif
-    }
+    } 
     else {
       conn->bits.httpproxy = FALSE; /* not a HTTP proxy */
       conn->bits.tunnel_proxy = FALSE; /* no tunneling if not HTTP */
     }
-
+ 
     if(conn->socks_proxy.host.rawalloc) {
       if(!conn->http_proxy.host.rawalloc) {
         /* once a socks proxy */
@@ -2585,16 +2585,16 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
         }
       }
       conn->bits.socksproxy = TRUE;
-    }
+    } 
     else
       conn->bits.socksproxy = FALSE; /* not a socks proxy */
-  }
+  } 
   else {
     conn->bits.socksproxy = FALSE;
     conn->bits.httpproxy = FALSE;
   }
   conn->bits.proxy = conn->bits.httpproxy || conn->bits.socksproxy;
-
+ 
   if(!conn->bits.proxy) {
     /* we aren't using the proxy after all... */
     conn->bits.proxy = FALSE;
@@ -2605,183 +2605,183 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
     /* CURLPROXY_HTTPS does not have its own flag in conn->bits, yet we need
        to signal that CURLPROXY_HTTPS is not used for this connection */
     conn->http_proxy.proxytype = CURLPROXY_HTTP;
-  }
-
+  } 
+ 
 out:
-
+ 
   free(socksproxy);
   free(proxy);
-  return result;
-}
+  return result; 
+} 
 #endif /* CURL_DISABLE_PROXY */
-
-/*
+ 
+/* 
  * Curl_parse_login_details()
- *
- * This is used to parse a login string for user name, password and options in
- * the following formats:
- *
- *   user
- *   user:password
- *   user:password;options
- *   user;options
- *   user;options:password
- *   :password
- *   :password;options
- *   ;options
- *   ;options:password
- *
- * Parameters:
- *
- * login    [in]     - The login string.
- * len      [in]     - The length of the login string.
- * userp    [in/out] - The address where a pointer to newly allocated memory
- *                     holding the user will be stored upon completion.
+ * 
+ * This is used to parse a login string for user name, password and options in 
+ * the following formats: 
+ * 
+ *   user 
+ *   user:password 
+ *   user:password;options 
+ *   user;options 
+ *   user;options:password 
+ *   :password 
+ *   :password;options 
+ *   ;options 
+ *   ;options:password 
+ * 
+ * Parameters: 
+ * 
+ * login    [in]     - The login string. 
+ * len      [in]     - The length of the login string. 
+ * userp    [in/out] - The address where a pointer to newly allocated memory 
+ *                     holding the user will be stored upon completion. 
  * passwdp  [in/out] - The address where a pointer to newly allocated memory
- *                     holding the password will be stored upon completion.
- * optionsp [in/out] - The address where a pointer to newly allocated memory
- *                     holding the options will be stored upon completion.
- *
- * Returns CURLE_OK on success.
- */
+ *                     holding the password will be stored upon completion. 
+ * optionsp [in/out] - The address where a pointer to newly allocated memory 
+ *                     holding the options will be stored upon completion. 
+ * 
+ * Returns CURLE_OK on success. 
+ */ 
 CURLcode Curl_parse_login_details(const char *login, const size_t len,
                                   char **userp, char **passwdp,
                                   char **optionsp)
-{
-  CURLcode result = CURLE_OK;
-  char *ubuf = NULL;
-  char *pbuf = NULL;
-  char *obuf = NULL;
-  const char *psep = NULL;
-  const char *osep = NULL;
-  size_t ulen;
-  size_t plen;
-  size_t olen;
-
+{ 
+  CURLcode result = CURLE_OK; 
+  char *ubuf = NULL; 
+  char *pbuf = NULL; 
+  char *obuf = NULL; 
+  const char *psep = NULL; 
+  const char *osep = NULL; 
+  size_t ulen; 
+  size_t plen; 
+  size_t olen; 
+ 
   /* the input length check is because this is called directcly from setopt
      and isn't going through the regular string length check */
   size_t llen = strlen(login);
   if(llen > CURL_MAX_INPUT_LENGTH)
     return CURLE_BAD_FUNCTION_ARGUMENT;
 
-  /* Attempt to find the password separator */
-  if(passwdp) {
-    psep = strchr(login, ':');
-
-    /* Within the constraint of the login string */
-    if(psep >= login + len)
-      psep = NULL;
-  }
-
-  /* Attempt to find the options separator */
-  if(optionsp) {
-    osep = strchr(login, ';');
-
-    /* Within the constraint of the login string */
-    if(osep >= login + len)
-      osep = NULL;
-  }
-
-  /* Calculate the portion lengths */
-  ulen = (psep ?
-          (size_t)(osep && psep > osep ? osep - login : psep - login) :
-          (osep ? (size_t)(osep - login) : len));
-  plen = (psep ?
-          (osep && osep > psep ? (size_t)(osep - psep) :
-                                 (size_t)(login + len - psep)) - 1 : 0);
-  olen = (osep ?
-          (psep && psep > osep ? (size_t)(psep - osep) :
-                                 (size_t)(login + len - osep)) - 1 : 0);
-
-  /* Allocate the user portion buffer */
-  if(userp && ulen) {
-    ubuf = malloc(ulen + 1);
-    if(!ubuf)
-      result = CURLE_OUT_OF_MEMORY;
-  }
-
-  /* Allocate the password portion buffer */
-  if(!result && passwdp && plen) {
-    pbuf = malloc(plen + 1);
-    if(!pbuf) {
+  /* Attempt to find the password separator */ 
+  if(passwdp) { 
+    psep = strchr(login, ':'); 
+ 
+    /* Within the constraint of the login string */ 
+    if(psep >= login + len) 
+      psep = NULL; 
+  } 
+ 
+  /* Attempt to find the options separator */ 
+  if(optionsp) { 
+    osep = strchr(login, ';'); 
+ 
+    /* Within the constraint of the login string */ 
+    if(osep >= login + len) 
+      osep = NULL; 
+  } 
+ 
+  /* Calculate the portion lengths */ 
+  ulen = (psep ? 
+          (size_t)(osep && psep > osep ? osep - login : psep - login) : 
+          (osep ? (size_t)(osep - login) : len)); 
+  plen = (psep ? 
+          (osep && osep > psep ? (size_t)(osep - psep) : 
+                                 (size_t)(login + len - psep)) - 1 : 0); 
+  olen = (osep ? 
+          (psep && psep > osep ? (size_t)(psep - osep) : 
+                                 (size_t)(login + len - osep)) - 1 : 0); 
+ 
+  /* Allocate the user portion buffer */ 
+  if(userp && ulen) { 
+    ubuf = malloc(ulen + 1); 
+    if(!ubuf) 
+      result = CURLE_OUT_OF_MEMORY; 
+  } 
+ 
+  /* Allocate the password portion buffer */ 
+  if(!result && passwdp && plen) { 
+    pbuf = malloc(plen + 1); 
+    if(!pbuf) { 
       free(ubuf);
-      result = CURLE_OUT_OF_MEMORY;
-    }
-  }
-
-  /* Allocate the options portion buffer */
-  if(!result && optionsp && olen) {
-    obuf = malloc(olen + 1);
-    if(!obuf) {
+      result = CURLE_OUT_OF_MEMORY; 
+    } 
+  } 
+ 
+  /* Allocate the options portion buffer */ 
+  if(!result && optionsp && olen) { 
+    obuf = malloc(olen + 1); 
+    if(!obuf) { 
       free(pbuf);
       free(ubuf);
-      result = CURLE_OUT_OF_MEMORY;
-    }
-  }
-
-  if(!result) {
-    /* Store the user portion if necessary */
-    if(ubuf) {
-      memcpy(ubuf, login, ulen);
-      ubuf[ulen] = '\0';
-      Curl_safefree(*userp);
-      *userp = ubuf;
-    }
-
-    /* Store the password portion if necessary */
-    if(pbuf) {
-      memcpy(pbuf, psep + 1, plen);
-      pbuf[plen] = '\0';
-      Curl_safefree(*passwdp);
-      *passwdp = pbuf;
-    }
-
-    /* Store the options portion if necessary */
-    if(obuf) {
-      memcpy(obuf, osep + 1, olen);
-      obuf[olen] = '\0';
-      Curl_safefree(*optionsp);
-      *optionsp = obuf;
-    }
-  }
-
-  return result;
-}
-
-/*************************************************************
- * Figure out the remote port number and fix it in the URL
- *
- * No matter if we use a proxy or not, we have to figure out the remote
- * port number of various reasons.
- *
- * The port number embedded in the URL is replaced, if necessary.
- *************************************************************/
+      result = CURLE_OUT_OF_MEMORY; 
+    } 
+  } 
+ 
+  if(!result) { 
+    /* Store the user portion if necessary */ 
+    if(ubuf) { 
+      memcpy(ubuf, login, ulen); 
+      ubuf[ulen] = '\0'; 
+      Curl_safefree(*userp); 
+      *userp = ubuf; 
+    } 
+ 
+    /* Store the password portion if necessary */ 
+    if(pbuf) { 
+      memcpy(pbuf, psep + 1, plen); 
+      pbuf[plen] = '\0'; 
+      Curl_safefree(*passwdp); 
+      *passwdp = pbuf; 
+    } 
+ 
+    /* Store the options portion if necessary */ 
+    if(obuf) { 
+      memcpy(obuf, osep + 1, olen); 
+      obuf[olen] = '\0'; 
+      Curl_safefree(*optionsp); 
+      *optionsp = obuf; 
+    } 
+  } 
+ 
+  return result; 
+} 
+ 
+/************************************************************* 
+ * Figure out the remote port number and fix it in the URL 
+ * 
+ * No matter if we use a proxy or not, we have to figure out the remote 
+ * port number of various reasons. 
+ * 
+ * The port number embedded in the URL is replaced, if necessary. 
+ *************************************************************/ 
 static CURLcode parse_remote_port(struct Curl_easy *data,
-                                  struct connectdata *conn)
-{
-
-  if(data->set.use_port && data->state.allow_port) {
+                                  struct connectdata *conn) 
+{ 
+ 
+  if(data->set.use_port && data->state.allow_port) { 
     /* if set, we use this instead of the port possibly given in the URL */
     char portbuf[16];
     CURLUcode uc;
-    conn->remote_port = (unsigned short)data->set.use_port;
+    conn->remote_port = (unsigned short)data->set.use_port; 
     msnprintf(portbuf, sizeof(portbuf), "%d", conn->remote_port);
     uc = curl_url_set(data->state.uh, CURLUPART_PORT, portbuf, 0);
     if(uc)
       return CURLE_OUT_OF_MEMORY;
-  }
-
-  return CURLE_OK;
-}
-
-/*
- * Override the login details from the URL with that in the CURLOPT_USERPWD
- * option or a .netrc file, if applicable.
- */
+  } 
+ 
+  return CURLE_OK; 
+} 
+ 
+/* 
+ * Override the login details from the URL with that in the CURLOPT_USERPWD 
+ * option or a .netrc file, if applicable. 
+ */ 
 static CURLcode override_login(struct Curl_easy *data,
-                               struct connectdata *conn,
-                               char **userp, char **passwdp, char **optionsp)
-{
+                               struct connectdata *conn, 
+                               char **userp, char **passwdp, char **optionsp) 
+{ 
   bool user_changed = FALSE;
   bool passwd_changed = FALSE;
   CURLUcode uc;
@@ -2799,32 +2799,32 @@ static CURLcode override_login(struct Curl_easy *data,
     conn->bits.user_passwd = FALSE; /* disable user+password */
   }
 
-  if(data->set.str[STRING_USERNAME]) {
-    free(*userp);
-    *userp = strdup(data->set.str[STRING_USERNAME]);
-    if(!*userp)
-      return CURLE_OUT_OF_MEMORY;
+  if(data->set.str[STRING_USERNAME]) { 
+    free(*userp); 
+    *userp = strdup(data->set.str[STRING_USERNAME]); 
+    if(!*userp) 
+      return CURLE_OUT_OF_MEMORY; 
     conn->bits.user_passwd = TRUE; /* enable user+password */
     user_changed = TRUE;
-  }
-
-  if(data->set.str[STRING_PASSWORD]) {
-    free(*passwdp);
-    *passwdp = strdup(data->set.str[STRING_PASSWORD]);
-    if(!*passwdp)
-      return CURLE_OUT_OF_MEMORY;
+  } 
+ 
+  if(data->set.str[STRING_PASSWORD]) { 
+    free(*passwdp); 
+    *passwdp = strdup(data->set.str[STRING_PASSWORD]); 
+    if(!*passwdp) 
+      return CURLE_OUT_OF_MEMORY; 
     conn->bits.user_passwd = TRUE; /* enable user+password */
     passwd_changed = TRUE;
-  }
-
-  if(data->set.str[STRING_OPTIONS]) {
-    free(*optionsp);
-    *optionsp = strdup(data->set.str[STRING_OPTIONS]);
-    if(!*optionsp)
-      return CURLE_OUT_OF_MEMORY;
-  }
-
-  conn->bits.netrc = FALSE;
+  } 
+ 
+  if(data->set.str[STRING_OPTIONS]) { 
+    free(*optionsp); 
+    *optionsp = strdup(data->set.str[STRING_OPTIONS]); 
+    if(!*optionsp) 
+      return CURLE_OUT_OF_MEMORY; 
+  } 
+ 
+  conn->bits.netrc = FALSE; 
   if(data->set.use_netrc != CURL_NETRC_IGNORED &&
       (!*userp || !**userp || !*passwdp || !**passwdp)) {
     bool netrc_user_changed = FALSE;
@@ -2837,27 +2837,27 @@ static CURLcode override_login(struct Curl_easy *data,
                           data->set.str[STRING_NETRC_FILE]);
     if(ret > 0) {
       infof(data, "Couldn't find host %s in the .netrc file; using defaults\n",
-            conn->host.name);
-    }
+            conn->host.name); 
+    } 
     else if(ret < 0) {
       return CURLE_OUT_OF_MEMORY;
     }
-    else {
-      /* set bits.netrc TRUE to remember that we got the name from a .netrc
-         file, so that it is safe to use even if we followed a Location: to a
-         different host or similar. */
-      conn->bits.netrc = TRUE;
+    else { 
+      /* set bits.netrc TRUE to remember that we got the name from a .netrc 
+         file, so that it is safe to use even if we followed a Location: to a 
+         different host or similar. */ 
+      conn->bits.netrc = TRUE; 
       conn->bits.user_passwd = TRUE; /* enable user+password */
-
+ 
       if(netrc_user_changed) {
         user_changed = TRUE;
       }
       if(netrc_passwd_changed) {
         passwd_changed = TRUE;
       }
-    }
-  }
-
+    } 
+  } 
+ 
   /* for updated strings, we update them in the URL */
   if(user_changed) {
     uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp,
@@ -2871,19 +2871,19 @@ static CURLcode override_login(struct Curl_easy *data,
     if(uc)
       return Curl_uc_to_curlcode(uc);
   }
-  return CURLE_OK;
-}
-
-/*
+  return CURLE_OK; 
+} 
+ 
+/* 
  * Set the login details so they're available in the connection
- */
+ */ 
 static CURLcode set_login(struct connectdata *conn)
-{
-  CURLcode result = CURLE_OK;
+{ 
+  CURLcode result = CURLE_OK; 
   const char *setuser = CURL_DEFAULT_USER;
   const char *setpasswd = CURL_DEFAULT_PASSWORD;
-
-  /* If our protocol needs a password and we have none, use the defaults */
+ 
+  /* If our protocol needs a password and we have none, use the defaults */ 
   if((conn->handler->flags & PROTOPT_NEEDSPWD) && !conn->bits.user_passwd)
     ;
   else {
@@ -2896,7 +2896,7 @@ static CURLcode set_login(struct connectdata *conn)
     if(!conn->user)
       return CURLE_OUT_OF_MEMORY;
   }
-
+ 
   /* Store the default password */
   if(!conn->passwd) {
     conn->passwd = strdup(setpasswd);
@@ -2961,7 +2961,7 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data,
     if(*ptr == ']')
       /* yeps, it ended nicely with a bracket as well */
       *ptr++ = '\0';
-    else
+    else 
       infof(data, "Invalid IPv6 address format\n");
     portptr = ptr;
     /* Note that if this didn't end with a bracket, we still advanced the
@@ -2974,7 +2974,7 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data,
     return CURLE_NOT_BUILT_IN;
 #endif
   }
-
+ 
   /* Get port number off server.com:1080 */
   host_portno = strchr(portptr, ':');
   if(host_portno) {
@@ -2992,7 +2992,7 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data,
       else
         port = (int)portparse; /* we know it will fit */
     }
-  }
+  } 
 
   /* now, clone the cleaned host name */
   if(hostptr) {
@@ -3032,7 +3032,7 @@ static CURLcode parse_connect_to_string(struct Curl_easy *data,
     host_match = TRUE;
     ptr++;
   }
-  else {
+  else { 
     /* check whether the URL's hostname matches */
     size_t hostname_to_match_len;
     char *hostname_to_match = aprintf("%s%s%s",
@@ -3046,11 +3046,11 @@ static CURLcode parse_connect_to_string(struct Curl_easy *data,
                                  hostname_to_match_len);
     free(hostname_to_match);
     ptr += hostname_to_match_len;
-
+ 
     host_match = host_match && *ptr == ':';
     ptr++;
-  }
-
+  } 
+ 
   if(host_match) {
     if(*ptr == ':') {
       /* an empty port always matches */
@@ -3070,12 +3070,12 @@ static CURLcode parse_connect_to_string(struct Curl_easy *data,
       }
     }
   }
-
+ 
   if(host_match && port_match) {
     /* parse the hostname and port to connect to */
     result = parse_connect_to_host_port(data, ptr, host_result, port_result);
   }
-
+ 
   return result;
 }
 
@@ -3122,8 +3122,8 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
     }
 
     conn_to_host = conn_to_host->next;
-  }
-
+  } 
+ 
 #ifndef CURL_DISABLE_ALTSVC
   if(data->asi && !host && (port == -1) &&
      ((conn->handler->protocol == CURLPROTO_HTTPS) ||
@@ -3198,42 +3198,42 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
   }
 #endif
 
-  return result;
-}
-
-/*************************************************************
- * Resolve the address of the server or proxy
- *************************************************************/
+  return result; 
+} 
+ 
+/************************************************************* 
+ * Resolve the address of the server or proxy 
+ *************************************************************/ 
 static CURLcode resolve_server(struct Curl_easy *data,
-                               struct connectdata *conn,
-                               bool *async)
-{
+                               struct connectdata *conn, 
+                               bool *async) 
+{ 
   CURLcode result = CURLE_OK;
   timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
+ 
   DEBUGASSERT(conn);
   DEBUGASSERT(data);
-  /*************************************************************
-   * Resolve the name of the server or proxy
-   *************************************************************/
-  if(conn->bits.reuse)
-    /* We're reusing the connection - no need to resolve anything, and
+  /************************************************************* 
+   * Resolve the name of the server or proxy 
+   *************************************************************/ 
+  if(conn->bits.reuse) 
+    /* We're reusing the connection - no need to resolve anything, and 
        idnconvert_hostname() was called already in create_conn() for the re-use
-       case. */
-    *async = FALSE;
-
-  else {
-    /* this is a fresh connect */
-    int rc;
+       case. */ 
+    *async = FALSE; 
+ 
+  else { 
+    /* this is a fresh connect */ 
+    int rc; 
     struct Curl_dns_entry *hostaddr = NULL;
-
+ 
 #ifdef USE_UNIX_SOCKETS
     if(conn->unix_domain_socket) {
       /* Unix domain sockets are local. The host gets ignored, just use the
        * specified domain socket address. Do not cache "DNS entries". There is
        * no DNS involved and we already have the filesystem path available */
       const char *path = conn->unix_domain_socket;
-
+ 
       hostaddr = calloc(1, sizeof(struct Curl_dns_entry));
       if(!hostaddr)
         result = CURLE_OUT_OF_MEMORY;
@@ -3266,104 +3266,104 @@ static CURLcode resolve_server(struct Curl_easy *data,
       else
         connhost = &conn->host;
 
-      /* If not connecting via a proxy, extract the port from the URL, if it is
-       * there, thus overriding any defaults that might have been set above. */
+      /* If not connecting via a proxy, extract the port from the URL, if it is 
+       * there, thus overriding any defaults that might have been set above. */ 
       if(conn->bits.conn_to_port)
         conn->port = conn->conn_to_port;
       else
         conn->port = conn->remote_port;
-
-      /* Resolve target host right on */
+ 
+      /* Resolve target host right on */ 
       conn->hostname_resolve = strdup(connhost->name);
       if(!conn->hostname_resolve)
         return CURLE_OUT_OF_MEMORY;
       rc = Curl_resolv_timeout(conn, conn->hostname_resolve, (int)conn->port,
-                               &hostaddr, timeout_ms);
-      if(rc == CURLRESOLV_PENDING)
-        *async = TRUE;
-
-      else if(rc == CURLRESOLV_TIMEDOUT)
-        result = CURLE_OPERATION_TIMEDOUT;
-
-      else if(!hostaddr) {
+                               &hostaddr, timeout_ms); 
+      if(rc == CURLRESOLV_PENDING) 
+        *async = TRUE; 
+ 
+      else if(rc == CURLRESOLV_TIMEDOUT) 
+        result = CURLE_OPERATION_TIMEDOUT; 
+ 
+      else if(!hostaddr) { 
         failf(data, "Couldn't resolve host '%s'", connhost->dispname);
         result = CURLE_COULDNT_RESOLVE_HOST;
-        /* don't return yet, we need to clean up the timeout first */
-      }
-    }
+        /* don't return yet, we need to clean up the timeout first */ 
+      } 
+    } 
 #ifndef CURL_DISABLE_PROXY
-    else {
-      /* This is a proxy that hasn't been resolved yet. */
-
+    else { 
+      /* This is a proxy that hasn't been resolved yet. */ 
+ 
       struct hostname * const host = conn->bits.socksproxy ?
         &conn->socks_proxy.host : &conn->http_proxy.host;
-
-      /* resolve proxy */
+ 
+      /* resolve proxy */ 
       conn->hostname_resolve = strdup(host->name);
       if(!conn->hostname_resolve)
         return CURLE_OUT_OF_MEMORY;
       rc = Curl_resolv_timeout(conn, conn->hostname_resolve, (int)conn->port,
-                               &hostaddr, timeout_ms);
-
-      if(rc == CURLRESOLV_PENDING)
-        *async = TRUE;
-
-      else if(rc == CURLRESOLV_TIMEDOUT)
-        result = CURLE_OPERATION_TIMEDOUT;
-
-      else if(!hostaddr) {
+                               &hostaddr, timeout_ms); 
+ 
+      if(rc == CURLRESOLV_PENDING) 
+        *async = TRUE; 
+ 
+      else if(rc == CURLRESOLV_TIMEDOUT) 
+        result = CURLE_OPERATION_TIMEDOUT; 
+ 
+      else if(!hostaddr) { 
         failf(data, "Couldn't resolve proxy '%s'", host->dispname);
-        result = CURLE_COULDNT_RESOLVE_PROXY;
-        /* don't return yet, we need to clean up the timeout first */
-      }
-    }
-#endif
-    DEBUGASSERT(conn->dns_entry == NULL);
-    conn->dns_entry = hostaddr;
-  }
-
-  return result;
-}
-
-/*
- * Cleanup the connection just allocated before we can move along and use the
- * previously existing one.  All relevant data is copied over and old_conn is
- * ready for freeing once this function returns.
- */
-static void reuse_conn(struct connectdata *old_conn,
-                       struct connectdata *conn)
-{
+        result = CURLE_COULDNT_RESOLVE_PROXY; 
+        /* don't return yet, we need to clean up the timeout first */ 
+      } 
+    } 
+#endif
+    DEBUGASSERT(conn->dns_entry == NULL); 
+    conn->dns_entry = hostaddr; 
+  } 
+ 
+  return result; 
+} 
+ 
+/* 
+ * Cleanup the connection just allocated before we can move along and use the 
+ * previously existing one.  All relevant data is copied over and old_conn is 
+ * ready for freeing once this function returns. 
+ */ 
+static void reuse_conn(struct connectdata *old_conn, 
+                       struct connectdata *conn) 
+{ 
 #ifndef CURL_DISABLE_PROXY
   Curl_free_idnconverted_hostname(&old_conn->http_proxy.host);
   Curl_free_idnconverted_hostname(&old_conn->socks_proxy.host);
-
+ 
   free(old_conn->http_proxy.host.rawalloc);
   free(old_conn->socks_proxy.host.rawalloc);
   Curl_free_primary_ssl_config(&old_conn->proxy_ssl_config);
 #endif
-  /* free the SSL config struct from this connection struct as this was
-     allocated in vain and is targeted for destruction */
+  /* free the SSL config struct from this connection struct as this was 
+     allocated in vain and is targeted for destruction */ 
   Curl_free_primary_ssl_config(&old_conn->ssl_config);
-
-  conn->data = old_conn->data;
-
-  /* get the user+password information from the old_conn struct since it may
-   * be new for this request even when we re-use an existing connection */
-  conn->bits.user_passwd = old_conn->bits.user_passwd;
-  if(conn->bits.user_passwd) {
-    /* use the new user name and password though */
-    Curl_safefree(conn->user);
-    Curl_safefree(conn->passwd);
-    conn->user = old_conn->user;
-    conn->passwd = old_conn->passwd;
-    old_conn->user = NULL;
-    old_conn->passwd = NULL;
-  }
-
+ 
+  conn->data = old_conn->data; 
+ 
+  /* get the user+password information from the old_conn struct since it may 
+   * be new for this request even when we re-use an existing connection */ 
+  conn->bits.user_passwd = old_conn->bits.user_passwd; 
+  if(conn->bits.user_passwd) { 
+    /* use the new user name and password though */ 
+    Curl_safefree(conn->user); 
+    Curl_safefree(conn->passwd); 
+    conn->user = old_conn->user; 
+    conn->passwd = old_conn->passwd; 
+    old_conn->user = NULL; 
+    old_conn->passwd = NULL; 
+  } 
+ 
 #ifndef CURL_DISABLE_PROXY
-  conn->bits.proxy_user_passwd = old_conn->bits.proxy_user_passwd;
-  if(conn->bits.proxy_user_passwd) {
-    /* use the new proxy user name and proxy password though */
+  conn->bits.proxy_user_passwd = old_conn->bits.proxy_user_passwd; 
+  if(conn->bits.proxy_user_passwd) { 
+    /* use the new proxy user name and proxy password though */ 
     Curl_safefree(conn->http_proxy.user);
     Curl_safefree(conn->socks_proxy.user);
     Curl_safefree(conn->http_proxy.passwd);
@@ -3376,108 +3376,108 @@ static void reuse_conn(struct connectdata *old_conn,
     old_conn->socks_proxy.user = NULL;
     old_conn->http_proxy.passwd = NULL;
     old_conn->socks_proxy.passwd = NULL;
-  }
+  } 
   Curl_safefree(old_conn->http_proxy.user);
   Curl_safefree(old_conn->socks_proxy.user);
   Curl_safefree(old_conn->http_proxy.passwd);
   Curl_safefree(old_conn->socks_proxy.passwd);
 #endif
-
-  /* host can change, when doing keepalive with a proxy or if the case is
-     different this time etc */
+ 
+  /* host can change, when doing keepalive with a proxy or if the case is 
+     different this time etc */ 
   Curl_free_idnconverted_hostname(&conn->host);
   Curl_free_idnconverted_hostname(&conn->conn_to_host);
-  Curl_safefree(conn->host.rawalloc);
+  Curl_safefree(conn->host.rawalloc); 
   Curl_safefree(conn->conn_to_host.rawalloc);
   conn->host = old_conn->host;
   conn->conn_to_host = old_conn->conn_to_host;
   conn->conn_to_port = old_conn->conn_to_port;
   conn->remote_port = old_conn->remote_port;
   Curl_safefree(conn->hostname_resolve);
-
+ 
   conn->hostname_resolve = old_conn->hostname_resolve;
   old_conn->hostname_resolve = NULL;
 
-  /* persist connection info in session handle */
-  Curl_persistconninfo(conn);
-
+  /* persist connection info in session handle */ 
+  Curl_persistconninfo(conn); 
+ 
   conn_reset_all_postponed_data(old_conn); /* free buffers */
 
-  /* re-use init */
-  conn->bits.reuse = TRUE; /* yes, we're re-using here */
-
-  Curl_safefree(old_conn->user);
-  Curl_safefree(old_conn->passwd);
+  /* re-use init */ 
+  conn->bits.reuse = TRUE; /* yes, we're re-using here */ 
+ 
+  Curl_safefree(old_conn->user); 
+  Curl_safefree(old_conn->passwd); 
   Curl_safefree(old_conn->options);
-  Curl_safefree(old_conn->localdev);
+  Curl_safefree(old_conn->localdev); 
   Curl_llist_destroy(&old_conn->easyq, NULL);
-
+ 
 #ifdef USE_UNIX_SOCKETS
   Curl_safefree(old_conn->unix_domain_socket);
 #endif
-}
-
-/**
- * create_conn() sets up a new connectdata struct, or re-uses an already
- * existing one, and resolves host name.
- *
- * if this function returns CURLE_OK and *async is set to TRUE, the resolve
- * response will be coming asynchronously. If *async is FALSE, the name is
- * already resolved.
- *
- * @param data The sessionhandle pointer
- * @param in_connect is set to the next connection data pointer
- * @param async is set TRUE when an async DNS resolution is pending
- * @see Curl_setup_conn()
- *
- * *NOTE* this function assigns the conn->data pointer!
- */
-
+} 
+ 
+/** 
+ * create_conn() sets up a new connectdata struct, or re-uses an already 
+ * existing one, and resolves host name. 
+ * 
+ * if this function returns CURLE_OK and *async is set to TRUE, the resolve 
+ * response will be coming asynchronously. If *async is FALSE, the name is 
+ * already resolved. 
+ * 
+ * @param data The sessionhandle pointer 
+ * @param in_connect is set to the next connection data pointer 
+ * @param async is set TRUE when an async DNS resolution is pending 
+ * @see Curl_setup_conn() 
+ * 
+ * *NOTE* this function assigns the conn->data pointer! 
+ */ 
+ 
 static CURLcode create_conn(struct Curl_easy *data,
-                            struct connectdata **in_connect,
-                            bool *async)
-{
-  CURLcode result = CURLE_OK;
-  struct connectdata *conn;
-  struct connectdata *conn_temp = NULL;
-  bool reuse;
+                            struct connectdata **in_connect, 
+                            bool *async) 
+{ 
+  CURLcode result = CURLE_OK; 
+  struct connectdata *conn; 
+  struct connectdata *conn_temp = NULL; 
+  bool reuse; 
   bool connections_available = TRUE;
   bool force_reuse = FALSE;
   bool waitpipe = FALSE;
-  size_t max_host_connections = Curl_multi_max_host_connections(data->multi);
-  size_t max_total_connections = Curl_multi_max_total_connections(data->multi);
-
-  *async = FALSE;
+  size_t max_host_connections = Curl_multi_max_host_connections(data->multi); 
+  size_t max_total_connections = Curl_multi_max_total_connections(data->multi); 
+ 
+  *async = FALSE; 
   *in_connect = NULL;
-
-  /*************************************************************
-   * Check input data
-   *************************************************************/
-  if(!data->change.url) {
-    result = CURLE_URL_MALFORMAT;
-    goto out;
-  }
-
-  /* First, split up the current URL in parts so that we can use the
-     parts for checking against the already present connections. In order
-     to not have to modify everything at once, we allocate a temporary
-     connection data struct and fill in for comparison purposes. */
-  conn = allocate_conn(data);
-
-  if(!conn) {
-    result = CURLE_OUT_OF_MEMORY;
-    goto out;
-  }
-
-  /* We must set the return variable as soon as possible, so that our
-     parent can cleanup any possible allocs we may have done before
-     any failure */
-  *in_connect = conn;
-
+ 
+  /************************************************************* 
+   * Check input data 
+   *************************************************************/ 
+  if(!data->change.url) { 
+    result = CURLE_URL_MALFORMAT; 
+    goto out; 
+  } 
+ 
+  /* First, split up the current URL in parts so that we can use the 
+     parts for checking against the already present connections. In order 
+     to not have to modify everything at once, we allocate a temporary 
+     connection data struct and fill in for comparison purposes. */ 
+  conn = allocate_conn(data); 
+ 
+  if(!conn) { 
+    result = CURLE_OUT_OF_MEMORY; 
+    goto out; 
+  } 
+ 
+  /* We must set the return variable as soon as possible, so that our 
+     parent can cleanup any possible allocs we may have done before 
+     any failure */ 
+  *in_connect = conn; 
+ 
   result = parseurlandfillconn(data, conn);
   if(result)
-    goto out;
-
+    goto out; 
+ 
   if(data->set.str[STRING_SASL_AUTHZID]) {
     conn->sasl_authzid = strdup(data->set.str[STRING_SASL_AUTHZID]);
     if(!conn->sasl_authzid) {
@@ -3494,74 +3494,74 @@ static CURLcode create_conn(struct Curl_easy *data,
       goto out;
     }
     conn->bits.abstract_unix_socket = data->set.abstract_unix_socket;
-  }
+  } 
 #endif
-
+ 
   /* After the unix socket init but before the proxy vars are used, parse and
      initialize the proxy vars */
 #ifndef CURL_DISABLE_PROXY
   result = create_conn_helper_init_proxy(conn);
   if(result)
-    goto out;
-
-  /*************************************************************
+    goto out; 
+ 
+  /************************************************************* 
    * If the protocol is using SSL and HTTP proxy is used, we set
    * the tunnel_proxy bit.
-   *************************************************************/
+   *************************************************************/ 
   if((conn->given->flags&PROTOPT_SSL) && conn->bits.httpproxy)
     conn->bits.tunnel_proxy = TRUE;
 #endif
-
-  /*************************************************************
+ 
+  /************************************************************* 
    * Figure out the remote port number and fix it in the URL
-   *************************************************************/
+   *************************************************************/ 
   result = parse_remote_port(data, conn);
   if(result)
     goto out;
-
+ 
   /* Check for overridden login details and set them accordingly so they
      they are known when protocol->setup_connection is called! */
   result = override_login(data, conn, &conn->user, &conn->passwd,
                           &conn->options);
   if(result)
     goto out;
-
+ 
   result = set_login(conn); /* default credentials */
   if(result)
     goto out;
-
-  /*************************************************************
+ 
+  /************************************************************* 
    * Process the "connect to" linked list of hostname/port mappings.
    * Do this after the remote port number has been fixed in the URL.
-   *************************************************************/
+   *************************************************************/ 
   result = parse_connect_to_slist(data, conn, data->set.connect_to);
   if(result)
     goto out;
-
-  /*************************************************************
+ 
+  /************************************************************* 
    * IDN-convert the hostnames
-   *************************************************************/
+   *************************************************************/ 
   result = Curl_idnconvert_hostname(conn, &conn->host);
   if(result)
     goto out;
   if(conn->bits.conn_to_host) {
     result = Curl_idnconvert_hostname(conn, &conn->conn_to_host);
     if(result)
-      goto out;
-  }
+      goto out; 
+  } 
 #ifndef CURL_DISABLE_PROXY
   if(conn->bits.httpproxy) {
     result = Curl_idnconvert_hostname(conn, &conn->http_proxy.host);
     if(result)
       goto out;
-  }
+  } 
   if(conn->bits.socksproxy) {
     result = Curl_idnconvert_hostname(conn, &conn->socks_proxy.host);
-    if(result)
-      goto out;
+    if(result) 
+      goto out; 
   }
 #endif
-
+ 
   /*************************************************************
    * Check whether the host and the "connect to host" are equal.
    * Do this after the hostnames have been IDN-converted.
@@ -3569,91 +3569,91 @@ static CURLcode create_conn(struct Curl_easy *data,
   if(conn->bits.conn_to_host &&
      strcasecompare(conn->conn_to_host.name, conn->host.name)) {
     conn->bits.conn_to_host = FALSE;
-  }
-
-  /*************************************************************
+  } 
+ 
+  /************************************************************* 
    * Check whether the port and the "connect to port" are equal.
    * Do this after the remote port number has been fixed in the URL.
-   *************************************************************/
+   *************************************************************/ 
   if(conn->bits.conn_to_port && conn->conn_to_port == conn->remote_port) {
     conn->bits.conn_to_port = FALSE;
   }
-
+ 
 #ifndef CURL_DISABLE_PROXY
-  /*************************************************************
+  /************************************************************* 
    * If the "connect to" feature is used with an HTTP proxy,
    * we set the tunnel_proxy bit.
-   *************************************************************/
+   *************************************************************/ 
   if((conn->bits.conn_to_host || conn->bits.conn_to_port) &&
       conn->bits.httpproxy)
     conn->bits.tunnel_proxy = TRUE;
 #endif
-
-  /*************************************************************
-   * Setup internals depending on protocol. Needs to be done after
-   * we figured out what/if proxy to use.
-   *************************************************************/
-  result = setup_connection_internals(conn);
+ 
+  /************************************************************* 
+   * Setup internals depending on protocol. Needs to be done after 
+   * we figured out what/if proxy to use. 
+   *************************************************************/ 
+  result = setup_connection_internals(conn); 
   if(result)
-    goto out;
-
-  conn->recv[FIRSTSOCKET] = Curl_recv_plain;
-  conn->send[FIRSTSOCKET] = Curl_send_plain;
-  conn->recv[SECONDARYSOCKET] = Curl_recv_plain;
-  conn->send[SECONDARYSOCKET] = Curl_send_plain;
-
+    goto out; 
+ 
+  conn->recv[FIRSTSOCKET] = Curl_recv_plain; 
+  conn->send[FIRSTSOCKET] = Curl_send_plain; 
+  conn->recv[SECONDARYSOCKET] = Curl_recv_plain; 
+  conn->send[SECONDARYSOCKET] = Curl_send_plain; 
+ 
   conn->bits.tcp_fastopen = data->set.tcp_fastopen;
 
-  /***********************************************************************
-   * file: is a special case in that it doesn't need a network connection
-   ***********************************************************************/
-#ifndef CURL_DISABLE_FILE
-  if(conn->handler->flags & PROTOPT_NONETWORK) {
-    bool done;
-    /* this is supposed to be the connect function so we better at least check
-       that the file is present here! */
-    DEBUGASSERT(conn->handler->connect_it);
+  /*********************************************************************** 
+   * file: is a special case in that it doesn't need a network connection 
+   ***********************************************************************/ 
+#ifndef CURL_DISABLE_FILE 
+  if(conn->handler->flags & PROTOPT_NONETWORK) { 
+    bool done; 
+    /* this is supposed to be the connect function so we better at least check 
+       that the file is present here! */ 
+    DEBUGASSERT(conn->handler->connect_it); 
     Curl_persistconninfo(conn);
-    result = conn->handler->connect_it(conn, &done);
-
-    /* Setup a "faked" transfer that'll do nothing */
+    result = conn->handler->connect_it(conn, &done); 
+ 
+    /* Setup a "faked" transfer that'll do nothing */ 
     if(!result) {
-      conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; /* we are "connected */
-
+      conn->bits.tcpconnect[FIRSTSOCKET] = TRUE; /* we are "connected */ 
+ 
       Curl_attach_connnection(data, conn);
       result = Curl_conncache_add_conn(data->state.conn_cache, conn);
       if(result)
         goto out;
-
-      /*
-       * Setup whatever necessary for a resumed transfer
-       */
-      result = setup_range(data);
-      if(result) {
-        DEBUGASSERT(conn->handler->done);
-        /* we ignore the return code for the protocol-specific DONE */
-        (void)conn->handler->done(conn, result, FALSE);
-        goto out;
-      }
+ 
+      /* 
+       * Setup whatever necessary for a resumed transfer 
+       */ 
+      result = setup_range(data); 
+      if(result) { 
+        DEBUGASSERT(conn->handler->done); 
+        /* we ignore the return code for the protocol-specific DONE */ 
+        (void)conn->handler->done(conn, result, FALSE); 
+        goto out; 
+      } 
       Curl_setup_transfer(data, -1, -1, FALSE, -1);
-    }
-
-    /* since we skip do_init() */
+    } 
+ 
+    /* since we skip do_init() */ 
     Curl_init_do(data, conn);
-
-    goto out;
-  }
-#endif
-
-  /* Get a cloned copy of the SSL config situation stored in the
-     connection struct. But to get this going nicely, we must first make
-     sure that the strings in the master copy are pointing to the correct
-     strings in the session handle strings array!
-
-     Keep in mind that the pointers in the master copy are pointing to strings
+ 
+    goto out; 
+  } 
+#endif 
+ 
+  /* Get a cloned copy of the SSL config situation stored in the 
+     connection struct. But to get this going nicely, we must first make 
+     sure that the strings in the master copy are pointing to the correct 
+     strings in the session handle strings array! 
+ 
+     Keep in mind that the pointers in the master copy are pointing to strings 
      that will be freed as part of the Curl_easy struct, but all cloned
-     copies will be separately allocated.
-  */
+     copies will be separately allocated. 
+  */ 
   data->set.ssl.primary.CApath = data->set.str[STRING_SSL_CAPATH_ORIG];
   data->set.ssl.primary.CAfile = data->set.str[STRING_SSL_CAFILE_ORIG];
   data->set.ssl.primary.random_file = data->set.str[STRING_SSL_RANDOM_FILE];
@@ -3696,24 +3696,24 @@ static CURLcode create_conn(struct Curl_easy *data,
   data->set.ssl.key_type = data->set.str[STRING_KEY_TYPE_ORIG];
   data->set.ssl.key_passwd = data->set.str[STRING_KEY_PASSWD_ORIG];
   data->set.ssl.primary.clientcert = data->set.str[STRING_CERT_ORIG];
-#ifdef USE_TLS_SRP
+#ifdef USE_TLS_SRP 
   data->set.ssl.username = data->set.str[STRING_TLSAUTH_USERNAME_ORIG];
   data->set.ssl.password = data->set.str[STRING_TLSAUTH_PASSWORD_ORIG];
 #ifndef CURL_DISABLE_PROXY
   data->set.proxy_ssl.username = data->set.str[STRING_TLSAUTH_USERNAME_PROXY];
   data->set.proxy_ssl.password = data->set.str[STRING_TLSAUTH_PASSWORD_PROXY];
+#endif 
 #endif
-#endif
-
+ 
   data->set.ssl.key_blob = data->set.blobs[BLOB_KEY_ORIG];
   data->set.ssl.issuercert_blob = data->set.blobs[BLOB_SSL_ISSUERCERT_ORIG];
 
   if(!Curl_clone_primary_ssl_config(&data->set.ssl.primary,
                                     &conn->ssl_config)) {
-    result = CURLE_OUT_OF_MEMORY;
-    goto out;
-  }
-
+    result = CURLE_OUT_OF_MEMORY; 
+    goto out; 
+  } 
+ 
 #ifndef CURL_DISABLE_PROXY
   if(!Curl_clone_primary_ssl_config(&data->set.proxy_ssl.primary,
                                     &conn->proxy_ssl_config)) {
@@ -3724,43 +3724,43 @@ static CURLcode create_conn(struct Curl_easy *data,
 
   prune_dead_connections(data);
 
-  /*************************************************************
-   * Check the current list of connections to see if we can
-   * re-use an already existing one or if we have to create a
-   * new one.
-   *************************************************************/
-
+  /************************************************************* 
+   * Check the current list of connections to see if we can 
+   * re-use an already existing one or if we have to create a 
+   * new one. 
+   *************************************************************/ 
+ 
   DEBUGASSERT(conn->user);
   DEBUGASSERT(conn->passwd);
 
-  /* reuse_fresh is TRUE if we are told to use a new connection by force, but
-     we only acknowledge this option if this is not a re-used connection
-     already (which happens due to follow-location or during a HTTP
+  /* reuse_fresh is TRUE if we are told to use a new connection by force, but 
+     we only acknowledge this option if this is not a re-used connection 
+     already (which happens due to follow-location or during a HTTP 
      authentication phase). CONNECT_ONLY transfers also refuse reuse. */
   if((data->set.reuse_fresh && !data->state.this_is_a_follow) ||
      data->set.connect_only)
-    reuse = FALSE;
-  else
+    reuse = FALSE; 
+  else 
     reuse = ConnectionExists(data, conn, &conn_temp, &force_reuse, &waitpipe);
-
-  if(reuse) {
-    /*
-     * We already have a connection for this, we got the former connection
-     * in the conn_temp variable and thus we need to cleanup the one we
-     * just allocated before we can move along and use the previously
-     * existing one.
-     */
-    reuse_conn(conn, conn_temp);
+ 
+  if(reuse) { 
+    /* 
+     * We already have a connection for this, we got the former connection 
+     * in the conn_temp variable and thus we need to cleanup the one we 
+     * just allocated before we can move along and use the previously 
+     * existing one. 
+     */ 
+    reuse_conn(conn, conn_temp); 
 #ifdef USE_SSL
     free(conn->ssl_extra);
 #endif
-    free(conn);          /* we don't need this anymore */
-    conn = conn_temp;
-    *in_connect = conn;
-
+    free(conn);          /* we don't need this anymore */ 
+    conn = conn_temp; 
+    *in_connect = conn; 
+ 
 #ifndef CURL_DISABLE_PROXY
     infof(data, "Re-using existing connection! (#%ld) with %s %s\n",
-          conn->connection_id,
+          conn->connection_id, 
           conn->bits.proxy?"proxy":"host",
           conn->socks_proxy.host.name ? conn->socks_proxy.host.dispname :
           conn->http_proxy.host.name ? conn->http_proxy.host.dispname :
@@ -3769,12 +3769,12 @@ static CURLcode create_conn(struct Curl_easy *data,
     infof(data, "Re-using existing connection! (#%ld) with host %s\n",
           conn->connection_id, conn->host.dispname);
 #endif
-  }
-  else {
-    /* We have decided that we want a new connection. However, we may not
-       be able to do that if we have reached the limit of how many
-       connections we are allowed to open. */
-
+  } 
+  else { 
+    /* We have decided that we want a new connection. However, we may not 
+       be able to do that if we have reached the limit of how many 
+       connections we are allowed to open. */ 
+ 
     if(conn->handler->flags & PROTOPT_ALPN_NPN) {
       /* The protocol wants it, so set the bits if enabled in the easy handle
          (default) */
@@ -3783,7 +3783,7 @@ static CURLcode create_conn(struct Curl_easy *data,
       if(data->set.ssl_enable_npn)
         conn->bits.tls_enable_npn = TRUE;
     }
-
+ 
     if(waitpipe)
       /* There is a connection that *might* become usable for multiplexing
          "soon", and we wait for that */
@@ -3793,7 +3793,7 @@ static CURLcode create_conn(struct Curl_easy *data,
       const char *bundlehost;
       struct connectbundle *bundle =
         Curl_conncache_find_bundle(conn, data->state.conn_cache, &bundlehost);
-
+ 
       if(max_host_connections > 0 && bundle &&
          (bundle->num_connections >= max_host_connections)) {
         struct connectdata *conn_candidate;
@@ -3809,47 +3809,47 @@ static CURLcode create_conn(struct Curl_easy *data,
                 bundlehost, max_host_connections);
           connections_available = FALSE;
         }
-      }
-      else
+      } 
+      else 
         CONNCACHE_UNLOCK(data);
 
-    }
-
+    } 
+ 
     if(connections_available &&
        (max_total_connections > 0) &&
        (Curl_conncache_size(data) >= max_total_connections)) {
-      struct connectdata *conn_candidate;
-
-      /* The cache is full. Let's see if we can kill a connection. */
+      struct connectdata *conn_candidate; 
+ 
+      /* The cache is full. Let's see if we can kill a connection. */ 
       conn_candidate = Curl_conncache_extract_oldest(data);
       if(conn_candidate)
         (void)Curl_disconnect(data, conn_candidate, FALSE);
       else {
         infof(data, "No connections available in cache\n");
         connections_available = FALSE;
-      }
-    }
-
+      } 
+    } 
+ 
     if(!connections_available) {
-      infof(data, "No connections available.\n");
-
-      conn_free(conn);
-      *in_connect = NULL;
-
-      result = CURLE_NO_CONNECTION_AVAILABLE;
-      goto out;
-    }
-    else {
-      /*
-       * This is a brand new connection, so let's store it in the connection
-       * cache of ours!
-       */
+      infof(data, "No connections available.\n"); 
+ 
+      conn_free(conn); 
+      *in_connect = NULL; 
+ 
+      result = CURLE_NO_CONNECTION_AVAILABLE; 
+      goto out; 
+    } 
+    else { 
+      /* 
+       * This is a brand new connection, so let's store it in the connection 
+       * cache of ours! 
+       */ 
       Curl_attach_connnection(data, conn);
 
       result = Curl_conncache_add_conn(data->state.conn_cache, conn);
       if(result)
         goto out;
-    }
+    } 
 
 #if defined(USE_NTLM)
     /* If NTLM is requested in a part of this connection, make sure we don't
@@ -3869,32 +3869,32 @@ static CURLcode create_conn(struct Curl_easy *data,
       data->state.authproxy.done = FALSE;
     }
 #endif
-  }
-
-  /* Setup and init stuff before DO starts, in preparing for the transfer. */
+  } 
+ 
+  /* Setup and init stuff before DO starts, in preparing for the transfer. */ 
   Curl_init_do(data, conn);
-
-  /*
-   * Setup whatever necessary for a resumed transfer
-   */
-  result = setup_range(data);
-  if(result)
-    goto out;
-
-  /* Continue connectdata initialization here. */
-
-  /*
-   * Inherit the proper values from the urldata struct AFTER we have arranged
-   * the persistent connection stuff
-   */
-  conn->seek_func = data->set.seek_func;
-  conn->seek_client = data->set.seek_client;
-
-  /*************************************************************
-   * Resolve the address of the server or proxy
-   *************************************************************/
-  result = resolve_server(data, conn, async);
-
+ 
+  /* 
+   * Setup whatever necessary for a resumed transfer 
+   */ 
+  result = setup_range(data); 
+  if(result) 
+    goto out; 
+ 
+  /* Continue connectdata initialization here. */ 
+ 
+  /* 
+   * Inherit the proper values from the urldata struct AFTER we have arranged 
+   * the persistent connection stuff 
+   */ 
+  conn->seek_func = data->set.seek_func; 
+  conn->seek_client = data->set.seek_client; 
+ 
+  /************************************************************* 
+   * Resolve the address of the server or proxy 
+   *************************************************************/ 
+  result = resolve_server(data, conn, async); 
+ 
   /* Strip trailing dots. resolve_server copied the name. */
   strip_trailing_dot(&conn->host);
 #ifndef CURL_DISABLE_PROXY
@@ -3905,70 +3905,70 @@ static CURLcode create_conn(struct Curl_easy *data,
 #endif
   if(conn->bits.conn_to_host)
     strip_trailing_dot(&conn->conn_to_host);
-
+ 
 out:
-  return result;
-}
-
-/* Curl_setup_conn() is called after the name resolve initiated in
- * create_conn() is all done.
- *
- * Curl_setup_conn() also handles reused connections
- *
- * conn->data MUST already have been setup fine (in create_conn)
- */
-
-CURLcode Curl_setup_conn(struct connectdata *conn,
-                         bool *protocol_done)
-{
-  CURLcode result = CURLE_OK;
+  return result; 
+} 
+ 
+/* Curl_setup_conn() is called after the name resolve initiated in 
+ * create_conn() is all done. 
+ * 
+ * Curl_setup_conn() also handles reused connections 
+ * 
+ * conn->data MUST already have been setup fine (in create_conn) 
+ */ 
+ 
+CURLcode Curl_setup_conn(struct connectdata *conn, 
+                         bool *protocol_done) 
+{ 
+  CURLcode result = CURLE_OK; 
   struct Curl_easy *data = conn->data;
-
-  Curl_pgrsTime(data, TIMER_NAMELOOKUP);
-
-  if(conn->handler->flags & PROTOPT_NONETWORK) {
-    /* nothing to setup when not using a network */
-    *protocol_done = TRUE;
-    return result;
-  }
-  *protocol_done = FALSE; /* default to not done */
-
+ 
+  Curl_pgrsTime(data, TIMER_NAMELOOKUP); 
+ 
+  if(conn->handler->flags & PROTOPT_NONETWORK) { 
+    /* nothing to setup when not using a network */ 
+    *protocol_done = TRUE; 
+    return result; 
+  } 
+  *protocol_done = FALSE; /* default to not done */ 
+ 
 #ifndef CURL_DISABLE_PROXY
-  /* set proxy_connect_closed to false unconditionally already here since it
-     is used strictly to provide extra information to a parent function in the
-     case of proxy CONNECT failures and we must make sure we don't have it
-     lingering set from a previous invoke */
-  conn->bits.proxy_connect_closed = FALSE;
-#endif
-  /*
-   * Set user-agent. Used for HTTP, but since we can attempt to tunnel
-   * basically anything through a http proxy we can't limit this based on
-   * protocol.
-   */
-  if(data->set.str[STRING_USERAGENT]) {
+  /* set proxy_connect_closed to false unconditionally already here since it 
+     is used strictly to provide extra information to a parent function in the 
+     case of proxy CONNECT failures and we must make sure we don't have it 
+     lingering set from a previous invoke */ 
+  conn->bits.proxy_connect_closed = FALSE; 
+#endif
+  /* 
+   * Set user-agent. Used for HTTP, but since we can attempt to tunnel 
+   * basically anything through a http proxy we can't limit this based on 
+   * protocol. 
+   */ 
+  if(data->set.str[STRING_USERAGENT]) { 
     Curl_safefree(data->state.aptr.uagent);
     data->state.aptr.uagent =
-      aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]);
+      aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]); 
     if(!data->state.aptr.uagent)
-      return CURLE_OUT_OF_MEMORY;
-  }
-
-  data->req.headerbytecount = 0;
-
-#ifdef CURL_DO_LINEEND_CONV
-  data->state.crlf_conversions = 0; /* reset CRLF conversion counter */
-#endif /* CURL_DO_LINEEND_CONV */
-
-  /* set start time here for timeout purposes in the connect procedure, it
-     is later set again for the progress meter purpose */
+      return CURLE_OUT_OF_MEMORY; 
+  } 
+ 
+  data->req.headerbytecount = 0; 
+ 
+#ifdef CURL_DO_LINEEND_CONV 
+  data->state.crlf_conversions = 0; /* reset CRLF conversion counter */ 
+#endif /* CURL_DO_LINEEND_CONV */ 
+ 
+  /* set start time here for timeout purposes in the connect procedure, it 
+     is later set again for the progress meter purpose */ 
   conn->now = Curl_now();
-
+ 
   if(CURL_SOCKET_BAD == conn->sock[FIRSTSOCKET]) {
     conn->bits.tcpconnect[FIRSTSOCKET] = FALSE;
     result = Curl_connecthost(conn, conn->dns_entry);
     if(result)
       return result;
-  }
+  } 
   else {
     Curl_pgrsTime(data, TIMER_CONNECT);    /* we're connected already */
     if(conn->ssl[FIRSTSOCKET].use ||
@@ -3978,70 +3978,70 @@ CURLcode Curl_setup_conn(struct connectdata *conn,
     *protocol_done = TRUE;
     Curl_updateconninfo(conn, conn->sock[FIRSTSOCKET]);
     Curl_verboseconnect(conn);
-  }
-
+  } 
+ 
   conn->now = Curl_now(); /* time this *after* the connect is done, we set
                              this here perhaps a second time */
-  return result;
-}
-
+  return result; 
+} 
+ 
 CURLcode Curl_connect(struct Curl_easy *data,
-                      bool *asyncp,
-                      bool *protocol_done)
-{
+                      bool *asyncp, 
+                      bool *protocol_done) 
+{ 
   CURLcode result;
   struct connectdata *conn;
-
-  *asyncp = FALSE; /* assume synchronous resolves by default */
-
+ 
+  *asyncp = FALSE; /* assume synchronous resolves by default */ 
+ 
   /* init the single-transfer specific data */
   Curl_free_request_state(data);
   memset(&data->req, 0, sizeof(struct SingleRequest));
   data->req.maxdownload = -1;
 
-  /* call the stuff that needs to be called */
+  /* call the stuff that needs to be called */ 
   result = create_conn(data, &conn, asyncp);
-
+ 
   if(!result) {
     if(CONN_INUSE(conn) > 1)
       /* multiplexed */
-      *protocol_done = TRUE;
-    else if(!*asyncp) {
-      /* DNS resolution is done: that's either because this is a reused
-         connection, in which case DNS was unnecessary, or because DNS
-         really did finish already (synch resolver/fast async resolve) */
+      *protocol_done = TRUE; 
+    else if(!*asyncp) { 
+      /* DNS resolution is done: that's either because this is a reused 
+         connection, in which case DNS was unnecessary, or because DNS 
+         really did finish already (synch resolver/fast async resolve) */ 
       result = Curl_setup_conn(conn, protocol_done);
-    }
-  }
-
+    } 
+  } 
+ 
   if(result == CURLE_NO_CONNECTION_AVAILABLE) {
     return result;
-  }
+  } 
   else if(result && conn) {
     /* We're not allowed to return failure with memory left allocated in the
        connectdata struct, free those here */
     Curl_detach_connnection(data);
     Curl_conncache_remove_conn(data, conn, TRUE);
     Curl_disconnect(data, conn, TRUE);
-  }
-
-  return result;
-}
-
-/*
+  } 
+ 
+  return result; 
+} 
+ 
+/* 
  * Curl_init_do() inits the readwrite session. This is inited each time (in
  * the DO function before the protocol-specific DO functions are invoked) for
  * a transfer, sometimes multiple times on the same Curl_easy. Make sure
- * nothing in here depends on stuff that are setup dynamically for the
- * transfer.
+ * nothing in here depends on stuff that are setup dynamically for the 
+ * transfer. 
  *
  * Allow this function to get called with 'conn' set to NULL.
- */
-
+ */ 
+ 
 CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
-{
-  struct SingleRequest *k = &data->req;
-
+{ 
+  struct SingleRequest *k = &data->req; 
+ 
   /* if this is a pushed stream, we need this: */
   CURLcode result = Curl_preconnect(data);
   if(result)
@@ -4057,21 +4057,21 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
   }
 
   data->state.done = FALSE; /* *_done() is not called yet */
-  data->state.expect100header = FALSE;
-
-  if(data->set.opt_no_body)
-    /* in HTTP lingo, no body means using the HEAD request... */
+  data->state.expect100header = FALSE; 
+ 
+  if(data->set.opt_no_body) 
+    /* in HTTP lingo, no body means using the HEAD request... */ 
     data->state.httpreq = HTTPREQ_HEAD;
-
+ 
   k->start = Curl_now(); /* start time */
-  k->now = k->start;   /* current time is now */
-  k->header = TRUE; /* assume header */
-  k->bytecount = 0;
+  k->now = k->start;   /* current time is now */ 
+  k->header = TRUE; /* assume header */ 
+  k->bytecount = 0; 
   k->ignorebody = FALSE;
-
-  Curl_speedinit(data);
-  Curl_pgrsSetUploadCounter(data, 0);
-  Curl_pgrsSetDownloadCounter(data, 0);
-
-  return CURLE_OK;
-}
+ 
+  Curl_speedinit(data); 
+  Curl_pgrsSetUploadCounter(data, 0); 
+  Curl_pgrsSetDownloadCounter(data, 0); 
+ 
+  return CURLE_OK; 
+}