turned cookies into multimap

3 files changed, 7 insertions, 5 deletions

diff --git a/include/kingate/cgi_gateway.h b/include/kingate/cgi_gateway.h
index a26b0ae..087f7d0 100644
--- a/include/kingate/cgi_gateway.h
+++ b/include/kingate/cgi_gateway.h
@@ -304,13 +304,12 @@ namespace kingate {
 	    /**
 	     * Retrieve the SERVER_SOFTWARE meta-variable (see RFC3875)
 	     * @return the name and version of server software.
 	     */
 	    const string& server_software() const;
 
-	private:
 	    /**
 	     * Parse the query string, putting the parameters into the map
 	     * specified.
 	     * @param q the query string.
 	     * @param p destination parameters map.
 	     */
diff --git a/include/kingate/cookies.h b/include/kingate/cookies.h
index 83ef0c6..a1e813c 100644
--- a/include/kingate/cookies.h
+++ b/include/kingate/cookies.h
@@ -252,25 +252,25 @@ namespace kingate {
 	    string set_cookie_header() const;
     };
 
     /**
      * Cookies container class.
      */
-    class cookies_t : public map<string,cookie> {
+    class cookies_t : public multimap<string,cookie> {
 	public:
 
 	    cookies_t() { }
 	    /**
 	     * @param s 'Cookie:' HTTP header contents to parse.
 	     */
 	    cookies_t(const string& s) { parse_cookies(s); }
 
 	    /**
 	     * @param c cookie to set.
 	     */
-	    void set_cookie(const cookie& c) { (*this)[c.get_name()]=c; }
+	    void set_cookie(const cookie& c);
 	    /**
 	     * @param n cookie name to remove.
 	     */
 	    void unset_cookie(const key_type& n) { erase(n); }
 	    /**
 	     * @param n cookie name.
diff --git a/src/cookies.cc b/src/cookies.cc
index 40a0c8b..1ee4f7c 100644
--- a/src/cookies.cc
+++ b/src/cookies.cc
@@ -180,12 +180,16 @@ namespace kingate {
 		rv += "; "+i->first+"="+i->second;
 	    }
 	}
 	return rv;
     }
 
+    void cookies_t::set_cookie(const cookie& c) {
+	insert(value_type(c.get_name(),c));
+    }
+
     bool cookies_t::has_cookie(const key_type& n) const {
 	return find(n)!=end();
     }
 
     const cookie& cookies_t::get_cookie(const key_type& n) const {
 	const_iterator i=find(n);
@@ -231,12 +235,11 @@ namespace kingate {
 		v = s;
 	    nsp = v.find_last_not_of(" \t");
 	    if(nsp==string::npos)
 		v.erase();
 	    else
 		v.erase(nsp+1);
-	    cookie& c = (*this)[n];
-	    c.set_name(n); c.set_value(v);
+	    set_cookie(cookie(n,v));
 	}
     }
 
 }