Bump version number in NEWS.

[wget] / src / cookies.c

diff --git a/src/cookies.c b/src/cookies.c
index 147695c29401a740f21ac971f1d0c47d5f2f21aa..7c3fb1cbab9708b7a20e45b449edf7528fc28983 100644 (file)
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -1,6 +1,6 @@
 /* Support for cookies.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-   2008 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -350,6 +350,13 @@ parse_set_cookie (const char *set_cookie, bool silent)
     goto error;
   if (!value.b)
     goto error;
+
+  /* If the value is quoted, do not modify it.  */
+  if (*(value.b - 1) == '"')
+    value.b--;
+  if (*value.e == '"')
+    value.e++;
+
   cookie->attr = strdupdelim (name.b, name.e);
   cookie->value = strdupdelim (value.b, value.e);
 
@@ -441,7 +448,7 @@ parse_set_cookie (const char *set_cookie, bool silent)
   if (!silent)
     logprintf (LOG_NOTQUIET,
                _("Syntax error in Set-Cookie: %s at position %d.\n"),
-               quotearg_style (escape_quoting_style, set_cookie), 
+               quotearg_style (escape_quoting_style, set_cookie),
                (int) (ptr - set_cookie));
   delete_cookie (cookie);
   return NULL;
@@ -587,7 +594,7 @@ check_domain_match (const char *cookie_domain, const char *host)
 
     if (dccount == 2)
       {
-        int i;
+        size_t i;
         int known_toplevel = false;
         static const char *known_toplevel_domains[] = {
           ".com", ".edu", ".net", ".org", ".gov", ".mil", ".int"
@@ -684,7 +691,7 @@ cookie_handle_set_cookie (struct cookie_jar *jar,
         {
           logprintf (LOG_NOTQUIET,
                      _("Cookie coming from %s attempted to set domain to %s\n"),
-                     quotearg_style (escape_quoting_style, host), 
+                     quotearg_style (escape_quoting_style, host),
                      quotearg_style (escape_quoting_style, cookie->domain));
           xfree (cookie->domain);
           goto copy_domain;
@@ -733,7 +740,7 @@ cookie_handle_set_cookie (struct cookie_jar *jar,
 /* Support for sending out cookies in HTTP requests, based on
    previously stored cookies.  Entry point is
    `build_cookies_request'.  */
-   
+
 /* Return a count of how many times CHR occurs in STRING. */
 
 static int