[svn] Update the license to include the OpenSSL exception.

[wget] / src / cookies.c

diff --git a/src/cookies.c b/src/cookies.c
index 7df96f7c9cde86d1f441313b170c519bfa538cd2..c31a286524da6aa6532714cc9395a1bf1f5ef1f7 100644 (file)
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -15,7 +15,17 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 /* Written by Hrvoje Niksic.  Parts are loosely inspired by cookie
    code submitted by Tomasz Wegrzanowski.
@@ -230,7 +240,7 @@ store_cookie (struct cookie_jar *jar, struct cookie *cookie)
           cookie->permanent ? "permanent" : "nonpermanent",
           cookie->secure,
           cookie->expiry_time
-          ? asctime (localtime (&cookie->expiry_time)) : "<indefinitely>",
+          ? asctime (localtime (&cookie->expiry_time)) : "<undefined>",
           cookie->attr, cookie->value));
 }
 
@@ -676,7 +686,7 @@ check_domain_match (const char *cookie_domain, const char *host)
   DEBUGP ((" 3"));
 
   /* HOST must match the tail of cookie_domain. */
-  if (!match_tail (host, cookie_domain))
+  if (!match_tail (host, cookie_domain, 1))
     return 0;
 
   /* We know that COOKIE_DOMAIN is a subset of HOST; however, we must
@@ -754,7 +764,7 @@ check_domain_match (const char *cookie_domain, const char *host)
          ".com", ".edu", ".net", ".org", ".gov", ".mil", ".int"
        };
        for (i = 0; i < ARRAY_SIZE (known_toplevel_domains); i++)
-         if (match_tail (cookie_domain, known_toplevel_domains[i]))
+         if (match_tail (cookie_domain, known_toplevel_domains[i], 1))
            {
              known_toplevel = 1;
              break;