0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
caddy/caddyhttp
Matthew Holt b019501b8b
Merge branch 'master' into telemetry
# Conflicts:
#	caddy/caddymain/run.go
#	caddyhttp/httpserver/plugin.go
#	caddytls/client.go
2018-04-20 00:03:57 -06:00
..
basicauth basicauth: Make test pass with Go 1.10 2018-02-18 00:13:11 -07:00
bind Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
browse browse: Correct 'modified' date alignment (#1954) 2018-01-15 18:18:25 -07:00
errors Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
expvar Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
extensions Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
fastcgi httpserver: Placeholders for tls_protocol and tls_cipher (#2062) 2018-03-17 17:27:10 -06:00
gzip Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
header Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
httpserver Merge branch 'master' into telemetry 2018-04-20 00:03:57 -06:00
index Implement per-site index (#1906) 2017-10-29 21:13:10 +00:00
internalsrv Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
limits Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
log log: 'except' subdirective to skip logging certain requests (#2028) 2018-03-26 17:17:43 -06:00
markdown markdown: only update template when file changed (#1909) 2017-11-04 17:36:59 +00:00
mime Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
pprof Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
proxy proxy: Enabled configurable timeout (#2070) 2018-04-17 08:09:22 -06:00
push Implement per-site index (#1906) 2017-10-29 21:13:10 +00:00
redirect redir: Do not count multiple rules with if statements as duplicates 2017-09-28 11:41:11 -06:00
requestid request_id: Allow reusing ID from header (closes #2012) 2018-02-02 19:59:28 -07:00
rewrite rewrite: Regular expression support for simple rule (#2082) 2018-04-14 19:40:55 -06:00
root Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
staticfiles staticfiles: Prevent path-based open redirects 2018-02-11 13:30:01 -07:00
status Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
templates template: add extension filter test and simplify test code (#1996) 2018-01-15 18:27:55 -07:00
timeouts Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
websocket Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
caddyhttp.go startup/shutdown: Remove deprecated startup/shutdown directives (#2033) 2018-02-21 10:56:09 -07:00
caddyhttp_test.go startup/shutdown: Remove deprecated startup/shutdown directives (#2033) 2018-02-21 10:56:09 -07:00