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

1 files changed, 100 insertions, 100 deletions

diff --git a/contrib/libs/curl/lib/cookie.c b/contrib/libs/curl/lib/cookie.c
index 881be2c839..e88678c219 100644
--- a/contrib/libs/curl/lib/cookie.c
+++ b/contrib/libs/curl/lib/cookie.c
@@ -93,7 +93,7 @@ Example set of cookies:
 #include "share.h"
 #include "strtoofft.h"
 #include "strcase.h"
-#include "curl_get_line.h" 
+#include "curl_get_line.h"
 #include "curl_memrchr.h"
 #include "inet_pton.h"
 #include "parsedate.h"
@@ -227,7 +227,7 @@ static bool pathmatch(const char *cookie_path, const char *request_uri)
     goto pathmatched;
   }
 
-  /* here, cookie_path_len < uri_path_len */ 
+  /* here, cookie_path_len < uri_path_len */
   if(uri_path[cookie_path_len] == '/') {
     ret = TRUE;
     goto pathmatched;
@@ -436,10 +436,10 @@ Curl_cookie_add(struct Curl_easy *data,
                 bool noexpire, /* if TRUE, skip remove_expired() */
                 char *lineptr,   /* first character of the line */
                 const char *domain, /* default domain */
-                const char *path,   /* full path used when this cookie is set, 
+                const char *path,   /* full path used when this cookie is set,
                                        used to get default path for the cookie
                                        unless set */
-                bool secure)  /* TRUE if connection is over secure origin */ 
+                bool secure)  /* TRUE if connection is over secure origin */
 {
   struct Cookie *clist;
   struct Cookie *co;
@@ -531,19 +531,19 @@ Curl_cookie_add(struct Curl_easy *data,
         while(*whatptr && ISBLANK(*whatptr))
           whatptr++;
 
-        /* 
-         * Check if we have a reserved prefix set before anything else, as we 
-         * otherwise have to test for the prefix in both the cookie name and 
-         * "the rest". Prefixes must start with '__' and end with a '-', so 
-         * only test for names where that can possibly be true. 
-         */ 
-        if(nlen > 3 && name[0] == '_' && name[1] == '_') { 
+        /*
+         * Check if we have a reserved prefix set before anything else, as we
+         * otherwise have to test for the prefix in both the cookie name and
+         * "the rest". Prefixes must start with '__' and end with a '-', so
+         * only test for names where that can possibly be true.
+         */
+        if(nlen > 3 && name[0] == '_' && name[1] == '_') {
           if(!strncmp("__Secure-", name, 9))
-            co->prefix |= COOKIE_PREFIX__SECURE; 
+            co->prefix |= COOKIE_PREFIX__SECURE;
           else if(!strncmp("__Host-", name, 7))
-            co->prefix |= COOKIE_PREFIX__HOST; 
-        } 
- 
+            co->prefix |= COOKIE_PREFIX__HOST;
+        }
+
         if(!co->name) {
           /* The very first name/value pair is the actual cookie name */
           if(!sep) {
@@ -563,20 +563,20 @@ Curl_cookie_add(struct Curl_easy *data,
           /* this was a "<name>=" with no content, and we must allow
              'secure' and 'httponly' specified this weirdly */
           done = TRUE;
-          /* 
-           * secure cookies are only allowed to be set when the connection is 
-           * using a secure protocol, or when the cookie is being set by 
-           * reading from file 
-           */ 
-          if(strcasecompare("secure", name)) { 
-            if(secure || !c->running) { 
-              co->secure = TRUE; 
-            } 
-            else { 
-              badcookie = TRUE; 
-              break; 
-            } 
-          } 
+          /*
+           * secure cookies are only allowed to be set when the connection is
+           * using a secure protocol, or when the cookie is being set by
+           * reading from file
+           */
+          if(strcasecompare("secure", name)) {
+            if(secure || !c->running) {
+              co->secure = TRUE;
+            }
+            else {
+              badcookie = TRUE;
+              break;
+            }
+          }
           else if(strcasecompare("httponly", name))
             co->httponly = TRUE;
           else if(sep)
@@ -821,14 +821,14 @@ Curl_cookie_add(struct Curl_easy *data,
           badcookie = TRUE;
         break;
       case 1:
-        /* flag: A TRUE/FALSE value indicating if all machines within a given 
-           domain can access the variable. Set TRUE when the cookie says 
+        /* flag: A TRUE/FALSE value indicating if all machines within a given
+           domain can access the variable. Set TRUE when the cookie says
            .domain.com and to false when the domain is complete www.domain.com
         */
         co->tailmatch = strcasecompare(ptr, "TRUE")?TRUE:FALSE;
         break;
       case 2:
-        /* The file format allows the path field to remain not filled in */ 
+        /* The file format allows the path field to remain not filled in */
         if(strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) {
           /* only if the path doesn't look like a boolean option! */
           co->path = strdup(ptr);
@@ -852,13 +852,13 @@ Curl_cookie_add(struct Curl_easy *data,
         fields++; /* add a field and fall down to secure */
         /* FALLTHROUGH */
       case 3:
-        co->secure = FALSE; 
-        if(strcasecompare(ptr, "TRUE")) { 
-          if(secure || c->running) 
-            co->secure = TRUE; 
-          else 
-            badcookie = TRUE; 
-        } 
+        co->secure = FALSE;
+        if(strcasecompare(ptr, "TRUE")) {
+          if(secure || c->running)
+            co->secure = TRUE;
+          else
+            badcookie = TRUE;
+        }
         break;
       case 4:
         if(curlx_strtoofft(ptr, NULL, 10, &co->expires))
@@ -868,13 +868,13 @@ Curl_cookie_add(struct Curl_easy *data,
         co->name = strdup(ptr);
         if(!co->name)
           badcookie = TRUE;
-        else { 
-          /* For Netscape file format cookies we check prefix on the name */ 
-          if(strncasecompare("__Secure-", co->name, 9)) 
-            co->prefix |= COOKIE_PREFIX__SECURE; 
-          else if(strncasecompare("__Host-", co->name, 7)) 
-            co->prefix |= COOKIE_PREFIX__HOST; 
-        } 
+        else {
+          /* For Netscape file format cookies we check prefix on the name */
+          if(strncasecompare("__Secure-", co->name, 9))
+            co->prefix |= COOKIE_PREFIX__SECURE;
+          else if(strncasecompare("__Host-", co->name, 7))
+            co->prefix |= COOKIE_PREFIX__HOST;
+        }
         break;
       case 6:
         co->value = strdup(ptr);
@@ -903,26 +903,26 @@ Curl_cookie_add(struct Curl_easy *data,
 
   }
 
-  if(co->prefix & COOKIE_PREFIX__SECURE) { 
-    /* The __Secure- prefix only requires that the cookie be set secure */ 
-    if(!co->secure) { 
-      freecookie(co); 
-      return NULL; 
-    } 
-  } 
-  if(co->prefix & COOKIE_PREFIX__HOST) { 
-    /* 
-     * The __Host- prefix requires the cookie to be secure, have a "/" path 
-     * and not have a domain set. 
-     */ 
-    if(co->secure && co->path && strcmp(co->path, "/") == 0 && !co->tailmatch) 
-      ; 
-    else { 
-      freecookie(co); 
-      return NULL; 
-    } 
-  } 
- 
+  if(co->prefix & COOKIE_PREFIX__SECURE) {
+    /* The __Secure- prefix only requires that the cookie be set secure */
+    if(!co->secure) {
+      freecookie(co);
+      return NULL;
+    }
+  }
+  if(co->prefix & COOKIE_PREFIX__HOST) {
+    /*
+     * The __Host- prefix requires the cookie to be secure, have a "/" path
+     * and not have a domain set.
+     */
+    if(co->secure && co->path && strcmp(co->path, "/") == 0 && !co->tailmatch)
+      ;
+    else {
+      freecookie(co);
+      return NULL;
+    }
+  }
+
   if(!c->running &&    /* read from a file */
      c->newsession &&  /* clean session cookies */
      !co->expires) {   /* this is a session cookie since it doesn't expire! */
@@ -983,30 +983,30 @@ Curl_cookie_add(struct Curl_easy *data,
         /* the domains were identical */
 
         if(clist->spath && co->spath) {
-          if(clist->secure && !co->secure && !secure) { 
-            size_t cllen; 
-            const char *sep; 
- 
-            /* 
-             * A non-secure cookie may not overlay an existing secure cookie. 
-             * For an existing cookie "a" with path "/login", refuse a new 
-             * cookie "a" with for example path "/login/en", while the path 
-             * "/loginhelper" is ok. 
-             */ 
- 
-            sep = strchr(clist->spath + 1, '/'); 
- 
-            if(sep) 
-              cllen = sep - clist->spath; 
-            else 
-              cllen = strlen(clist->spath); 
- 
-            if(strncasecompare(clist->spath, co->spath, cllen)) { 
-              freecookie(co); 
-              return NULL; 
-            } 
-          } 
-          else if(strcasecompare(clist->spath, co->spath)) 
+          if(clist->secure && !co->secure && !secure) {
+            size_t cllen;
+            const char *sep;
+
+            /*
+             * A non-secure cookie may not overlay an existing secure cookie.
+             * For an existing cookie "a" with path "/login", refuse a new
+             * cookie "a" with for example path "/login/en", while the path
+             * "/loginhelper" is ok.
+             */
+
+            sep = strchr(clist->spath + 1, '/');
+
+            if(sep)
+              cllen = sep - clist->spath;
+            else
+              cllen = strlen(clist->spath);
+
+            if(strncasecompare(clist->spath, co->spath, cllen)) {
+              freecookie(co);
+              return NULL;
+            }
+          }
+          else if(strcasecompare(clist->spath, co->spath))
             replace_old = TRUE;
           else
             replace_old = FALSE;
@@ -1141,7 +1141,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
     line = malloc(MAX_COOKIE_LINE);
     if(!line)
       goto fail;
-    while(Curl_get_line(line, MAX_COOKIE_LINE, fp)) { 
+    while(Curl_get_line(line, MAX_COOKIE_LINE, fp)) {
       if(checkprefix("Set-Cookie:", line)) {
         /* This is a cookie line, get it! */
         lineptr = &line[11];
@@ -1154,7 +1154,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data,
       while(*lineptr && ISBLANK(*lineptr))
         lineptr++;
 
-      Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL, TRUE); 
+      Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL, TRUE);
     }
     free(line); /* free the line buffer */
     remove_expired(c); /* run this once, not on every cookie */
@@ -1511,10 +1511,10 @@ static int cookie_output(struct Curl_easy *data,
   char *tempstore = NULL;
   bool error = false;
 
-  if(!c) 
-    /* no cookie engine alive */ 
-    return 0; 
- 
+  if(!c)
+    /* no cookie engine alive */
+    return 0;
+
   /* at first, remove expired cookies */
   remove_expired(c);
 
@@ -1544,10 +1544,10 @@ static int cookie_output(struct Curl_easy *data,
         out);
 
   if(c->numcookies) {
-    unsigned int i; 
+    unsigned int i;
     size_t nvalid = 0;
-    struct Cookie **array; 
- 
+    struct Cookie **array;
+
     array = calloc(1, sizeof(struct Cookie *) * c->numcookies);
     if(!array) {
       goto error;
@@ -1565,7 +1565,7 @@ static int cookie_output(struct Curl_easy *data,
     qsort(array, nvalid, sizeof(struct Cookie *), cookie_sort_ct);
 
     for(i = 0; i < nvalid; i++) {
-      char *format_ptr = get_netscape_format(array[i]); 
+      char *format_ptr = get_netscape_format(array[i]);
       if(format_ptr == NULL) {
         fprintf(out, "#\n# Fatal libcurl error\n");
         free(array);