From 63229f465aaea8dd5553814535220817319a64f5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 4 May 2015 21:22:14 +0200
Subject: Cleanup the code

---
 web/apache/request.ixx | 147 ++-----------------------------------------------
 1 file changed, 5 insertions(+), 142 deletions(-)

(limited to 'web/apache/request.ixx')

diff --git a/web/apache/request.ixx b/web/apache/request.ixx
index 06284fb..f7446e5 100644
--- a/web/apache/request.ixx
+++ b/web/apache/request.ixx
@@ -18,7 +18,7 @@ namespace web
     {
       if (buffer_ && out_buf_)
       {
-        auto b = dynamic_cast<std::stringbuf*> (out_buf_.get ());
+        auto b (dynamic_cast<std::stringbuf*> (out_buf_.get ()));
         assert (b);
 
         std::string s (b->str ());
@@ -27,7 +27,7 @@ namespace web
         {
           // Before writing response read and discard request body if any.
           //
-          int r = ap_discard_request_body (rec_);
+          int r (ap_discard_request_body (rec_));
 
           if (r == OK)
           {
@@ -36,7 +36,6 @@ namespace web
             if (ap_rwrite (s.c_str (), s.length (), rec_) < 0)
               rec_->status = HTTP_REQUEST_TIME_OUT;
           }
-
           else
             rec_->status = r;
         }
@@ -48,13 +47,13 @@ namespace web
       return rec_->status == HTTP_OK || get_write_state () ? OK : rec_->status;
     }
 
-    inline const request::string_ptr& request::
+    inline const std::string& request::
     form_data ()
     {
       if (!form_data_)
       {
         form_data_.reset (new std::string ());
-        const char *ct = apr_table_get (rec_->headers_in, "Content-Type");
+        const char* ct (apr_table_get (rec_->headers_in, "Content-Type"));
 
         if (ct && !strncasecmp ("application/x-www-form-urlencoded", ct, 33))
         {
@@ -72,143 +71,7 @@ namespace web
         }
       }
 
-      return form_data_;
-    }
-
-    inline void request::
-    parse_parameters (const char* args)
-    {
-      for (auto n (args); n != 0; )
-      {
-        const char* v = std::strchr (n, '=');
-        const char* e = ::strchr (n, '&');
-
-        if (e && e < v)
-          v = 0;
-
-        std::string name (v
-                          ? mime_url_decode (n, v) :
-                          (e
-                           ? mime_url_decode (n, e)
-                           : mime_url_decode (n, n + std::strlen (n))));
-
-        std::string value;
-
-        if (v++)
-        {
-          value = e
-            ? mime_url_decode (v, e)
-            : mime_url_decode (v, v + std::strlen (v));
-        }
-
-        if (!name.empty () || !value.empty ())
-          parameters_->emplace_back (std::move (name), std::move (value));
-
-        n = e ? e + 1 : 0;
-      }
+      return *form_data_;
     }
-
-    inline void request::
-    mime_url_encode (const char* v, std::ostream& o)
-    {
-      char f = o.fill ();
-      std::ios_base::fmtflags g = o.flags ();
-      o << std::hex << std::uppercase << std::right << std::setfill ('0');
-
-      char c;
-
-      while ((c = *v++) != '\0')
-      {
-        if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
-            (c >= '0' && c <= '9'))
-        {
-          o << c;
-        }
-        else
-          switch (c)
-          {
-          case ' ': o << '+'; break;
-          case '.':
-          case '_':
-          case '-':
-          case '~': o << c; break;
-          default:
-            {
-              o << "%" << std::setw (2) << static_cast<unsigned short> (c);
-              break;
-            }
-          }
-      }
-
-      o.flags (g);
-      o.fill (f);
-    }
-
-    inline std::string request::
-    mime_url_decode (const char* b, const char* e, bool trim)
-    {
-      if (trim)
-      {
-        b += std::strspn (b, " ");
-
-        if (b >= e)
-          return std::string ();
-
-        while (*--e == ' ');
-        ++e;
-      }
-
-      std::string value;
-      value.reserve (e - b);
-
-      char bf[3];
-      bf[2] = '\0';
-
-      while (b != e)
-      {
-        char c = *b++;
-
-        switch (c)
-        {
-        case '+':
-          {
-            value.append (" ");
-            break;
-          }
-        case '%':
-          {
-            if (*b == '\0' || b[1] == '\0')
-            {
-              throw std::invalid_argument (
-                "::web::apache::request::mime_url_decode short");
-            }
-
-            *bf = *b;
-            bf[1] = b[1];
-
-            char* ebf = 0;
-            size_t vl = std::strtoul (bf, &ebf, 16);
-
-            if (*ebf != '\0')
-            {
-              throw std::invalid_argument (
-                "::web::apache::request::mime_url_decode wrong");
-            }
-
-            value.append (1, static_cast<char> (vl));
-            b += 2;
-            break;
-          }
-        default:
-          {
-            value.append (1, c);
-            break;
-          }
-        }
-      }
-
-      return value;
-    }
-
   }
 }
-- 
cgit v1.1