2 files changed, 2 insertions, 3 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
@@ -286,40 +286,39 @@ namespace kingate {
              * @return the uri path identifying the script.
              */
             const string& script_name() const;
             /**
              * Retrieve the SERVER_NAME meta-variable (see RFC3875)
              * @return the server name of the script.
              */
             const string& server_name() const;
             /**
              * Retrieve the SERVER_PORT meta-variable (see RFC3875)
              * @return the port on which request was received.
              */
             unsigned int server_port() const;
             /**
              * Retrieve the SERVER_PROTOCOL meta-variable (see RFC3875)
              * @return the protocol used for the request.
              */
             const string& server_protocol() const;
             /**
              * 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.
              */
             static void parse_query(string& q,params_t& p);
     };
 
 }
 
 #endif /* __KINGATE_CGI_GATEWAY_H */
 /*
  * vim:set ft=cpp:
  */
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
@@ -234,61 +234,61 @@ namespace kingate {
              * rid cookie of expiration time.
              * @see set_expires()
              * @see get_expires()
              * @see has_expires()
              */
             void unset_expires();
 
             /**
              * render the 'Set-Cookie' HTTP header according to RFC2109.
              * Absolutely useless, only works with lynx.
              * @return the rendered header content.
              */
             string set_cookie_header_rfc2109() const;
             /**
              * render the 'Set-Cookie' header according to the early vague
              * netscape specs and common practice.
              * @return the rendered header content.
              */
             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.
              * @return true if exists.
              */
             bool has_cookie(const key_type& n) const;
             /**
              * Return the named cookie if one exists.
              * @param n cookie name.
              * @return const reference to cookie object.
              */
             const cookie& get_cookie(const key_type& n) const;
             /**
              * Return the named cookie if one exists.
              * @param n cookie name.
              * @return reference to cookie object.
              */
             cookie& get_cookie(const key_type& n);
 
             /**
              * @param s HTTP 'Cookie' header content.