[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / cookies.h

diff --git a/src/cookies.h b/src/cookies.h
index c660a2005822d12929e49738f975d1dc96c209af..48058ae60c6bb662177a3344a769afa9bb7a8a01 100644 (file)
--- a/src/cookies.h
+++ b/src/cookies.h
@@ -1,11 +1,11 @@
 /* Support for cookies.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
+the Free Software Foundation; either version 3 of the License, or (at
 your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful, but
@@ -14,22 +14,32 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+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.  */
 
 #ifndef COOKIES_H
 #define COOKIES_H
 
-/* struct cookie is not exported; this file only exports functions for
-   manipulating cookie contents.  */
+struct cookie_jar;
 
-int set_cookie_header_cb PARAMS ((const char *, void *));
+struct cookie_jar *cookie_jar_new (void);
+void cookie_jar_delete (struct cookie_jar *);
 
-char *build_cookies_request PARAMS ((const char *, int, const char *, int));
+void cookie_handle_set_cookie (struct cookie_jar *, const char *, int,
+                              const char *, const char *);
+char *cookie_header (struct cookie_jar *, const char *, int,
+                    const char *, bool);
 
-void load_cookies PARAMS ((const char *));
-void save_cookies PARAMS ((const char *));
-
-void cookies_cleanup PARAMS ((void));
+void cookie_jar_load (struct cookie_jar *, const char *);
+void cookie_jar_save (struct cookie_jar *, const char *);
 
 #endif /* COOKIES_H */