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

1959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
a7ed0cf69e
Avoid panic on QUIC server close (fixes #1805) 2017-08-03 11:20:14 -06:00
Matt Holt
d3e5f9d456 Merge pull request #1800 from mholt/exitcodes 
Distinguishable exit codes
 2017-08-02 09:32:36 -06:00
Matthew Holt
cbb85532a8
Distinguishable exit codes 
0: normal or expected exit
1: error before server finished starting
2: double SIGINT (force quit)
3: error stopping with SIGQUIT
4: shutdown callback(s) returned error(s)
 2017-08-01 23:41:24 -06:00
Matthew Holt
65bc696b0c
Fix force quit using SIGINT 
Only the outside function call is executed in a new goroutine when
invoking 'go'. Oops. Force quits (2 SIGINTs) now work again.
 2017-07-31 17:43:37 -06:00
Matthew Holt
e7f08bff38
Update changes and readme for v0.10.6 2017-07-28 12:21:09 -06:00
Matt Holt
16fa3ecb0f Merge pull request #1789 from abiosoft/fix-atomic-add 
fastcgi: Fix for #1788. Align atomic fields to 64-bit word (Go bug)
 2017-07-28 11:53:21 -06:00
Abiola Ibrahim
dd3f460cf8 Fix for #1788. Rearrange struct fields. 2017-07-28 17:33:40 +01:00
Henrique Dias
36d8d2c7de Fix links on caddy-hugo and caddy-filemanager (#1787) 2017-07-28 09:19:00 -06:00
Matthew Holt
c06ff1cb37
Update changes and readme for version 0.10.5 2017-07-27 16:22:39 -06:00
Matthew Holt
a48e4ecb5a
vendor: Update dependencies 2017-07-27 16:11:56 -06:00
Matthew Holt
74940af624
httpserver: Set default idle timeout of 5 minutes (closes #1733) 
Also clarified a comment in SiteConfig
 2017-07-27 16:01:47 -06:00
Matt Holt
32ec39cdea Merge pull request #1784 from mholt/trie-fallbacks 
Move fallbackHosts to vhostTrie
 2017-07-27 15:53:07 -06:00
Sergey Frolov
a197c864e8 Move fallbackHosts to vhostTrie 2017-07-27 17:23:13 -04:00
Matt Holt
4991d702fd Merge pull request #1781 from mholt/global-fallback-hosts 
httpserver: Add global FallbackHosts for vhost matching
 2017-07-25 19:55:14 -06:00
Matt Holt
76a282718d Merge pull request #1779 from mholt/mitm-panic 
mitm: Fix out of bounds error when checking software version in UA
 2017-07-25 15:35:51 -06:00
Sergey Frolov
c8307409c9 Add global FallbackHosts for vhost matching 2017-07-25 16:10:51 -04:00
Matt Holt
1366a44639 Merge pull request #1780 from sergeyfrolov/master 
httpserver: Encapsulate WriteSiteNotFound error
 2017-07-25 13:33:25 -06:00
Sergey Frolov
ea245b5af5 Encapsulate WriteSiteNotFound error 2017-07-25 15:14:23 -04:00
Matthew Holt
10d5422c3e
mitm: Fix out of bounds error when checking software version in UA 2017-07-25 13:00:49 -06:00
Matt Holt
b63d9fdc68 Merge pull request #1777 from tw4452852/chunked_ws 
proxy: fix hang on chunked websocket server
 2017-07-25 09:59:42 -06:00
Tw
9b073aad58 proxy: fix hang on chunked websocket server 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-07-25 15:12:38 +08:00
Matthew Holt
ae7e098240
httpserver: Only enable QUIC for sites with TLS & HTTP2 enabled 2017-07-24 19:05:48 -06:00
Matt Holt
6e0317a703 Merge pull request #1747 from twdkeule/fix-index-push 
Pushes for /index.html work when surfing to /
 2017-07-24 14:00:27 -06:00
Thomas De Keulenaer
20f76a256e Push resources for indexFiles when surfing to directories 
Use httpserver.IndexFile() to determine index files

Test if middleware pushes indexfile when requesting directory

Fix codereview issues

Serve original request first, push later

Revert "Serve original request first, push later"

This reverts commit 2c66f01115747e5665ba7f2d33e2fd551dc31877.
 2017-07-24 12:36:07 +02:00
Matt Holt
40b52fb02e Merge pull request #1775 from tw4452852/roller_parse 
log,error: fix roller parser issue
 2017-07-20 14:19:17 -06:00
Tw
91150bb770 log,error: fix roller parser issue 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-07-20 15:21:06 +08:00
Matthew Holt
f1dd9f2b79
mitm: Improve detection related to Chrome and Safari on iOS 
Include test for iOS 11 beta
 2017-07-19 11:16:41 -06:00
Abiola Ibrahim
6aba4a311a fastcgi: Revert persistent connections (#1739) 
* Revert fastcgi to emove persistent connections.

* Fix linting errors

* reintroduce timeout tests

* check for non-zero timeout

* ensure resp is not nil
 2017-07-18 12:52:53 -06:00
Jaume Martin
56153e0bb3 httpserver: Adding nobots directive (#1767) 
* Adding nobots directive

* Moving nobots directive behind log one.

* Move nobots directive to a better position
 2017-07-17 12:39:06 -06:00
Matt Holt
905eb70773 Merge pull request #1753 from spacewander/weak_etag_after_gzip 
gzip: change ETag to weak etag after gzip
 2017-07-13 22:36:01 -06:00
spacewander
e2544597a1 gzip: change ETag to weak ETag after gzip 
According to https://tools.ietf.org/html/rfc7232#section-2.1
> Likewise, a validator is weak if it is shared by two or more
representations of a given resource at the same time, unless those
representations have identical representation data.  For example, if
the origin server sends the same validator for a representation with
a gzip content coding applied as it does for a representation with no
content coding, then that validator is weak.

Therefore, after gzip, we should change the original etag to weak etag.
 2017-07-14 11:48:34 +08:00
Nicolas
ba1132214e httpserver: Add nicolasazrak/caddy-cache plugin directive (#1759) 2017-07-13 05:28:00 -06:00
Matthew Holt
b987c7893c
vendor: Update lego/acme to v0.4.0 
Not much changed but it's a clean pull now; easier for future reference.
 2017-07-12 20:34:10 -06:00
Ning Xie
aebe387f72 basicauth: remove magic number (#1760) 2017-07-12 19:32:24 -06:00
Henrique Dias
0985024670 httpserver: Add webdav plugin directive (#1752) 2017-07-11 09:43:57 -06:00
Richard Bowden
25a596a98f freebsd init: added new functionality and enabled better logging (#1740) 
* uses more of the builtin functionality for starting and stopping of the process by using command and command_args along with procname
* removed -f from daemon as this was hiding error message that were sent to stdout on startup, now writing stdout to the logfile directly

for example, this was being hidden:

“Activating privacy features.. [www.domain.com] failed to get certificate: Error presenting token: Could not find the start of authority”

it now shows up in the log

* aded “caddy_env” to allow the setting of environment variables that caddy might need, for example when setting creds for “DNS Challenge”

* added a check to ensure caddy_config_path file exists
 2017-07-10 16:20:30 -06:00
Toby Allen
acc67eb3b2 Rename directive requestid to request_id (#1757) 
* rename requestid request_id

* rename folder

* folder name match package name requestid
 2017-07-10 14:47:48 -06:00
Matt Holt
4c700efbbb Merge pull request #1751 from zikes/header_policy 
proxy: add Header load balancing policy
 2017-07-10 14:44:07 -06:00
Matt Holt
9ad96b33ff Merge pull request #1754 from spacewander/correct_test_message 
gzip,mime: show response header instead of the request one in test message
 2017-07-08 14:20:43 -06:00
spacewander
387a083255 gzip,mime: show response header instead of the request one in test message 2017-07-08 11:53:34 +08:00
Jason Hutchinson
95366e41c4 add Header proxy policy 2017-07-07 10:37:49 -05:00
Abiola Ibrahim
a6ec51b349 Merge pull request #1748 from bananenmannfrau/master 
adds unix timestamp placeholder
 2017-07-06 07:46:20 +00:00
bananenmannfrau
f6a96227c4 adds unix timestamp placeholder 2017-07-05 22:08:07 +02:00
Matthew Holt
56b3ea876b Correct URL to restic plugin in comment 2017-07-05 08:43:55 -06:00
Tw
2d9273f915 Merge pull request #1746 from JoshHarmon/proxy-ci-fix 
proxy: Fix CI fail from format token in Error call
 2017-07-05 01:23:33 -05:00
Josh Harmon
8bc7b93bc8 proxy: Fix CI fail from format token in Error call 
go vet caused a build fail in https://travis-ci.org/mholt/caddy/jobs/248392875:
   upstream_test.go:480::error: possible formatting directive in Error call (vet)

This patch changes the Error call added in commit 078c991574 to
an Errorf call to support the use of the %d token.
 2017-07-04 23:03:59 -07:00
Matt Holt
4750699ab0 Merge pull request #1734 from tw4452852/ineffassign 
markdown: fix the real ineffectual assignments in test
 2017-06-29 08:28:57 -06:00
Tw
a4bf6e586d markdown: fix the real ineffectual assignments in test 
Signed-off-by: Tw <tw19881113@gmail.com>
 2017-06-29 18:30:18 +08:00
Matthew Holt
dfa389c9df
Update README and CHANGES for 0.10.4 2017-06-28 16:10:30 -06:00
Martin Redmond
078c991574 proxy: custom upstream health check by body string, closes #324 (#1691) 2017-06-28 15:54:29 -06:00