github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-03 02:23:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,436 Commits 33 Branches 145 Tags
ee615371a87b068cdf75792bcc669647fd2d9edd
Commit Graph

1436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
ee615371a8 Export staticfiles.Redirect for convenience in preserving query string 2016-08-06 14:40:58 -06:00
Nimi Wariboko Jr
4c6082df64 Merge pull request #987 from nemothekid/proxy/single-webconn 
Proxy: Single WebSocket connection
 2016-08-05 16:59:38 -07:00
Nimi Wariboko Jr
8898066455 Merge branch 'master' into proxy/single-webconn 2016-08-05 16:57:54 -07:00
Nimi Wariboko Jr
fffc1bed73 Merge pull request #984 from nemothekid/proxy/keepalive-directive 
Proxy: Add keepalive directive to proxy to set MaxIdleConnsPerHost on transport
 2016-08-05 16:57:44 -07:00
Nimi Wariboko Jr
824ec6cb95 Merge branch 'master' into proxy/keepalive-directive 2016-08-05 16:20:37 -07:00
Nimi Wariboko Jr
5b5e365295 Instead of treating 0 is a default value, use http.DefaultMaxIdleConnsPerHost 2016-08-05 15:41:32 -07:00
Matt Holt
c6c221b8db Merge pull request #996 from tw4452852/host_header 
proxy: add Host header checking
 2016-08-05 16:20:06 -06:00
Daniel van Dorp
985049e0c2 Merge pull request #1003 from mholt/sysvinit-fix-setcap 
dist/init/linux-sysvinit: execute setcap directly
 2016-08-05 16:49:24 +02:00
Daniel van Dorp
3a4f8e8d0c dist/init/linux-sysvinit: execute setcap directly 
`$(which setcap)` might evaluate to nothing,
and this way the error thrown will be more clear.
If setcap is not available on Debian/Ubuntu,
you can install the package `libcap2-bin`
 2016-08-05 16:33:47 +02:00
Daniel van Dorp
f3a3bf6204 dist/init/linux-sysvinit: improve legacy compatibility (#1002) 
* dist/init/linux-sysvinit: pass --oknodo for --start as well

* dist/init/linux-sysvinit: manually rm PIDFILE

Since start-stop-daemon --remove-pidfile is new and not present
everywhere.
 2016-08-05 08:15:32 -06:00
Daniel van Dorp
81a3101efe Merge pull request #1001 from mholt/sysvinit-typo 
dist/init/linux-sysvinit: fix minor typo in DAEMONOPTS
 2016-08-05 14:13:33 +02:00
Daniel van Dorp
22a4b6cde2 dist/init/linux-sysvinit: fix minor typo in DAEMONOPTS 2016-08-05 14:04:30 +02:00
Tw
94c63e42d6 proxy: add Host header checking 
fix issue #993

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-04 13:07:20 +08:00
s7v7nislands
c110b27ef5 improve rlimit usage (#982) 
* improve rlimit usage

* fix windows build

* fix code style
 2016-08-02 21:01:36 -06:00
Nimi Wariboko Jr
6e9439d22e Proxy: Fix data race in test. 2016-08-02 12:39:15 -07:00
Nimi Wariboko Jr
f4cdf53761 Proxy: Fix transport defn; cleanup connection. 2016-08-02 12:31:17 -07:00
Matt Holt
89f5b646c3 Merge pull request #978 from krishamoud/master 
added ip_hash load balancing
 2016-08-02 11:25:52 -06:00
Matthew Holt
a24e361761 Enable cgo for CI tests so race detector can run 2016-08-02 10:59:16 -06:00
Matthew Holt
5ac04b91bb Add -race to CI tests; use Go 1.6.3 2016-08-02 10:55:38 -06:00
elcore
1b1aecb1e6 Merge pull request #989 from tw4452852/tls_race 
tls: fix TestStandaloneTLSTicketKeyRotation data race
 2016-08-02 14:03:14 +02:00
Tw
3d43c5b697 tls: fix TestStandaloneTLSTicketKeyRotation data race 
==================
WARNING: DATA RACE
Write at 0x00c42049d300 by goroutine 26:
  github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:230 +0x698

Previous read at 0x00c42049d300 by goroutine 25:
  github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:113 +0x413
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9

Goroutine 26 (running) created at:
  github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9

Goroutine 25 (running) created at:
  testing.(*T).Run()
      /home/tw/goroot/src/testing/testing.go:646 +0x52f
  testing.RunTests.func1()
      /home/tw/goroot/src/testing/testing.go:793 +0xb9
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9
  testing.RunTests()
      /home/tw/goroot/src/testing/testing.go:799 +0x4b5
  testing.(*M).Run()
      /home/tw/goroot/src/testing/testing.go:743 +0x12f
  github.com/mholt/caddy/caddytls.TestMain()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133
  main.main()
      github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1
==================
==================
WARNING: DATA RACE
Write at 0x00c4204aa6c0 by goroutine 26:
  github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation.func2()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:93 +0x56
  github.com/mholt/caddy/caddytls.standaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto.go:233 +0x638

Previous read at 0x00c4204aa6c0 by goroutine 25:
  github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:108 +0x391
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9

Goroutine 26 (running) created at:
  github.com/mholt/caddy/caddytls.TestStandaloneTLSTicketKeyRotation()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/crypto_test.go:101 +0x2a4
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9

Goroutine 25 (running) created at:
  testing.(*T).Run()
      /home/tw/goroot/src/testing/testing.go:646 +0x52f
  testing.RunTests.func1()
      /home/tw/goroot/src/testing/testing.go:793 +0xb9
  testing.tRunner()
      /home/tw/goroot/src/testing/testing.go:610 +0xc9
  testing.RunTests()
      /home/tw/goroot/src/testing/testing.go:799 +0x4b5
  testing.(*M).Run()
      /home/tw/goroot/src/testing/testing.go:743 +0x12f
  github.com/mholt/caddy/caddytls.TestMain()
      /home/tw/golib/src/github.com/mholt/caddy/caddytls/setup_test.go:27 +0x133
  main.main()
      github.com/mholt/caddy/caddytls/_test/_testmain.go:116 +0x1b1
==================

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-08-02 15:28:12 +08:00
Nimi Wariboko Jr
d534a2139f Proxy: When connecting to websocket backend, reuse the connection isntead of starting a new one. 2016-08-01 19:11:31 -07:00
Eric Drechsel
c4e65df262 Proxy: Add a failing test which replicates #763 
2 websocket connections are made instead of one
 2016-08-01 19:09:02 -07:00
Kris Hamoud
88d3dcae42 added ip_hash load balancing 
updated tests

fixed comment format

fixed formatting, minor logic fix

added newline to EOF

updated logic, fixed tests

added comment

updated formatting

updated test output

fixed typo
 2016-08-01 18:50:53 -07:00
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 &middot; 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 9ea059195198c04403bfb4c74e9282eb87467b36, reversing
changes made to 2125ae5f99989949f917eed8a1d961b76a23dbba.
 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