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,755 Commits 32 Branches 138 Tags 33 MiB
75ccc05d84
Commit Graph

1755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tw
d0ddfc849d header: defer header operations 
fix issue #1131

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-09-27 15:35:13 +08:00
Matthew Holt
617012c3fb
Use time.Since() for readability 2016-09-24 21:27:57 -06:00
Matt Holt
4adbcd2565 Merge pull request #1125 from hlidotbe/master 
Add expires directive
 2016-09-24 21:11:30 -06:00
Matt Holt
d01bcd591c Merge pull request #1112 from tw4452852/proxy_header 
proxy: don't append predefined headers
 2016-09-24 21:02:19 -06:00
Tw
c9b022b5e0 proxy: don't append some predefined headers 
fix issue #1086

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-09-25 09:24:27 +00:00
Matthew Holt
a661007a55
proxy: Fix retry logic for when no hosts are available 2016-09-24 16:30:40 -06:00
Matthew Holt
0c0142c8cc
Delete tryDuration, now unused 2016-09-24 16:05:33 -06:00
Matthew Holt
37f05e450f
proxy: Add try_duration and try_interval; by default don't retry 2016-09-24 16:03:22 -06:00
Matthew Holt
9b9a77a160
proxy: Improved error reporting 
We now report the actual error message rather than a generic one
 2016-09-24 14:22:13 -06:00
Tw
4670d13c8c proxy: fix checking error in TestDownstreamHeadersUpdate and TestUpstreamHeadersUpdate 
Signed-off-by: Tw <tw19881113@gmail.com>
 2016-09-24 19:28:42 +00:00
