Merge 'etr/master' into large_POST.

wlandry · wlandry · commit 1fe733faaf6d · 2016-04-19T16:46:59.000-07:00
This removes the modification done in pellucide's branch to append in
set_arg.  That is instead done in webserver::post_iterator and
webserver::finalize_answer.

Conflicts:
	src/httpserver/http_request.hpp
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -110,7 +110,7 @@ class http_response
          * Method used to get the content from the response.
          * @return the content in string form
         **/
-        const std::string get_content()
+        std::string get_content()
         {
             return this->content;
         }
@@ -125,7 +125,7 @@ class http_response
          * @param key The header identification
          * @return a string representing the value assumed by the header
         **/
-        const std::string get_header(const std::string& key)
+        std::string get_header(const std::string& key)
         {
             return this->headers[key];
         }
@@ -140,7 +140,7 @@ class http_response
          * @param key The footer identification
          * @return a string representing the value assumed by the footer
         **/
-        const std::string get_footer(const std::string& key)
+        std::string get_footer(const std::string& key)
         {
             return this->footers[key];
         }
@@ -150,7 +150,7 @@ class http_response
             result = this->footers[key];
         }
 
-        const std::string get_cookie(const std::string& key)
+        std::string get_cookie(const std::string& key)
         {
             return this->cookies[key];
         }
@@ -189,7 +189,7 @@ class http_response
             return this->response_code;
         }
 
-        const std::string get_realm() const
+        std::string get_realm() const
         {
             return this->realm;
         }
@@ -199,7 +199,7 @@ class http_response
             result = this->realm;
         }
 
-        const std::string get_opaque() const
+        std::string get_opaque() const
         {
             return this->opaque;
         }
@@ -209,7 +209,7 @@ class http_response
             result = this->opaque;
         }
 
-        const bool need_nonce_reload() const
+        bool need_nonce_reload() const
         {
             return this->reload_nonce;
         }
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -303,7 +303,7 @@ struct ip_representation
     ip_representation(const struct sockaddr* ip);
 
     bool operator <(const ip_representation& b) const;
