Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 1 of 2.

1 files changed, 170 insertions, 170 deletions

diff --git a/contrib/libs/curl/lib/easy.c b/contrib/libs/curl/lib/easy.c
index dc790b01df..f500a45d4f 100644
--- a/contrib/libs/curl/lib/easy.c
+++ b/contrib/libs/curl/lib/easy.c
@@ -5,11 +5,11 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * 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
- * are also available at https://curl.se/docs/copyright.html.
+ * 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
@@ -72,14 +72,14 @@
 #include "warnless.h"
 #include "multiif.h"
 #include "sigpipe.h"
-#include "vssh/ssh.h"
+#include "vssh/ssh.h" 
 #include "setopt.h"
 #include "http_digest.h"
 #include "system_win32.h"
-#include "http2.h"
-#include "dynbuf.h"
-#include "altsvc.h"
-#include "hsts.h"
+#include "http2.h" 
+#include "dynbuf.h" 
+#include "altsvc.h" 
+#include "hsts.h" 
 
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
@@ -147,20 +147,20 @@ static CURLcode global_init(long flags, bool memoryfuncs)
 
   if(!Curl_ssl_init()) {
     DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n"));
-    goto fail;
+    goto fail; 
   }
 
 #ifdef WIN32
   if(Curl_win32_init(flags)) {
     DEBUGF(fprintf(stderr, "Error: win32_init failed\n"));
-    goto fail;
+    goto fail; 
   }
 #endif
 
 #ifdef __AMIGA__
   if(!Curl_amiga_init()) {
     DEBUGF(fprintf(stderr, "Error: Curl_amiga_init failed\n"));
-    goto fail;
+    goto fail; 
   }
 #endif
 
@@ -172,29 +172,29 @@ static CURLcode global_init(long flags, bool memoryfuncs)
 
   if(Curl_resolver_global_init()) {
     DEBUGF(fprintf(stderr, "Error: resolver_global_init failed\n"));
-    goto fail;
+    goto fail; 
   }
 
 #if defined(USE_SSH)
   if(Curl_ssh_init()) {
-    goto fail;
-  }
-#endif
-
-#ifdef USE_WOLFSSH
-  if(WS_SUCCESS != wolfSSH_Init()) {
-    DEBUGF(fprintf(stderr, "Error: wolfSSH_Init failed\n"));
+    goto fail; 
+  } 
+#endif 
+ 
+#ifdef USE_WOLFSSH 
+  if(WS_SUCCESS != wolfSSH_Init()) { 
+    DEBUGF(fprintf(stderr, "Error: wolfSSH_Init failed\n")); 
     return CURLE_FAILED_INIT;
   }
 #endif
 
   init_flags = flags;
 
-  return CURLE_OK;
+  return CURLE_OK; 
 
-  fail:
-  initialized--; /* undo the increase */
-  return CURLE_FAILED_INIT;
+  fail: 
+  initialized--; /* undo the increase */ 
+  return CURLE_FAILED_INIT; 
 }
 
 
@@ -262,10 +262,10 @@ void curl_global_cleanup(void)
 
   Curl_ssh_cleanup();
 
-#ifdef USE_WOLFSSH
-  (void)wolfSSH_Cleanup();
-#endif
-
+#ifdef USE_WOLFSSH 
+  (void)wolfSSH_Cleanup(); 
+#endif 
+ 
   init_flags  = 0;
 }
 
@@ -500,7 +500,7 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
     before = Curl_now();
 
     /* wait for activity or timeout */
-    pollrc = Curl_poll(fds, numfds, ev->ms);
+    pollrc = Curl_poll(fds, numfds, ev->ms); 
 
     after = Curl_now();
 
@@ -671,7 +671,7 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events)
   mcode = curl_multi_add_handle(multi, data);
   if(mcode) {
     curl_multi_cleanup(multi);
-    data->multi_easy = NULL;
+    data->multi_easy = NULL; 
     if(mcode == CURLM_OUT_OF_MEMORY)
       return CURLE_OUT_OF_MEMORY;
     return CURLE_FAILED_INIT;
@@ -726,7 +726,7 @@ void curl_easy_cleanup(struct Curl_easy *data)
     return;
 
   sigpipe_ignore(data, &pipe_st);
-  Curl_close(&data);
+  Curl_close(&data); 
   sigpipe_restore(&pipe_st);
 }
 
