Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs/http: use a more flexible aproach when storing multi-value fields

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-07-14 17:02:22 +00:00
parent 1245a9eaa9
commit 079f606bf9
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libs/http/luasrc/http/protocol.lua
View file

@ -113,32 +113,26 @@ end
-- Parameter helper
local function __initval( tbl, key )
local multival = ( key:sub( #key - 1, #key ) == "[]" )
if multival then
if type(tbl[key]) == "table" then
table.insert( tbl[key], "" )
else
tbl[key] = { "" }
end
else
if tbl[key] == nil then
tbl[key] = ""
elseif type(tbl[key]) == "string" then
tbl[key] = { tbl[key], "" }
else
table.insert( tbl[key], "" )
end
return multival
end
local function __appendval( tbl, key, multival, chunk )
if multival then
local function __appendval( tbl, key, chunk )
if type(tbl[key]) == "table" then
tbl[key][#tbl[key]] = tbl[key][#tbl[key]] .. chunk
else
tbl[key] = tbl[key] .. chunk
end
end
local function __finishval( tbl, key, multival, handler )
local function __finishval( tbl, key, handler )
if handler then
if multival then
if type(tbl[key]) == "table" then
tbl[key][#tbl[key]] = handler( tbl[key][#tbl[key]] )
else
tbl[key] = handler( tbl[key] )
@ -321,9 +315,10 @@ process_states['mime-headers'] = function( msg, chunk, filecb )
-- Treat as form field
else
local mv = __initval( msg.params, field )
__initval( msg.params, field )
msg._mimecallback = function(chunk,eof)
__appendval( msg.params, field, mv, chunk )
__appendval( msg.params, field, chunk )
end
end
@ -475,13 +470,14 @@ process_states['urldecode-key'] = function( msg, chunk, filecb )
filecb( field, chunk, eof )
end
else
local mv = __initval( msg.params, key )
__initval( msg.params, key )
msg._urldeccallback = function( chunk, eof )
__appendval( msg.params, key, mv, chunk )
__appendval( msg.params, key, chunk )
-- FIXME: Use a filter
if eof then
__finishval( msg.params, key, mv, urldecode )
__finishval( msg.params, key, urldecode )
end
end
end