-- Extract "magic", the first line of a http message.
-- Extracts the message type ("get", "post" or "response"), the requested uri
-- or the status code if the line descripes a http response.
-process_states['magic'] = function( msg, chunk )
+process_states['magic'] = function( msg, chunk, err )
if chunk ~= nil then
+ -- ignore empty lines before request
+ if #chunk == 0 then
+ return true, nil
+ end
-- Is it a request?
local method, uri, http_ver = chunk:match("^([A-Z]+) ([^ ]+) HTTP/([01]%.[019])$")
-- We're somewhere within a data section and our buffer is full
if #buffer > #chunk then
-- Flush buffered data
- -- Send EOF if chunk is empty
- msg._urldeccallback( buffer:sub( 1, #buffer - #chunk ), ( #chunk == 0 ) )
+ msg._urldeccallback( buffer:sub( 1, #buffer - #chunk ), false )
-- Store new data
msg._urldeclength = msg._urldeclength + #buffer - #chunk
return true
end
else
- return nil, "Unexpected EOF"
+ -- Send EOF
+ msg._urldeccallback( "", true )
+ return false
end
end
+-- Creates a header source from a given socket
+function header_source( sock )
+ return ltn12.source.simplify( function()
+
+ local chunk, err, part = sock:receive("*l")
+
+ -- Line too long
+ if chunk == nil then
+ if err ~= "timeout" then
+ return nil, part
+ and "Line exceeds maximum allowed length["..part.."]"
+ or "Unexpected EOF"
+ else
+ return nil, err
+ end
+
+ -- Line ok
+ elseif chunk ~= nil then
+
+ -- Strip trailing CR
+ chunk = chunk:gsub("\r$","")
+
+ return chunk, nil
+ end
+ end )
+end
+
+
-- Decode MIME encoded data.
function mimedecode_message_body( source, msg, filecb )
end
--- Parse a http message
-function parse_message( data, filecb )
-
- local reader = _linereader( data, HTTP_MAX_READBUF )
- local message = parse_message_header( reader )
-
- if message then
- parse_message_body( reader, message, filecb )
- end
-
- return message
-end
-
-
-- Parse a http message header
function parse_message_header( source )
REQUEST_URI = msg.request_uri;
SCRIPT_NAME = msg.request_uri:gsub("?.+$","");
SCRIPT_FILENAME = ""; -- XXX implement me
- SERVER_PROTOCOL = "HTTP/" .. msg.http_version
+ SERVER_PROTOCOL = "HTTP/" .. string.format("%.1f", msg.http_version)
}
-- Populate HTTP_* environment variables
-- Parse a http message body
function parse_message_body( source, msg, filecb )
-
- -- Install an additional filter if we're operating on chunked transfer
- -- coding and client is HTTP/1.1 capable
- if msg.http_version == 1.1 and
- msg.headers['Transfer-Encoding'] and
- msg.headers['Transfer-Encoding']:find("chunked")
- then
- source = ltn12.source.chain(
- source, luci.http.protocol.filter.decode_chunked
- )
- end
-
-
-- Is it multipart/mime ?
if msg.env.REQUEST_METHOD == "POST" and msg.env.CONTENT_TYPE and
msg.env.CONTENT_TYPE:match("^multipart/form%-data")
-- Unhandled encoding
- -- If a file callback is given then feed it line by line, else
+ -- If a file callback is given then feed it chunk by chunk, else
-- store whole buffer in message.content
else
end
end
-
--- Push a response to a socket
-function push_response(request, response, sourceout, sinkout, sinkerr)
- local code = response.status
- sinkout(request.env.SERVER_PROTOCOL .. " " .. code .. " " .. statusmsg[code] .. "\r\n")
-
- -- FIXME: Add support for keep-alive
- response.headers["Connection"] = "close"
-
- for k,v in pairs(response.headers) do
- sinkout(k .. ": " .. v .. "\r\n")
- end
-
- sinkout("\r\n")
-
- if sourceout then
- ltn12.pump.all(sourceout, sinkout)
- end
-end
-
-
-- Status codes
statusmsg = {
[200] = "OK",
+ [304] = "Not Modified",
[400] = "Bad Request",
[403] = "Forbidden",
[404] = "Not Found",
+ [405] = "Method Not Allowed",
+ [411] = "Length Required",
+ [412] = "Precondition Failed",
[500] = "Internal Server Error",
[503] = "Server Unavailable",
-}
\ No newline at end of file
+}