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

luci-0.9: merge r5635

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-12-20 18:19:18 +00:00
parent 723c9a900b
commit 82cc8fddef
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/http/luasrc/http/protocol/conditionals.lua
View file

@ -93,16 +93,15 @@ end
-- @return Alternative status code if the precondition failed -- @return Alternative status code if the precondition failed
-- @return Table containing extra HTTP headers if the precondition failed -- @return Table containing extra HTTP headers if the precondition failed
function if_none_match( req, stat ) function if_none_match( req, stat )
local h = req.headers local h = req.headers
local etag = mk_etag( stat ) local etag = mk_etag( stat )
local method = req.env and req.env.REQUEST_METHOD or "GET"
-- Check for matching resource -- Check for matching resource
if type(h['If-None-Match']) == "string" then if type(h['If-None-Match']) == "string" then
for ent in h['If-None-Match']:gmatch("([^, ]+)") do for ent in h['If-None-Match']:gmatch("([^, ]+)") do
if ( ent == '*' or ent == etag ) and stat ~= nil then if ( ent == '*' or ent == etag ) and stat ~= nil then
if req.request_method == "get" or if method == "GET" or method == "HEAD" then
req.request_method == "head"
then
return false, 304, { return false, 304, {
["ETag"] = mk_etag( stat ); ["ETag"] = mk_etag( stat );
["Date"] = date.to_http( os.time() ); ["Date"] = date.to_http( os.time() );