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,412 Commits 32 Branches 138 Tags 33 MiB
db4cd8ee2d
Commit Graph

1412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimi Wariboko Jr
db4cd8ee2d Proxy: Add keepalive directive to proxy to set MaxIdleConnsPerHost on transport. Fixes #938 2016-08-01 15:54:07 -07:00
Matt Holt
da5b3cfc50 Merge pull request #976 from wjkohnen/h2 
Re-enable HTTP/2 for Go 1.7.
 2016-08-01 15:06:44 -06:00
Matt Holt
372c77da3a Merge pull request #983 from djvdorp/sysvinit 
dist/init/linux-sysvinit: caddy for SysVinit
 2016-08-01 13:34:07 -06:00
Daniel van Dorp
251c38bfb2 dist/init/linux-sysvinit: caddy for SysVinit 
In addition to `linux-upstart` and `linux-systemd`, I think this one
might be very useful too.

The script is based on [this script](https://git.devuan.org/fredg/stuffs/blob/master/caddy/init.d/caddy)
by @fredg, found via [Installation du serveur Caddy sous Devuan · Frédéric Galusik](http://galusik.xyz/installation-caddy-server-devuan/#démon:d7570338f345f168f3c50f22e7f8c47c).
I have modified it into an extended version myself, since I had the need for this.
 2016-08-01 20:51:22 +02:00
Matt Holt
ba1bee2b8f Merge pull request #981 from tw4452852/redir 
redir: loading block arguments before parsing matcher
 2016-08-01 12:36:06 -06:00
Tw
b64894c31e redir: loading block arguments before parsing matcher 
fix issue #977

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-01 14:38:18 +08:00
Wolfgang Johannes Kohnen
d88dd74dec Re-enable HTTP/2 for Go 1.7. 
* Since Go 1.7 HTTP/2 support is enabled only if TLSConfig.NextProtos
   includes the string "h2".
 * see mholt/caddy#975
 2016-07-30 18:18:53 +00:00
Matt Holt
7157bdc79d Merge pull request #970 from ponychicken/reload 
Specify the reload signal in the upstart script
 2016-07-29 15:24:27 -06:00
Leo
72af3f8256 Specify the reload signal in the upstart script 2016-07-29 22:56:25 +02:00
Matthew Holt
c8daaba4be
Update link to SA 1.1.1 (and other minor tweaks) 2016-07-28 11:11:14 -06:00
Matthew Holt
af48bbd234
Scope TLS max_certs to site config instead of global 2016-07-28 11:08:18 -06:00
Matthew Holt
1e1e69b90f Discard byte order mark (fix #962) 2016-07-27 12:48:49 -06:00
Matt Holt
cf1b355d30 Merge pull request #960 from phifty/patch-1 
Change position of locale directive
 2016-07-25 08:53:54 -06:00
Philipp Brüll
1dd413bd69 Change position of locale directive 
First, great job on the 0.9 release! It seems caddy's path lead into a bright future. Thanks also for including the locale plugin.

Trying it, I've figured out, that there might be a problem with the order of the directives. In the typical use case, the result of the locale detection might be used in the `rewrite` and `log` plugin. If I'm not mistaken, it makes sense to put the `locale` directive before those.
 2016-07-24 11:55:25 +02:00
Matt Holt
1bbad72ff1 Merge pull request #956 from xuqingfeng/ratelimit 
Register ratelimit
 2016-07-23 10:39:16 -06:00
xuqingfeng
b2aed643f4 Register ratelimit 2016-07-23 10:50:07 +08:00
Viacheslav Chimishuk
62e8c4b76b Use authentification credentials from proxy's configuration as a default. (#951) 2016-07-22 11:33:50 -06:00
Matthew Holt
6490ff6224
Adjust proxy headers properly (fixes #916) 2016-07-21 18:18:01 -06:00
Matthew Holt
57710e8b0d Revert "Merge pull request #931 from pedronasser/master" 
This reverts commit 9ea0591951, reversing
changes made to 2125ae5f99.
 2016-07-21 13:31:43 -06:00
Matt Holt
4678471fe0 Merge pull request #952 from abiosoft/condition-patch 
minor condition keyword check refactor
 2016-07-21 12:03:33 -06:00
Matt Holt
d746b95906 Merge pull request #950 from tw4452852/proxy_parse 
proxy: fix hyphen issue when parsing target
 2016-07-21 12:01:10 -06:00
Abiola Ibrahim
3c8b2b5954 minor condition keyword check refactor 2016-07-21 15:42:38 +01:00
Matt Holt
cf3ce49104 Merge pull request #949 from gsquire/headers-update 
HTTP Headers
 2016-07-21 00:28:29 -06:00
Tw
ca3d23bc70 proxy: fix hyphen issue when parsing target 
fix issue #948

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-07-21 13:56:35 +08:00
Garrett Squire
e7c842215e Allow multiple values for an HTTP header and 
add a test to ensure this works.
 2016-07-20 22:17:13 -07:00
Tw
beae16f07c Proxy performance (#946) 
* proxy: add benchmark

Signed-off-by: Tw <tw19881113@gmail.com>

* replacer: prepare lazily

update issue#939

benchmark            old ns/op     new ns/op     delta
BenchmarkProxy-4     83865         72544         -13.50%

Signed-off-by: Tw <tw19881113@gmail.com>

* proxy: use buffer pool to avoid temporary allocation

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-07-20 19:06:14 -06:00
Matthew Holt
1240690973
Avoid deadlock (fixes #941) 2016-07-19 12:05:40 -06:00
Matthew Holt
b35d19d78e Set protocol version properly (fixes #943) 2016-07-19 11:48:44 -06:00
Matt Holt
cf4e0c9c9c Merge pull request #940 from mmlkrx/update-readme-contributing-section 
Update readme contributing section
 2016-07-19 07:50:31 -06:00
Matthias Loker
ac97cf426f Update readme contributing section 2016-07-19 15:41:54 +02:00
Matthew Holt
f28af63732
Version 0.9 2016-07-18 21:50:45 -06:00
Matthew Holt
38c2463416
Fix ACME asset migration when renaming folders 2016-07-18 21:50:27 -06:00
Matthew Holt
df018ea64a
Properly handle path-only addresses (also fix godoc typos) 2016-07-18 18:45:20 -06:00
Matthew Holt
4ff46ad447
Refactor Server into TCPServer and UDPServer 2016-07-18 16:28:26 -06:00
Matthew Holt
59c6513b31
Clarify some godoc 2016-07-18 16:21:19 -06:00
Matthew Holt
aede4ccbce Small changes; mostly comments 2016-07-18 14:32:28 -06:00
Miek Gieben
9315738dab Allow for UDP servers (#935) 
* Allow for UDP servers

Extend the Server interface with ServePacket and ListenPacket - this is
in the same vein as the net package.

Plumb the packetconn through the start and restart phases.

Rename RestartPair to RestartTriple as it now also contains a Packet.
Not that these can now be nil, so we need to check for that when
restarting.

* Update the documentation
 2016-07-18 14:24:09 -06:00
Matthew Holt
502a8979a8 Propagate DNS provider plugins to caddy package so -plugins shows them 2016-07-15 21:29:06 -06:00
Pedro Nasser
d6110f8e9e Merge pull request #932 from pedronasser/fix-import 
fix: import should always be relative to current file directory
 2016-07-14 23:30:28 -03:00
Pedro Nasser
d7698ecf13 fix: import should always be relative to current file directory 2016-07-14 21:48:56 -03:00
Pedro Nasser
9ea0591951 Merge pull request #931 from pedronasser/master 
fix transparent host header #916
 2016-07-14 21:46:24 -03:00
Pedro Nasser
ffafb2eca8 Merge branch 'master' of github.com:pedronasser/caddy 2016-07-14 18:17:05 -03:00
Pedro Nasser
6bb1e0c674 improve transparent mode 2016-07-14 18:16:58 -03:00
Pedro Nasser
6f37e9d31b Merge branch 'master' into master 2016-07-14 15:48:46 -03:00
Pedro Nasser
b58872925a fixed transparent host and added test case 2016-07-14 15:43:06 -03:00
Pedro Nasser
8d7136fc06 fix transparent host header #916 2016-07-14 15:30:00 -03:00
Pedro Nasser
2125ae5f99 import should get absolute path before glob (#929) 
* import should get absolute path before glob

* fix test: import should get absolute path before glob

* try to fix test on windows

* use complete path as the dispenser filename

* fix caddyfile test
 2016-07-13 10:58:42 -06:00
Matthew Holt
3fd3feeffe
Add Ext action to template context (closes #844) 2016-07-11 08:37:19 -06:00
Matthew Holt
62622eb853 proxy: 'transparent' also sets X-Forwarded-For (closes #924) 2016-07-09 17:33:40 -06:00
Abiola Ibrahim
87c389f73d Proposal: Middleware Config (#908) 
* Prototype middleware Config

* Refactors

* Minor refactors
 2016-07-08 18:12:52 -06:00