@@ -754,7 +754,7 @@ static CURLcode dupset(struct Curl_easy *dst, struct Curl_easy *src)
 {
   CURLcode result = CURLE_OK;
   enum dupstring i;
-  enum dupblob j;
+  enum dupblob j; 
 
   /* Copy src->set into dst->set first, then deal with the strings
      afterwards */
@@ -771,16 +771,16 @@ static CURLcode dupset(struct Curl_easy *dst, struct Curl_easy *src)
       return result;
   }
 
-  /* clear all blob pointers first */
-  memset(dst->set.blobs, 0, BLOB_LAST * sizeof(struct curl_blob *));
-  /* duplicate all blobs */
-  for(j = (enum dupblob)0; j < BLOB_LAST; j++) {
-    result = Curl_setblobopt(&dst->set.blobs[j], src->set.blobs[j]);
-    /* Curl_setstropt return CURLE_BAD_FUNCTION_ARGUMENT with blob */
-    if(result)
-      return result;
-  }
-
+  /* clear all blob pointers first */ 
+  memset(dst->set.blobs, 0, BLOB_LAST * sizeof(struct curl_blob *)); 
+  /* duplicate all blobs */ 
+  for(j = (enum dupblob)0; j < BLOB_LAST; j++) { 
+    result = Curl_setblobopt(&dst->set.blobs[j], src->set.blobs[j]); 
+    /* Curl_setstropt return CURLE_BAD_FUNCTION_ARGUMENT with blob */ 
+    if(result) 
+      return result; 
+  } 
+ 
   /* duplicate memory areas pointed to */
   i = STRING_COPYPOSTFIELDS;
   if(src->set.postfieldsize && src->set.str[i]) {
@@ -824,11 +824,11 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
   if(dupset(outcurl, data))
     goto fail;
 
-  Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER);
-
+  Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER); 
+ 
   /* the connection cache is setup on demand */
   outcurl->state.conn_cache = NULL;
-  outcurl->state.lastconnect_id = -1;
+  outcurl->state.lastconnect_id = -1; 
 
   outcurl->progress.flags    = data->progress.flags;
   outcurl->progress.callback = data->progress.callback;
@@ -873,54 +873,54 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
       goto fail;
   }
 
-#ifdef USE_ALTSVC
-  if(data->asi) {
-    outcurl->asi = Curl_altsvc_init();
-    if(!outcurl->asi)
-      goto fail;
-    if(outcurl->set.str[STRING_ALTSVC])
-      (void)Curl_altsvc_load(outcurl->asi, outcurl->set.str[STRING_ALTSVC]);
-  }
-#endif
-#ifdef USE_HSTS
-  if(data->hsts) {
-    outcurl->hsts = Curl_hsts_init();
-    if(!outcurl->hsts)
-      goto fail;
-    if(outcurl->set.str[STRING_HSTS])
-      (void)Curl_hsts_loadfile(outcurl,
-                               outcurl->hsts, outcurl->set.str[STRING_HSTS]);
-    (void)Curl_hsts_loadcb(outcurl, outcurl->hsts);
-  }
-#endif
+#ifdef USE_ALTSVC 
+  if(data->asi) { 
+    outcurl->asi = Curl_altsvc_init(); 
+    if(!outcurl->asi) 
+      goto fail; 
+    if(outcurl->set.str[STRING_ALTSVC]) 
+      (void)Curl_altsvc_load(outcurl->asi, outcurl->set.str[STRING_ALTSVC]); 
+  } 
+#endif 
+#ifdef USE_HSTS 
+  if(data->hsts) { 
+    outcurl->hsts = Curl_hsts_init(); 
+    if(!outcurl->hsts) 
+      goto fail; 
+    if(outcurl->set.str[STRING_HSTS]) 
+      (void)Curl_hsts_loadfile(outcurl, 
+                               outcurl->hsts, outcurl->set.str[STRING_HSTS]); 
+    (void)Curl_hsts_loadcb(outcurl, outcurl->hsts); 
+  } 
+#endif 
   /* Clone the resolver handle, if present, for the new handle */
   if(Curl_resolver_duphandle(outcurl,
                              &outcurl->state.resolver,
                              data->state.resolver))
     goto fail;
 
