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

..

condition_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

condition.go

redir: Do not count multiple rules with if statements as duplicates

2017-09-28 11:41:11 -06:00

error.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

https_test.go

tls: In HTTP->HTTPS redirects, preserve redir port in some circumstances

2018-02-16 12:36:28 -07:00

https.go

tls: Add 'wildcard' subdirective to force wildcard certificate

2018-03-17 11:29:19 -06:00

logger_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

logger.go

log: 'except' subdirective to skip logging certain requests (#2028)

2018-03-26 17:17:43 -06:00

middleware_test.go

Change CASE_SENSITIVE_PATH default to false

2017-10-08 22:19:35 -06:00

middleware.go

httpserver: give each req context a Replacer that preserves custom values (#1937)

2017-11-07 10:10:03 -07:00

mitm_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

mitm.go

Refactor diagnostics -> telemetry

2018-03-22 18:05:31 -06:00

path_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

path.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

plugin_test.go

httpserver: CaseSensitivePath applied to paths in site keys (#2034)

2018-03-25 21:32:30 -06:00

plugin.go

Merge branch 'master' into telemetry

2018-04-20 00:03:57 -06:00

recorder_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

recorder.go

ResponseBuffer: add missing header writing (#1997)

2018-01-15 18:32:19 -07:00

replacer_test.go

Merge branch 'master' into acmev2

2018-03-25 21:56:11 -06:00

replacer.go

Merge branch 'master' into acmev2

2018-03-25 21:56:11 -06:00

responsewriterwrapper.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

roller.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

server_test.go

httpserver: Fix #2038 (query string being lost from URI) (#2039)

2018-03-17 17:17:42 -06:00

server.go

Merge branch 'master' into telemetry

2018-04-20 00:03:57 -06:00

siteconfig.go

httpserver: Prevent TLS client authentication bypass in 3 ways (#2099)

2018-03-30 14:40:04 -06:00

tplcontext_test.go

httpserver: Fix test that relies on external DNS lookup

2018-03-30 06:39:46 -06:00

tplcontext.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

vhosttrie_test.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00

vhosttrie.go

Apply Apache license to all .go source files (closes #1865)

2017-09-22 23:56:58 -06:00