X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fhttpd%2Fluasrc%2Fhttpd%2Fhandler%2Fluci.lua;h=17882e258bc3487ba78d9fc8a9317294d9823ec8;hb=699784791cfc05cc03ebce731dca5e5c29b0ab87;hp=4a83de1a4c93afec35d327d7f61bdd346a01d34d;hpb=cd4353e65fc5523d541e518577616245e00bd98f;p=project%2Fluci.git

diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index 4a83de1a4c..17882e258b 100644
--- a/libs/httpd/luasrc/httpd/handler/luci.lua
+++ b/libs/httpd/luasrc/httpd/handler/luci.lua
@@ -66,7 +66,12 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 			headers[data1] = data2
 		end
 	end
+<<<<<<< HEAD:libs/httpd/luasrc/httpd/handler/luci.lua
 
+=======
+	
+	
+>>>>>>> * libs/httpd: Added Cache-Control header to LuCI:libs/httpd/luasrc/httpd/handler/luci.lua
 	local function iter()
 		local res, id, data = coroutine.resume(x)
 		if not res then
@@ -82,6 +87,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 
 	headers["Expires"] = luci.http.protocol.date.to_http( os.time() )
 	headers["Date"]    = headers["Expires"]
+	headers["Cache-Control"] = "no-cache"
 
 	return Response(status, headers), iter
 end