github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 20:24:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,612 Commits 32 Branches 138 Tags 33 MiB
63f749112b
Commit Graph

1612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mateusz Gajewski
63f749112b Use http.Header instead of custom type (#1214) 
* Use http.Header

* This initialization was just stupid
 2016-11-03 12:24:26 -06:00
Matt Holt
e19a007b38 Merge pull request #1238 from tw4452852/1234 
proxy: make sure value is optional when removing a header
 2016-11-03 12:13:39 -06:00
Tw
e85ba0d4db proxy: make value is optional when removing a header 
fix issue #1234

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-11-03 22:50:51 +00:00
Matthew Holt
b89cbe18e2 Move header up above errors in directive order (fix #1183) 2016-11-02 08:13:58 -06:00
Matthew Holt
14500d8204 header: Implement Flusher and CloseNotifier 2016-11-02 08:13:58 -06:00
Tw
a2900e46f4 header: only register deletion operation (#1212) 
fix issue #1183

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-11-01 22:08:02 -06:00
ericdreeves
08c17c7c31 Add Files action to template context. (closes #1198) (#1226) 
* Add Files action to template context. (#1198)

* Fixes to testFiles().

- Set os.ModePerm on directories created during test.
- Use filepath.Join() to create directory path.
- Use Fatalf, not Fatal.

* Make additional fixes to test cases.

* Fix test cases to use correct path format.

Dir.Open() in net/http requires '/'-separated paths while
filepath.Join() may produce paths with different separator.

* Remove directory created by test at end of loop.

* Close the FileSystem before returning.

* Initialize names slice to the number of entries.

Also, do not call os.RemoveAll() unless the path to the directory
is a valid one.
 2016-11-01 22:04:53 -06:00
Matthew Holt
49cb225cbd Ensure user always sees fatal errors at startup 2016-10-31 21:45:12 -06:00
elcore
53e117802f Add support for OCSP Must-Staple for Let's Encrypt certs (#1221) 
* Fix Caddytls

* Let the user decide

* Address comments
 2016-10-29 08:44:49 -06:00
Matthew Holt
23f89f30e9 Add sourcegraph link to readme 2016-10-27 19:27:39 -06:00
Matt Holt
ff32ade1d8 Merge pull request #1216 from chris-bandce/patch-1 
Punctuation
 2016-10-26 11:23:00 -06:00
chris-bandce
3ce9075d3d Punctuation 2016-10-26 16:27:35 +01:00
Matt Holt
f2e999aab2 Merge pull request #1213 from mholt/simplify_code 
Remove dead code, do struct alignment, simplify code
 2016-10-26 00:05:08 -06:00
Mateusz Gajewski
8cc3416bbc
Remove dead code, do struct alignment, simplify code 2016-10-25 19:19:54 +02:00
Toby Allen
c4d64a418b Log site info output at start. Fix for #1205 (#1210) 
* Log Site start to -log. Fix for #1205

* Removed Comment
 2016-10-25 09:31:21 -06:00
Matt Holt
f3108bb7bf Merge pull request #1207 from tw4452852/1206 
proxy: set request's body to nil explicitly
 2016-10-25 09:30:10 -06:00
Mateusz Gajewski
c2853ea64b Use proper Request (#1197) 
* Use proper Request

* Fixes
 2016-10-25 09:28:53 -06:00
Matt Holt
561069fdb6 Merge pull request #1211 from mholt/LogStartupCmd 
Log Startup and Shutdown Commands
 2016-10-24 14:26:54 -06:00
Toby Allen
66a07773ab Log Startup and Shutdown Commands 2016-10-24 20:48:36 +01:00
Tw
a1dd6f0b34 proxy: set request's body to nil explicitly 
fix issue #1206

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-24 11:10:12 +08:00
Henrique Dias
2b9bbc5236 Moving File Manager higher in the directive list (#1199) 
* Moving File Manager higher in the directive list

See hacdias/caddy-filemanager#35.

* gofmt
 2016-10-20 14:52:43 -06:00
Matt Holt
2f5e840ea9 Merge pull request #1193 from mholt/Go-1.7.3 
Update to Go 1.7.3
 2016-10-19 18:00:00 -06:00
Eldin Hadzic
ab3cc8f961 Update to Go 1.7.3 2016-10-19 21:26:04 +00:00
Matt Holt
efb1c54e13 Merge pull request #1189 from rndmh3ro/more_upstart_scripts 
add separate upstart scripts for centos 6 and ubuntu 12.04
 2016-10-19 08:13:44 -06:00
Matt Holt
3c1957a612 Merge pull request #1190 from tw4452852/1188 
errors: don't join the absolute file path
 2016-10-17 20:48:45 -06:00
Tw
2bd6fd0aea errors: don't join the absolute file path 
fix issue #1188

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-18 09:55:50 +08:00
Sebastian Gumprich
f1342e37ed add separate upstart scripts for centos 6 and ubuntu 12.04 2016-10-17 22:04:26 +02:00
Toby Allen
94af37087b Fix for fastcgi deletion of Caddy-Rewrite-Original-URI header #1153 (#1184) 
* Very simple fix for #1153

* Prevent  Caddy-Rewrite-Original-URI being added as  an HTTP ENV variable passed to FastCGI

part of fix for #1153

* Changes to Markdown to fix travis CI build.

#1955.2

* Revert "Changes to Markdown to fix travis CI build."

This reverts commit 4a01888839.

* fail fast and fmt changes

* Create test for existance of Caddy-Rewrite-Original-URI header value #1153

* updated test comment

* const moved outside function so available to tests
 2016-10-16 12:11:52 -06:00
Matthew Holt
5fcfdab6c7
Reorder basicauth directive; it should also protect redirects 2016-10-15 09:41:03 -06:00
Gregor Noczinski
016384abef * Added directive "filter" to whitelist for support of github.com/echocat/caddy-filter (#1167) 2016-10-15 09:31:22 -06:00
Matt Holt
036633b64a Merge pull request #1174 from tw4452852/1173 
header: implement http.Hijacker for responseWriterWrapper
 2016-10-13 23:09:21 -06:00
Matt Holt
550b1170bd Merge branch 'master' into 1173 2016-10-13 22:56:19 -06:00
Matt Holt
d44016b937 Merge pull request #1178 from tw4452852/1177 
proxy: preserve path trailing slash if it was there
 2016-10-11 18:26:51 +02:00
Tw
4baca884c5 proxy: preserve path trailing slash if it was there 
fix issue #1177

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-11 17:06:59 +08:00
Tw
d0455c7b9c add more descriptive errors 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-11 10:34:51 +08:00
Tw
e5d33e73f3 header: implement http.Hijacker for responseWriterWrapper 
fix issue #1173

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-11 08:53:47 +08:00
Matt Holt
9ced4b17e5 Merge pull request #1175 from tw4452852/fix_archiver 
dist: adapt to archiver's refactor
 2016-10-10 20:41:00 +02:00
Tw
b48bda4a6d dist: adapt to archiver's refactor 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-10 16:39:27 +08:00
Matt Holt
5d9989405a Merge pull request #1165 from aishraj/master 
Have milliseconds as the latency log time unit
 2016-10-08 22:48:48 +02:00
Aish Raj Dahal
733f622f7a
Add new placeholder for latency in milliseconds 2016-10-05 21:06:15 -07:00
Matt Holt
20a54d0e07 Merge pull request #1169 from bengadbois/patch-1 
Adding Go Report Card badge
 2016-10-05 15:38:27 -06:00
Ben Gadbois
b5a07d43fa Adding Go Report Card badge 2016-10-05 20:48:43 +02:00
elcore
8561f42786 CurvePreferences (Test) (#1161) 
We need consistency in code style!!!
 2016-10-04 01:15:23 +02:00
elcore
e1ea58b7c4 Customize curve preferences, closes #1117 (#1159) 
* Feature Request: #1117

* The order of the curves matter
 2016-10-03 10:52:45 -06:00
Matt Holt
e9ce45ce61 Merge pull request #1158 from tw4452852/1154 
proxy: handle 'without' option in encoded form of URL path
 2016-10-02 13:39:55 -06:00
Tw
cc638c7faa proxy: handle 'without' option in encoded form of URL path 
fix issue #1154

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-02 19:32:14 +00:00
Matthew Holt
b766dab9fa
tls: Reorder some logic to avoid subtle, undocumented behavior 
By calling SetTLSAddress, the acme package reset the challenge provider
to the default one instead of keeping the custom one we specified before
with SetChallengeProvider. Yikes. This means that Caddy would try to
open a listener on port 443 even though we should have been handling it
with our provider, causing the challenge to fail, since usually port 443
is in use.

So this change just reorders the calls so that our provider takes
precedence.

cf. https://github.com/xenolf/lego/pull/292
 2016-09-28 18:29:46 -06:00
Matthew Holt
c885edda24
Version 0.9.3 2016-09-28 12:43:28 -06:00
Peer Beckmann
bb7787d2ee Remove the eager check in the browse middleware (#1144) 
* Remove the eager check in the browse middleware, whether the root directory exists.
Caddy will start and throw a 404-error until the directory will be created.

* Add the complimentary test.
 - Tests the startup of the browse middleware if the site root is inexistent and browse is pointing to the site root.

* Some minor stylistic tweaks.
 2016-09-28 12:23:44 -06:00
Matt Holt
8620581f95 Merge pull request #1145 from tw4452852/header_placeholder 
replacer: evaluate header placeholder when replacing
 2016-09-28 10:42:41 -06:00