Unverified Commit 4073cd83 authored by Lauri Kasanen's avatar Lauri Kasanen Committed by Daniel Stenberg
Browse files

cookies: when reading from a file, only remove_expired once 

This drops the cookie load time for 8k cookies from 178ms to 15ms.

Closes #2441
parent 28faaace

lib/cookie.c

+5 −2
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ Curl_cookie_add(struct Curl_easy *data, 


                struct CookieInfo *c,

                bool httpheader, /* TRUE if HTTP header-style line */

                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,
@@ -819,6 +820,7 @@ Curl_cookie_add(struct Curl_easy *data, 
     the same domain and path as this */



  /* at first, remove expired cookies */

  if(!noexpire)

    remove_expired(c);



#ifdef USE_LIBPSL
@@ -1026,9 +1028,10 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, 
      while(*lineptr && ISBLANK(*lineptr))

        lineptr++;



      Curl_cookie_add(data, c, headerline, lineptr, NULL, NULL);

      Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL);

    }

    free(line); /* free the line buffer */

    remove_expired(c); /* run this once, not on every cookie */



    if(fromfile)

      fclose(fp);

lib/cookie.h

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ struct Curl_easy; 
 */



struct Cookie *Curl_cookie_add(struct Curl_easy *data,

                               struct CookieInfo *, bool header, char *lineptr,

                               struct CookieInfo *, bool header, bool noexpiry,

                               char *lineptr,

                               const char *domain, const char *path);



struct Cookie *Curl_cookie_getlist(struct CookieInfo *, const char *,

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -3734,7 +3734,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, 
      Curl_share_lock(data, CURL_LOCK_DATA_COOKIE,

                      CURL_LOCK_ACCESS_SINGLE);

      Curl_cookie_add(data,

                      data->cookies, TRUE, k->p + 11,

                      data->cookies, TRUE, FALSE, k->p + 11,

                      /* If there is a custom-set Host: name, use it

                         here, or else use real peer host name. */

                      conn->allocptr.cookiehost?

lib/setopt.c

+4 −2
Original line number Diff line number Diff line
@@ -781,11 +781,13 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, 


        if(checkprefix("Set-Cookie:", argptr))

          /* HTTP Header format line */

          Curl_cookie_add(data, data->cookies, TRUE, argptr + 11, NULL, NULL);

          Curl_cookie_add(data, data->cookies, TRUE, FALSE, argptr + 11, NULL,

                          NULL);



        else

          /* Netscape format line */

          Curl_cookie_add(data, data->cookies, FALSE, argptr, NULL, NULL);

          Curl_cookie_add(data, data->cookies, FALSE, FALSE, argptr, NULL,

                          NULL);



        Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);

        free(argptr);