Matthew Holt
9077cce126
Add tests for case insensitivity of keys and saving contexts 2016-09-24 13:24:33 -06:00
Matthew Holt
76d9d695be
Remove use of proxy_header in test 2016-09-24 12:27:16 -06:00
Matthew Holt
a4d70262aa
Use strings.Contains instead of IndexOf for readability 2016-09-24 12:09:28 -06:00
Hugues Lismonde
79f2deee42 Add expires directive 2016-09-24 08:10:32 +02:00
Abiola Ibrahim
bac54de9eb Fastcgi persistent fix (#1129) 
* Support for configurable connection pool.

* ensure positive integer pool size config
 2016-09-23 23:29:23 -06:00
Josh Aas
3f83eccfbd improvements for Linux systemd integration (#1127) 
* Remove unnecessary config options from systemd service so it will work with earlier versions of systemd. Simplify the systemd service instructions and make them more complete.

* Minor systemd README improvements.

* Add back some of the optional systemd 229 stuff but commented out for compat.

* A bunch of updates to the README for linux systemd.
 2016-09-23 16:50:39 -06:00
Matthew Holt
d60a26ae30
import: No need to error for no matches if using glob pattern 2016-09-22 11:07:37 -06:00
Matthew Holt
bbf954cbf2
Fix case sensitivity in site addresses 2016-09-20 22:44:05 -06:00
Matthew Holt
73916ccc30
Version 0.9.2 2016-09-20 16:33:50 -06:00
Matthew Holt
fcad474064 Move prometheus directive higher in list (closes #1119) 2016-09-20 14:29:32 -06:00
Lars Wiegman
4449d3dcd9 Add the multipass plugin to the directives (#1120) 
* Add the multipass plugin to the directives

* Fix gofmt
 2016-09-20 09:06:28 -06:00
Matthew Holt
c4a177bd3b
Fix lint warnings and update CI tests to Go 1.7.1 2016-09-19 17:25:21 -06:00
Matthew Holt
8ecd543519
Refactor and improve TLS storage code (related to locking) 2016-09-19 17:24:34 -06:00
Matt Holt
7af499c28b Merge pull request #1115 from tw4452852/import 
parser: fix broken absolute path imports (recursive case)
 2016-09-19 16:28:55 -06:00
Tw
64fd281f5b parser: fix broken absolute path imports 
fix issue #1026

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-09-18 10:16:24 +08:00
Matthew Holt
bedad34b25
Clean up some significant portions of the TLS management code 2016-09-14 22:30:49 -06:00
Matt Holt
0e7635c54b Merge pull request #1102 from coopernurse/awslambda-ext-plugin 
awslambda external plugin
 2016-09-13 16:47:10 -06:00
James Cooper
40a3a6b24f Add awslambda to plugin.go 2016-09-10 07:52:04 -07:00
Sebastian Schmittner
09a1f02971 persistent fastcgi connections (#1087) 
* keep fastcgi connection open

* poor mans serialisation to make up for the lack of demuxing

* pointing includes to echse's repo

* Revert "pointing includes to echse's repo"

This reverts commit 281daad8d4.

* switch for persistent fcgi connections on/off added

* fixing ineffectual assignments

* camel case instead of _

* only activate persistent sockets on windows (and some naming conventions/cleanup)

* gitfm import sorting

* Revert "fixing ineffectual assignments"

This reverts commit 79760344e7.

# Conflicts:
#	caddyhttp/staticfiles/fileserver.go

* added another mutex and deleting map entries. thx to mholts QA comments!

* thinking about it, this RW lock was not a good idea here

* thread safety

* I keep learning about mutexs in go

* some cosmetics
 2016-09-10 06:47:47 -06:00
David Prandzioch
8e54d5cecb Updated FreeBSD init script (#1098) 
* Updated FreeBSD init script to allow the server to stop properly

* Fixed FreeBSD init script permissions

* Updated FreeBSD init script to allow the server to stop properly
 2016-09-08 21:02:28 -06:00
Matthew Holt
7ef405f9b2
Satisfy gofmt 2016-09-08 20:32:21 -06:00
Matthew Holt
11bf28f783
Weird, git didn't commit this closing curly brace 2016-09-08 18:54:36 -06:00
Matthew Holt
98bba33861 Lower-case server name for good measure 
This already happens in the getCertificate function, but doing it here
guarantees case insensitivity across the board for this handshake.
 2016-09-08 18:50:04 -06:00
Matthew Holt
abdf13ea30 Improve TLS storage provider errors 
We renamed caddytls.ErrStorageNotFound to caddytls.ErrNotExist to more
closely mirror the os package. We changed it to an interface wrapper
so that the custom error message can be preserved. Returning only "data
not found" was useless in debugging because we couldn't know the
concrete value of the error (like what it was trying to load).

Users can do a type assertion to determine if the error value is a "not
found" error instead of doing an equality check.
 2016-09-08 18:50:04 -06:00
Matthew Holt
a251831feb Fix bug renewing certs affecting Caddyfiles using wildcard addresses 
A Caddyfile using *.example.com as its site address would be subject to
this bug at renewal time, as it would use the literal "*.example.com"
value instead of the name being passed in to obtain a certificate.
This change fixes the LoadSite call so that it looks in the proper
directory for the certificate resources.
 2016-09-08 18:50:04 -06:00
Matt Holt
1ea96def31 Merge pull request #1091 from mikepulaski/master 
Caddyfiles read from STDIN now have server types associated with them.
 2016-09-05 13:14:35 -06:00
Mike Pulaski
635714fe38 Caddyfiles read from STDIN now have server types associated with them. Fixes #1090. 2016-09-05 18:34:32 +02:00
Matthew Holt
5f135a27d5
Eliminate ineffectual assignments 
Most of these were fixed by handling errors that were previously
unhandled (oops).
 2016-09-05 10:30:46 -06:00
Matthew Holt
45a3d0b526
Fix misspellings 2016-09-05 10:20:34 -06:00
Sebastian
a122304196 Support for lego's timeout option (#1041) 
* Support for lego's timeout option

* Changed IntVar to DurationVar for catimeout

* Modified catimeout according to mholt's comments
 2016-08-30 13:38:44 -06:00
Matthew Holt
14a6e4b4ed
More minor text fixes 2016-08-30 13:37:35 -06:00
Matt Holt
72e4ba8b5b Merge pull request #1079 from ijt/master 
Use naoina/toml for MIT license. Make proxy_test work in any directory.
 2016-08-30 08:10:57 -06:00
Issac Trotts
1991083322 Fix tests to not make long unix domain socketpaths 
Some tests were running into this issue:
https://github.com/golang/go/issues/6895

Putting the sockets into temp dirs fixes the problem.
 2016-08-29 18:09:46 -07:00
Issac Trotts
7ba804353c Use naoina/toml instead of BurntSushi/toml 2016-08-29 17:55:44 -07:00
Abiola Ibrahim
ac933f1685 Merge pull request #1042 from mholt/status-middleware 
Add 'status' middleware instead of 'status' directive for 'rewrite' middleware
 2016-08-29 16:41:27 +01:00
Volodymyr Galkin
20ee457cae Add 'status' middleware instead of 'status' directive for 'rewrite' middleware 2016-08-29 17:17:23 +03:00
Matthew Holt
34a99598f7
Ignore conflicting settings if TLS disabled (fixes #1075) 2016-08-26 16:18:08 -06:00
Matthew Holt
191ec27c26
Clarify godoc for HTTP handler signature 2016-08-25 17:13:49 -06:00
Matthew Holt
b1ae8a71f1
More tests for TLS configuration 2016-08-25 17:13:27 -06:00
Matt Holt
d4f4fcdb4c Merge pull request #1070 from FiloSottile/master 
Actually set tls.Config.PreferServerCipherSuites
 2016-08-25 16:33:12 -06:00