-    const int weight() const
+    int weight() const
     {
         //variable-precision SWAR algorithm
         unsigned int x = mask;
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -145,22 +145,22 @@ class webserver
         bool is_valid(const std::string& key);
         void clean_cache();
 
-        const log_access_ptr get_access_logger() const
+        log_access_ptr get_access_logger() const
         {
             return this->log_access;
         }
 
-        const log_error_ptr get_error_logger() const
+        log_error_ptr get_error_logger() const
         {
             return this->log_error;
         }
 
-        const validator_ptr get_request_validator() const
+        validator_ptr get_request_validator() const
         {
             return this->validator;
         }
 
-        const unescaper_ptr get_unescaper() const
+        unescaper_ptr get_unescaper() const
         {
             return this->unescaper;
         }
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -671,13 +671,19 @@ int webserver::bodyfull_requests_answer_first_step(
                                 encoding,
                                 strlen (MHD_HTTP_POST_ENCODING_FORM_URLENCODED)
                                 )
-            ))
+              )
+             || (0 == strncasecmp (
+                                   MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA,
+                                   encoding,
+                                   strlen (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA)
+                                   )))
         )
     )
     {
+        const size_t post_memory_limit (32*1024);  // Same as #MHD_POOL_SIZE_DEFAULT
         mr->pp = MHD_create_post_processor (
                 connection,
-                1024,
+                post_memory_limit,
                 &post_iterator,
                 mr
         );

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class http_response`
`110`	`110`	`* Method used to get the content from the response.`
`111`	`111`	`* @return the content in string form`
`112`	`112`	`**/`
`113`		`- const std::string get_content()`
	`113`	`+ std::string get_content()`
`114`	`114`	`{`
`115`	`115`	`return this->content;`
`116`	`116`	`}`
`@@ -125,7 +125,7 @@ class http_response`
`125`	`125`	`* @param key The header identification`
`126`	`126`	`* @return a string representing the value assumed by the header`
`127`	`127`	`**/`
`128`		`- const std::string get_header(const std::string& key)`
	`128`	`+ std::string get_header(const std::string& key)`
`129`	`129`	`{`
`130`	`130`	`return this->headers[key];`
`131`	`131`	`}`
`@@ -140,7 +140,7 @@ class http_response`
`140`	`140`	`* @param key The footer identification`
`141`	`141`	`* @return a string representing the value assumed by the footer`
`142`	`142`	`**/`
`143`		`- const std::string get_footer(const std::string& key)`
	`143`	`+ std::string get_footer(const std::string& key)`
`144`	`144`	`{`
`145`	`145`	`return this->footers[key];`
`146`	`146`	`}`
`@@ -150,7 +150,7 @@ class http_response`
`150`	`150`	`result = this->footers[key];`
`151`	`151`	`}`
`152`	`152`
`153`		`- const std::string get_cookie(const std::string& key)`
	`153`	`+ std::string get_cookie(const std::string& key)`
`154`	`154`	`{`
`155`	`155`	`return this->cookies[key];`
`156`	`156`	`}`
`@@ -189,7 +189,7 @@ class http_response`
`189`	`189`	`return this->response_code;`
`190`	`190`	`}`
`191`	`191`
`192`		`- const std::string get_realm() const`
	`192`	`+ std::string get_realm() const`
`193`	`193`	`{`
`194`	`194`	`return this->realm;`
`195`	`195`	`}`
`@@ -199,7 +199,7 @@ class http_response`
`199`	`199`	`result = this->realm;`
`200`	`200`	`}`
`201`	`201`
`202`		`- const std::string get_opaque() const`
	`202`	`+ std::string get_opaque() const`
`203`	`203`	`{`
`204`	`204`	`return this->opaque;`
`205`	`205`	`}`
`@@ -209,7 +209,7 @@ class http_response`
`209`	`209`	`result = this->opaque;`
`210`	`210`	`}`
`211`	`211`
`212`		`- const bool need_nonce_reload() const`
	`212`	`+ bool need_nonce_reload() const`
`213`	`213`	`{`
`214`	`214`	`return this->reload_nonce;`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ struct ip_representation`
`303`	`303`	`ip_representation(const struct sockaddr* ip);`
`304`	`304`
`305`	`305`	`bool operator <(const ip_representation& b) const;`
`306`		`- const int weight() const`
	`306`	`+ int weight() const`
`307`	`307`	`{`
`308`	`308`	`//variable-precision SWAR algorithm`
`309`	`309`	`unsigned int x = mask;`
Original file line number	Diff line number	Diff line change
`@@ -145,22 +145,22 @@ class webserver`
`145`	`145`	`bool is_valid(const std::string& key);`
`146`	`146`	`void clean_cache();`
`147`	`147`
`148`		`- const log_access_ptr get_access_logger() const`
	`148`	`+ log_access_ptr get_access_logger() const`
`149`	`149`	`{`
`150`	`150`	`return this->log_access;`
`151`	`151`	`}`
`152`	`152`
`153`		`- const log_error_ptr get_error_logger() const`
	`153`	`+ log_error_ptr get_error_logger() const`
`154`	`154`	`{`
`155`	`155`	`return this->log_error;`
`156`	`156`	`}`
`157`	`157`
`158`		`- const validator_ptr get_request_validator() const`
	`158`	`+ validator_ptr get_request_validator() const`
`159`	`159`	`{`
`160`	`160`	`return this->validator;`
`161`	`161`	`}`
`162`	`162`
`163`		`- const unescaper_ptr get_unescaper() const`
	`163`	`+ unescaper_ptr get_unescaper() const`
`164`	`164`	`{`
`165`	`165`	`return this->unescaper;`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -671,13 +671,19 @@ int webserver::bodyfull_requests_answer_first_step(`
`671`	`671`	`encoding,`
`672`	`672`	`strlen (MHD_HTTP_POST_ENCODING_FORM_URLENCODED)`
`673`	`673`	`)`
`674`		`- ))`
	`674`	`+ )`
	`675`	`+ \|\| (0 == strncasecmp (`
	`676`	`+ MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA,`
	`677`	`+ encoding,`
	`678`	`+ strlen (MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA)`
	`679`	`+ )))`
`675`	`680`	`)`
`676`	`681`	`)`
`677`	`682`	`{`
	`683`	`+ const size_t post_memory_limit (32*1024); // Same as #MHD_POOL_SIZE_DEFAULT`
`678`	`684`	`mr->pp = MHD_create_post_processor (`
`679`	`685`	`connection,`
`680`		`- 1024,`
	`686`	`+ post_memory_limit,`
`681`	`687`	`&post_iterator,`
`682`	`688`	`mr`
`683`	`689`	`);`