-#ifdef USE_ARES
-  {
-    CURLcode rc;
-
-    rc = Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS]);
-    if(rc && rc != CURLE_NOT_BUILT_IN)
-      goto fail;
-
-    rc = Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE]);
-    if(rc && rc != CURLE_NOT_BUILT_IN)
-      goto fail;
-
-    rc = Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4]);
-    if(rc && rc != CURLE_NOT_BUILT_IN)
-      goto fail;
-
-    rc = Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6]);
-    if(rc && rc != CURLE_NOT_BUILT_IN)
-      goto fail;
-  }
-#endif /* USE_ARES */
-
+#ifdef USE_ARES 
+  { 
+    CURLcode rc; 
+ 
+    rc = Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS]); 
+    if(rc && rc != CURLE_NOT_BUILT_IN) 
+      goto fail; 
+ 
+    rc = Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE]); 
+    if(rc && rc != CURLE_NOT_BUILT_IN) 
+      goto fail; 
+ 
+    rc = Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4]); 
+    if(rc && rc != CURLE_NOT_BUILT_IN) 
+      goto fail; 
+ 
+    rc = Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6]); 
+    if(rc && rc != CURLE_NOT_BUILT_IN) 
+      goto fail; 
+  } 
+#endif /* USE_ARES */ 
+ 
   Curl_convert_setup(outcurl);
 
   Curl_initinfo(outcurl);
@@ -937,11 +937,11 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
     curl_slist_free_all(outcurl->change.cookielist);
     outcurl->change.cookielist = NULL;
     Curl_safefree(outcurl->state.buffer);
-    Curl_dyn_free(&outcurl->state.headerb);
+    Curl_dyn_free(&outcurl->state.headerb); 
     Curl_safefree(outcurl->change.url);
     Curl_safefree(outcurl->change.referer);
-    Curl_altsvc_cleanup(&outcurl->asi);
-    Curl_hsts_cleanup(&outcurl->hsts);
+    Curl_altsvc_cleanup(&outcurl->asi); 
+    Curl_hsts_cleanup(&outcurl->hsts); 
     Curl_freeset(outcurl);
     free(outcurl);
   }
@@ -970,7 +970,7 @@ void curl_easy_reset(struct Curl_easy *data)
 
   data->progress.flags |= PGRS_HIDE;
   data->state.current_speed = -1; /* init to negative == impossible */
-  data->state.retrycount = 0;     /* reset the retry counter */
+  data->state.retrycount = 0;     /* reset the retry counter */ 
 
   /* zero out authentication data: */
   memset(&data->state.authhost, 0, sizeof(struct auth));
