Commit 96e217b4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

the new cookie functions that require 'data' passed in

parent 2dd1518d

lib/cookie.h

+6 −2
Original line number Diff line number Diff line
@@ -68,14 +68,18 @@ struct CookieInfo { 
#define MAX_NAME 256

#define MAX_NAME_TXT "255"



struct SessionHandle;

/*

 * Add a cookie to the internal list of cookies. The domain and path arguments

 * are only used if the header boolean is TRUE.

 */

struct Cookie *Curl_cookie_add(struct CookieInfo *, bool header, char *line,



struct Cookie *Curl_cookie_add(struct SessionHandle *data,

                               struct CookieInfo *, bool header, char *line,

                               char *domain, char *path);



struct CookieInfo *Curl_cookie_init(char *, struct CookieInfo *, bool);

struct CookieInfo *Curl_cookie_init(struct SessionHandle *data,

                                    char *, struct CookieInfo *, bool);

struct Cookie *Curl_cookie_getlist(struct CookieInfo *, char *, char *, bool);

void Curl_cookie_freelist(struct Cookie *);

void Curl_cookie_cleanup(struct CookieInfo *);

lib/easy.c

+2 −1
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ CURL *curl_easy_duphandle(CURL *incurl) 
  if(data->cookies)

    /* If cookies are enabled in the parent handle, we enable them

       in the clone as well! */

    outcurl->cookies = Curl_cookie_init(data->cookies->filename,

    outcurl->cookies = Curl_cookie_init(data,

                                        data->cookies->filename,

                                        outcurl->cookies,

                                        data->set.cookiesession);

lib/sendf.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ void curl_slist_free_all(struct curl_slist *list) 


void Curl_infof(struct SessionHandle *data, const char *fmt, ...)

{

  if(data && data->set.verbose) {

    va_list ap;

  if(data->set.verbose) {

    char print_buffer[1024 + 1];

    va_start(ap, fmt);

    vsnprintf(print_buffer, 1024, fmt, ap);

lib/share.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ curl_share_setopt(CURLSH *sh, CURLSHoption option, ...) 


      case CURL_LOCK_DATA_COOKIE:

        if (!share->cookies) {

          share->cookies = Curl_cookie_init( NULL, NULL, TRUE );

          share->cookies = Curl_cookie_init(NULL, NULL, NULL, TRUE );

        }

        break;

lib/transfer.c

+4 −2
Original line number Diff line number Diff line
@@ -709,7 +709,8 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
                    checkprefix("Set-Cookie:", k->p)) {

              Curl_share_lock(data, CURL_LOCK_DATA_COOKIE,

                              CURL_LOCK_ACCESS_SINGLE);

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

              Curl_cookie_add(data,

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

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

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

                              conn->allocptr.cookiehost?
@@ -1514,7 +1515,8 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) 
    struct curl_slist *list = data->change.cookielist;

    Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

    while(list) {

      data->cookies = Curl_cookie_init(list->data,

      data->cookies = Curl_cookie_init(data,

                                       list->data,

                                       data->cookies,

                                       data->set.cookiesession);

      list = list->next;