* libs/http: removed caching in http.protocol.date
This commit is contained in:
parent
289b8fc1b6
commit
3eefe8a8e2
1 changed files with 25 additions and 35 deletions
|
@ -15,10 +15,6 @@ $Id$
|
||||||
|
|
||||||
module("luci.http.protocol.date", package.seeall)
|
module("luci.http.protocol.date", package.seeall)
|
||||||
|
|
||||||
local ucache = { }
|
|
||||||
local hcache = { }
|
|
||||||
|
|
||||||
|
|
||||||
MONTHS = {
|
MONTHS = {
|
||||||
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
|
||||||
"Sep", "Oct", "Nov", "Dec"
|
"Sep", "Oct", "Nov", "Dec"
|
||||||
|
@ -155,7 +151,6 @@ end
|
||||||
-- Convert a HTTP date to unixtime
|
-- Convert a HTTP date to unixtime
|
||||||
function to_unix(date)
|
function to_unix(date)
|
||||||
|
|
||||||
if not ucache[date] then
|
|
||||||
local wd, day, mon, yr, hr, min, sec, tz = date:match(
|
local wd, day, mon, yr, hr, min, sec, tz = date:match(
|
||||||
"([A-Z][a-z][a-z]), ([0-9]+) " ..
|
"([A-Z][a-z][a-z]), ([0-9]+) " ..
|
||||||
"([A-Z][a-z][a-z]) ([0-9]+) " ..
|
"([A-Z][a-z][a-z]) ([0-9]+) " ..
|
||||||
|
@ -174,7 +169,7 @@ function to_unix(date)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- convert to epoch time
|
-- convert to epoch time
|
||||||
ucache[date] = tz_offset(tz) + os.time( {
|
return tz_offset(tz) + os.time( {
|
||||||
year = yr,
|
year = yr,
|
||||||
month = month,
|
month = month,
|
||||||
day = day,
|
day = day,
|
||||||
|
@ -183,18 +178,13 @@ function to_unix(date)
|
||||||
sec = sec
|
sec = sec
|
||||||
} )
|
} )
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
return ucache[date] or 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Convert a unixtime to HTTP date
|
-- Convert a unixtime to HTTP date
|
||||||
function to_http(time)
|
function to_http(time)
|
||||||
if not hcache[time] then
|
return os.date( "%a, %d %b %Y %H:%M:%S GMT", time )
|
||||||
hcache[time] = os.date( "%a, %d %b %Y %H:%M:%S GMT", time )
|
|
||||||
end
|
|
||||||
|
|
||||||
return hcache[time]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Compare two dates
|
-- Compare two dates
|
||||||
|
|
Loading…
Reference in a new issue