@@ -996,102 +996,102 @@ void curl_easy_reset(struct Curl_easy *data)
  */
 CURLcode curl_easy_pause(struct Curl_easy *data, int action)
 {
-  struct SingleRequest *k;
+  struct SingleRequest *k; 
   CURLcode result = CURLE_OK;
-  int oldstate;
-  int newstate;
-
-  if(!GOOD_EASY_HANDLE(data) || !data->conn)
-    /* crazy input, don't continue */
-    return CURLE_BAD_FUNCTION_ARGUMENT;
-
-  k = &data->req;
-  oldstate = k->keepon & (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE);
-
-  /* first switch off both pause bits then set the new pause bits */
-  newstate = (k->keepon &~ (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE)) |
-    ((action & CURLPAUSE_RECV)?KEEP_RECV_PAUSE:0) |
+  int oldstate; 
+  int newstate; 
+
+  if(!GOOD_EASY_HANDLE(data) || !data->conn) 
+    /* crazy input, don't continue */ 
+    return CURLE_BAD_FUNCTION_ARGUMENT; 
+
+  k = &data->req; 
+  oldstate = k->keepon & (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE); 
+ 
+  /* first switch off both pause bits then set the new pause bits */ 
+  newstate = (k->keepon &~ (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE)) | 
+    ((action & CURLPAUSE_RECV)?KEEP_RECV_PAUSE:0) | 
     ((action & CURLPAUSE_SEND)?KEEP_SEND_PAUSE:0);
 
-  if((newstate & (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE)) == oldstate) {
-    /* Not changing any pause state, return */
-    DEBUGF(infof(data, "pause: no change, early return\n"));
-    return CURLE_OK;
-  }
-
-  /* Unpause parts in active mime tree. */
-  if((k->keepon & ~newstate & KEEP_SEND_PAUSE) &&
-     (data->mstate == CURLM_STATE_PERFORM ||
-      data->mstate == CURLM_STATE_TOOFAST) &&
-     data->state.fread_func == (curl_read_callback) Curl_mime_read) {
-    Curl_mime_unpause(data->state.in);
-  }
-
+  if((newstate & (KEEP_RECV_PAUSE| KEEP_SEND_PAUSE)) == oldstate) { 
+    /* Not changing any pause state, return */ 
+    DEBUGF(infof(data, "pause: no change, early return\n")); 
+    return CURLE_OK; 
+  } 
+ 
+  /* Unpause parts in active mime tree. */ 
+  if((k->keepon & ~newstate & KEEP_SEND_PAUSE) && 
+     (data->mstate == CURLM_STATE_PERFORM || 
+      data->mstate == CURLM_STATE_TOOFAST) && 
+     data->state.fread_func == (curl_read_callback) Curl_mime_read) { 
+    Curl_mime_unpause(data->state.in); 
+  } 
+ 
   /* put it back in the keepon */
   k->keepon = newstate;
 
-  if(!(newstate & KEEP_RECV_PAUSE)) {
-    Curl_http2_stream_pause(data, FALSE);
-
-    if(data->state.tempcount) {
-      /* there are buffers for sending that can be delivered as the receive
-         pausing is lifted! */
-      unsigned int i;
-      unsigned int count = data->state.tempcount;
-      struct tempbuf writebuf[3]; /* there can only be three */
-      struct connectdata *conn = data->conn;
-      struct Curl_easy *saved_data = NULL;
-
-      /* copy the structs to allow for immediate re-pausing */
-      for(i = 0; i < data->state.tempcount; i++) {
-        writebuf[i] = data->state.tempwrite[i];
-        Curl_dyn_init(&data->state.tempwrite[i].b, DYN_PAUSE_BUFFER);
-      }
-      data->state.tempcount = 0;
-
-      /* set the connection's current owner */
-      if(conn->data != data) {
-        saved_data = conn->data;
-        conn->data = data;
-      }
-
-      for(i = 0; i < count; i++) {
-        /* even if one function returns error, this loops through and frees
-           all buffers */
-        if(!result)
-          result = Curl_client_write(conn, writebuf[i].type,
-                                     Curl_dyn_ptr(&writebuf[i].b),
-                                     Curl_dyn_len(&writebuf[i].b));
-        Curl_dyn_free(&writebuf[i].b);
-      }
-
-      /* recover previous owner of the connection */
-      if(saved_data)
-        conn->data = saved_data;
-
-      if(result)
-        return result;
-    }
+  if(!(newstate & KEEP_RECV_PAUSE)) { 
+    Curl_http2_stream_pause(data, FALSE); 
+
+    if(data->state.tempcount) { 
+      /* there are buffers for sending that can be delivered as the receive 
+         pausing is lifted! */ 
+      unsigned int i; 
+      unsigned int count = data->state.tempcount; 
+      struct tempbuf writebuf[3]; /* there can only be three */ 
+      struct connectdata *conn = data->conn; 
+      struct Curl_easy *saved_data = NULL; 
+
+      /* copy the structs to allow for immediate re-pausing */ 
+      for(i = 0; i < data->state.tempcount; i++) { 
+        writebuf[i] = data->state.tempwrite[i]; 
+        Curl_dyn_init(&data->state.tempwrite[i].b, DYN_PAUSE_BUFFER); 
+      } 
+      data->state.tempcount = 0; 
+
+      /* set the connection's current owner */ 
+      if(conn->data != data) { 
+        saved_data = conn->data; 
+        conn->data = data; 
+      } 
+
+      for(i = 0; i < count; i++) { 
+        /* even if one function returns error, this loops through and frees 
+           all buffers */ 
+        if(!result) 
+          result = Curl_client_write(conn, writebuf[i].type, 
+                                     Curl_dyn_ptr(&writebuf[i].b), 
+                                     Curl_dyn_len(&writebuf[i].b)); 
+        Curl_dyn_free(&writebuf[i].b); 
+      } 
+
+      /* recover previous owner of the connection */ 
+      if(saved_data) 
+        conn->data = saved_data; 
+ 
+      if(result) 
+        return result; 
+    } 
   }
 
   /* if there's no error and we're not pausing both directions, we want
      to have this handle checked soon */
-  if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
-     (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
+  if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) != 
+     (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) { 
     Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
-
-    if(!data->state.tempcount)
-      /* if not pausing again, force a recv/send check of this connection as
-         the data might've been read off the socket already */
-      data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
+ 
+    if(!data->state.tempcount) 
+      /* if not pausing again, force a recv/send check of this connection as 
+         the data might've been read off the socket already */ 
+      data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT; 
     if(data->multi)
       Curl_update_timer(data->multi);
   }
 
-  if(!data->state.done)
-    /* This transfer may have been moved in or out of the bundle, update the
-       corresponding socket callback, if used */
-    Curl_updatesocket(data);
+  if(!data->state.done) 
+    /* This transfer may have been moved in or out of the bundle, update the 
+       corresponding socket callback, if used */ 
+    Curl_updatesocket(data); 
 
   return result;
 }