Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-20 22:52:58 -05:00
Code Issues Activity

Merge pull request #1748 from bananenmannfrau/master

Browse source 
adds unix timestamp placeholder
This commit is contained in:
Abiola Ibrahim 2017-07-06 07:46:20 +00:00 • committed by GitHub
commit a6ec51b349
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddyhttp/httpserver/replacer.go
View file

@ -287,6 +287,8 @@ func (r *replacer) getSubstitution(key string) string {
return now().Format(timeFormat) return now().Format(timeFormat)
case "{when_iso}": case "{when_iso}":
return now().UTC().Format(timeFormatISOUTC) return now().UTC().Format(timeFormatISOUTC)
case "{when_unix}":
return strconv.FormatInt(now().Unix(), 10)
case "{file}": case "{file}":
_, file := path.Split(r.request.URL.Path) _, file := path.Split(r.request.URL.Path)
return file return file

1
caddyhttp/httpserver/replacer_test.go
View file

@ -75,6 +75,7 @@ func TestReplace(t *testing.T) {
{"The response status is {status}.", "The response status is 200."}, {"The response status is {status}.", "The response status is 200."},
{"{when}", "02/Jan/2006:15:04:05 +0000"}, {"{when}", "02/Jan/2006:15:04:05 +0000"},
{"{when_iso}", "2006-01-02T15:04:12Z"}, {"{when_iso}", "2006-01-02T15:04:12Z"},
{"{when_unix}", "1136214252"},
{"The Custom header is {>Custom}.", "The Custom header is foobarbaz."}, {"The Custom header is {>Custom}.", "The Custom header is foobarbaz."},
{"The CustomAdd header is {>CustomAdd}.", "The CustomAdd header is caddy."}, {"The CustomAdd header is {>CustomAdd}.", "The CustomAdd header is caddy."},
{"The request is {request}.", "The request is POST /?foo=bar HTTP/1.1\\r\\nHost: localhost\\r\\n" + {"The request is {request}.", "The request is POST /?foo=bar HTTP/1.1\\r\\nHost: localhost\\r\\n" +