diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-12-20 18:35:05 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-12-20 18:35:05 +0000 |
| commit | 85eec9c21f5be8ce2b5e0d8b8b6e2f31a4f19f12 (patch) | |
| tree | 6ead4752dbf895676edbedcd2873b2213483e215 /libs/http | |
| parent | 21328113ddcd07a1711ce0a14c6c4abe6d1de503 (diff) | |
libs/http: don't calculate etag twice in If-None-Match, fix typos in inline-doc
Diffstat (limited to 'libs/http')
| -rw-r--r-- | libs/http/luasrc/http/protocol/conditionals.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/http/luasrc/http/protocol/conditionals.lua b/libs/http/luasrc/http/protocol/conditionals.lua index 635d6b2db..75e1f7b37 100644 --- a/libs/http/luasrc/http/protocol/conditionals.lua +++ b/libs/http/luasrc/http/protocol/conditionals.lua @@ -35,7 +35,7 @@ end -- compare it against the given stat object. -- @param req HTTP request message object -- @param stat A file.stat object --- @return Boolean indicating wheather the precondition is ok +-- @return Boolean indicating whether the precondition is ok -- @return Alternative status code if the precondition failed function if_match( req, stat ) local h = req.headers @@ -60,7 +60,7 @@ end -- and compare it against the given stat object. -- @param req HTTP request message object -- @param stat A file.stat object --- @return Boolean indicating wheather the precondition is ok +-- @return Boolean indicating whether the precondition is ok -- @return Alternative status code if the precondition failed -- @return Table containing extra HTTP headers if the precondition failed function if_modified_since( req, stat ) @@ -89,7 +89,7 @@ end -- compare it against the given stat object. -- @param req HTTP request message object -- @param stat A file.stat object --- @return Boolean indicating wheather the precondition is ok +-- @return Boolean indicating whether the precondition is ok -- @return Alternative status code if the precondition failed -- @return Table containing extra HTTP headers if the precondition failed function if_none_match( req, stat ) @@ -103,7 +103,7 @@ function if_none_match( req, stat ) if ( ent == '*' or ent == etag ) and stat ~= nil then if method == "GET" or method == "HEAD" then return false, 304, { - ["ETag"] = mk_etag( stat ); + ["ETag"] = etag; ["Date"] = date.to_http( os.time() ); ["Last-Modified"] = date.to_http( stat.mtime ) } @@ -123,7 +123,7 @@ end -- false, 412 to indicate a failed precondition. -- @param req HTTP request message object -- @param stat A file.stat object --- @return Boolean indicating wheather the precondition is ok +-- @return Boolean indicating whether the precondition is ok -- @return Alternative status code if the precondition failed function if_range( req, stat ) -- Sorry, no subranges (yet) @@ -135,7 +135,7 @@ end -- header and compare it against the given stat object. -- @param req HTTP request message object -- @param stat A file.stat object --- @return Boolean indicating wheather the precondition is ok +-- @return Boolean indicating whether the precondition is ok -- @return Alternative status code if the precondition failed function if_unmodified_since( req, stat ) local h = req.headers |