* libs/http: fix header handling in conditionals.lua

* libs/httpd:	add support for RFC2616 / 14.24 - 14.28 in file handler, add Date and Expires headers to luci handler

libs/http/luasrc/http/protocol.lua

@@ -779,11 +779,13 @@ 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",
 }

libs/http/luasrc/http/protocol/conditionals.lua

@@ -21,7 +21,7 @@ local date = require("luci.http.protocol.date")
 -- 14.19 / ETag
 function mk_etag( stat )
 	if stat ~= nil then
-		return string.format( "%x-%x-%x", stat.ino, stat.size, stat.mtime )
+		return string.format( '"%x-%x-%x"', stat.ino, stat.size, stat.mtime )
 	end
 end
 
@@ -56,7 +56,10 @@ function if_modified_since( req, stat )
 			return true
 		end
 
-		return false, 304
+		return false, 304, {
+			["ETag"]          = mk_etag( stat );
+			["Last-Modified"] = date.to_http( stat.mtime )
+		}
 	end
 
 	return true
@@ -74,10 +77,10 @@ function if_none_match( req, stat )
 				if req.request_method == "get"  or
 				   req.request_method == "head"
 				then
-					h['ETag']          = mk_etag( stat )
+					return false, 304, {
-					h['Last-Modified'] = date.to_http( stat.mtime )
+						["ETag"]          = mk_etag( stat );
-
+						["Last-Modified"] = date.to_http( stat.mtime )
-					return false, 304
+					}
 				else
 					return false, 412
 				end

libs/httpd/luasrc/httpd/handler/file.lua

@@ -31,10 +31,11 @@ function Simple.__init__(self, docroot, dirlist)
 	self.dirlist = dirlist and true or false
 	self.mime    = luci.http.protocol.mime
 	self.date    = luci.http.protocol.date
+	self.cond    = luci.http.protocol.conditionals
 end
 
 function Simple.getfile(self, uri)
-	local file = self.docroot .. uri:gsub("%.%./", "")
+	local file = self.docroot .. uri:gsub("%.%./+", "")
 	local stat = luci.fs.stat(file)
 
 	return file, stat
@@ -47,18 +48,45 @@ function Simple.handle_get(self, request, sourcein, sinkerr)
 		if stat.type == "regular" then
 
 			-- Generate Entity Tag
-			local etag = luci.http.protocol.conditionals.mk_etag( stat )
+			local etag = self.cond.mk_etag( stat )
 
-			-- Send Response
+			-- Check conditionals
-			return Response(
+			local ok, code, hdrs
-				200, {
+
-					["Date"]           = self.date.to_http( os.time() );
+			ok, code, hdrs = self.cond.if_modified_since( request, stat )
-					["Last-Modified"]  = self.date.to_http( stat.mtime );
+			if ok then
-					["Content-Type"]   = self.mime.to_mime( file );
+				ok, code, hdrs = self.cond.if_match( request, stat )
-					["Content-Length"] = stat.size;
+				if ok then
-					["ETag"]           = etag;
+					ok, code, hdrs = self.cond.if_unmodified_since( request, stat )
-				}
+					if ok then
-			), ltn12.source.file(io.open(file))
+						ok, code, hdrs = self.cond.if_none_match( request, stat )
+						if ok then
+							-- Send Response
+							return Response(
+								200, {
+									["Date"]           = self.date.to_http( os.time() );
+									["Last-Modified"]  = self.date.to_http( stat.mtime );
+									["Content-Type"]   = self.mime.to_mime( file );
+									["Content-Length"] = stat.size;
+									["ETag"]           = etag;
+								}
+							), ltn12.source.file(io.open(file))
+						else
+							return Response( code, hdrs or { } ),
+								ltn12.source.empty()
+						end
+					else
+						return Response( code, hdrs or { } ),
+							ltn12.source.empty()
+					end
+				else
+					return Response( code, hdrs or { } ),
+						ltn12.source.empty()
+				end
+			else
+				return Response( code, hdrs or { } ),
+					ltn12.source.empty()
+			end
 		else
 			return self:failure(403, "Unable to transmit " .. stat.type .. " " .. file)
 		end

libs/httpd/luasrc/httpd/handler/luci.lua

@@ -17,6 +17,7 @@ module("luci.httpd.handler.luci", package.seeall)
 
 require("luci.dispatcher")
 require("luci.http")
+require("luci.http.protocol.date")
 require("ltn12")
 
 Luci = luci.util.class(luci.httpd.module.Handler)
@@ -79,5 +80,8 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 		end
 	end
 
+	headers["Expires"] = luci.http.protocol.date.to_http( os.time() )
+	headers["Date"]    = headers["Expires"]
+
 	return Response(status, headers), iter
 end