1. awkward yet working support for POST file upload (requires mimetic)

2. support for NOT handling/parsing POSTed data (including application/x-www-form-urlencoded)

1 files changed, 54 insertions, 3 deletions

diff --git a/include/kingate/cgi_gateway.h b/include/kingate/cgi_gateway.h
index f20d72b..a26b0ae 100644
--- a/include/kingate/cgi_gateway.h
+++ b/include/kingate/cgi_gateway.h
@@ -38,28 +38,65 @@ namespace kingate {
 	     * The GET-passed parameters.
 	     */
 	    params_t get;
 	    /**
 	     * The POST-passed parameters.
 	     */
 	    params_t post;
 	    /**
+	     * Abstract base class for retrieving posted files.
+	     */
+	    class basic_file_t {
+		public:
+		    /**
+		     * Retrieve file name.
+		     * @return filename
+		     */
+		    virtual const string& filename() const = 0;
+		    /**
+		     * Retrieve file content type.
+		     * @return content type
+		     */
+		    virtual const string& content_type() const = 0;
+		    /**
+		     * Retrieve file contents.
+		     * @return reference to the stream for accessing file content.
+		     */
+		    virtual istream& content() = 0;
+		    virtual ~basic_file_t();
+	    };
+	    typedef basic_file_t *file_t;
+	    /**
+	     * The map holding information pertaining to files uploaded via post.
+	     */
+	    typedef multimap<string,file_t> files_t;
+	    /**
+	     * Files uploaded via post
+	     */
+	    files_t files;
+	    /**
 	     * Cookies passed.
 	     */
 	    cookies_t cookies;
 	    /**
 	     * Was the stdin content parsed?
 	     */
 	    bool b_parsed_content;
 
 	    /**
 	     * @param ci the interface to use.
 	     */
-	    cgi_gateway(cgi_interface& ci);
+	    cgi_gateway(cgi_interface& ci,bool parsebody = true);
+	    virtual ~cgi_gateway() throw();
+
+	    /**
+	     * Parse request body.
+	     */
+	    void parse_request_body();
 
 	    /**
 	     * Check whether there is an 'environment' meta-variable with specific name
 	     * passed to CGI.
 	     * @param n variable name.
 	     * @return true if yes.
 	     * @see cgi_interface::has_meta()
 	     * @see get_meta()
@@ -131,20 +168,34 @@ namespace kingate {
 	     * @param n the parameter name.
 	     * @return true if yes.
 	     */
 	    bool has_param(const string& n) const;
 	    /**
 	     * Retrieve the parameter passed either via POST or GET
 	     * (GET-parameter takes precedence).
 	     * @param n the parameter name.
-	     * @return true if yes.
+	     * @return the parameter contents.
 	     * @see exception_notfound.
 	     */
 	    const string& get_param(const string& n) const;
+	    /**
+	     * Check to see whether the file was uploaded in the request body.
+	     * @param n the parameter name.
+	     * @return true if yes.
+	     */
+	    bool has_file(const string& n) const;
+	    /**
+	     * Retrieve the file uploaded in the request body.
+	     * @param n the parameter name.
+	     * @return the file.
+	     * @see exception_notfound.
+	     */
+	    const file_t get_file(const string& n) const;
+	    file_t get_file(const string& n);
 
 	    /**
 	     * Retrieve the POST content-type (as passed via CONTENT_TYPE
 	     * environment variable).
 	     * @return the content type.
 	     */
 	    const string& __deprecated get_content_type() const;
 	    /**
@@ -172,17 +223,17 @@ namespace kingate {
 	     * Retrieve the AUTH_TYPE meta-variable (see RFC3875)
 	     * @return authentication type.
 	     */
 	    const string& auth_type() const;
 	    /**
 	     * Retrieve the CONTENT_LENGTH meta-variable (see RFC3875)
 	     * @return size of the request message body.
 	     */
-	    unsigned long cgi_gateway::content_length() const;
+	    unsigned long content_length() const;
 	    /**
 	     * Retrieve the CONTENT_TYPE meta-variable (see RFC3875)
 	     * @return media type of the request message body.
 	     */
 	    const string& content_type() const;
 	    /**
 	     * Retrieve the GATEWAY_INTERFACE meta-variable (see RFC3875)
 	     * @return the gateway interface dialect.