Extract all request parsing/creation to separate function

Also rename all http_server_ to httpd (old naming convention)

Author: bigbes

http/server.lua

@@ -633,19 +633,6 @@ local function normalize_headers(hdrs)
     return res
 end
 
-local function parse_request(req)
-    local p = lib._parse_request(req)
-    if p.error then
-        return p
-    end
-    p.path = uri_unescape(p.path)
-    if p.path:sub(1, 1) ~= "/" or p.path:find("./", nil, true) ~= nil then
-        p.error = "invalid uri"
-        return p
-    end
-    return p
-end
-
 local function httpd_stop(self)
    if type(self) ~= 'table' then
        error("httpd: usage: httpd:stop()")
@@ -937,7 +924,25 @@ local function url_for_httpd(httpd, name, args, query)
     end
 end
 
-local function http_server_http11_handler(session)
+local function httpd_http11_parse_request(session, request_raw)
+    local request_parsed = lib._parse_request(request_raw)
+    if request_parsed.error then
+        return nil, request_parsed.error
+    end
+    request_parsed.path = uri_unescape(request_parsed.path)
+    if request_parsed.path:sub(1, 1) ~= "/" or
+       request_parsed.path:find("./", nil, true) ~= nil then
+        return nil, "invalid uri"
+    end
+    request_parsed.httpd = session.server
+    request_parsed.s     = session.socket
+    request_parsed.peer  = session.peer
+    setmetatable(request_parsed, request_mt)
+
+    return request_parsed
+end
+
+local function httpd_http11_handler(session)
     local hdrs = ''
 
     while true do
@@ -958,16 +963,12 @@ local function http_server_http11_handler(session)
     end
 
     log.debug("request:\n%s", hdrs)
-    local p = parse_request(hdrs)
-    if p.error ~= nil then
-        log.error('failed to parse request: %s', p.error)
-        session:write(sprintf("HTTP/1.1 400 Bad request\r\n\r\n%s", p.error))
-        return false
+    local p, err = httpd_http11_parse_request(session, hdrs)
+    if not p then
+        log.error('failed to parse request: %s', err)
+        session:write(sprintf("HTTP/1.1 400 Bad request\r\n\r\n%s", err))
+        return
     end
-    p.httpd = session.server
-    p.s     = session.socket
-    p.peer  = session.peer
-    setmetatable(p, request_mt)
 
     if p.headers['expect'] == '100-continue' then
         session:write('HTTP/1.1 100 Continue\r\n\r\n')
@@ -1143,11 +1144,11 @@ local function session_new(self, socket, peer)
         server  = self,
         socket  = socket,
         peer    = peer,
-        ctx     = { proto = 'HTTP/1.1', handler = http_server_http11_handler },
+        ctx     = { proto = 'HTTP/1.1', handler = httpd_http11_handler },
     }, session_mt)
 end
 
-local function http_server_tcp_handler(self, sckt, peer)
+local function httpd_tcp_handler(self, sckt, peer)
     local session = session_new(self, sckt, peer)
 
     local rv = true
@@ -1163,7 +1164,7 @@ local function httpd_start(self)
 
     local server = assertf(socket.tcp_server(self.host, self.port, {
         name = 'http',
-        handler = function(...) http_server_tcp_handler(self, ...) end
+        handler = function(...) httpd_tcp_handler(self, ...) end
     }), "Can't create tcp_server: %s", errno.strerror())
 
     rawset(self, 'is_run', true)
@@ -1173,7 +1174,7 @@ local function httpd_start(self)
     return self
 end
 
-local http_server_methods = {
+local httpd_methods = {
     stop    = httpd_stop,
     start   = httpd_start,
     route   = add_route,
@@ -1183,11 +1184,11 @@ local http_server_methods = {
     url_for = url_for_httpd,
 }
 
-local http_server_mt = {
-    __index = http_server_methods
+local httpd_mt = {
+    __index = httpd_methods
 }
 
-local http_server_options_default = {
+local httpd_options_default = {
     max_header_size     = 4096,
     header_timeout      = 100,
     handler             = handler,
@@ -1201,13 +1202,13 @@ local http_server_options_default = {
     display_errors      = true,
 }
 
-local function http_server_new(host, port, options)
+local function httpd_new(host, port, options)
     options = options or {}
     local opts_tp = type(options)
     assertf(opts_tp == 'table', "options must be table, not '%s'", opts_tp)
 
     -- populate options table with default values
-    options = extend(table.copy(http_server_options_default), options, true)
+    options = extend(table.copy(httpd_options_default), options, true)
 
     local self = setmetatable({
         host    = host,
@@ -1222,12 +1223,12 @@ local function http_server_new(host, port, options)
 
         -- caches
         cache   = { tpl = {}, ctx = {}, static = {}, },
-    }, http_server_mt)
+    }, httpd_mt)
 
     return self
 end
 
 return {
     DETACHED = DETACHED,
-    new = http_server_new
+    new = httpd_new
 }