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

1164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benny Ng
b952fd8f8f revert to old Caddyfile on failed in-process restart 2016-04-05 19:57:52 +08:00
Benny Ng
28e0bfbbbe update README to include Docker 
update README to include Docker container zzrot/alpine-caddy
 2016-04-05 17:24:33 +08:00
Sean Kilgarriff
30ce73e8fb updated README to include ZZROT's docker container that runs caddy on Alpine Linux inside of a Docker Container. 2016-04-05 03:11:55 -04:00
elcore
987a5f98c4 Merge pull request #723 from mholt/fix-#721 
Fix for #721
 2016-04-05 04:54:49 +02:00
Eldin Hadzic
859a93d296 Fix for #721 2016-04-04 23:59:40 +00:00
Matt Holt
a14fce0b1e Merge pull request #707 from jupiter/caching-headers 
Add Etag header
 2016-04-03 15:01:33 -06:00
Matt Holt
25b567b301 Merge pull request #715 from mholt/elcore-faster-tests 
https: Faster tests
 2016-04-03 14:33:03 -06:00
Matt Holt
3d066789d3 Merge pull request #713 from 5an1ty/patch-1 
proxy: Allow mixed case Upgrade headers (WebSocket fix)
 2016-04-03 14:30:32 -06:00
Pieter Raubenheimer
93d982a5a4 Improve readability and fully comply with RFC7232 2016-04-03 20:14:10 +01:00
Pieter Raubenheimer
572b9e4d67 Merge branch 'master' into caching-headers 2016-04-03 19:59:25 +01:00
elcore
2a82f7b520 Faster tests 2016-04-03 20:06:21 +02:00
Ruben Callewaert
1a9f700287 Allow mixed case Upgrade headers 
Caddy expects websocket to be completely lowercase.
Some applications send websocket upgrade headers like the following:
`Upgrade: WebSocket`

This change allows all variations of websocket.
 2016-04-03 17:48:53 +02:00
Matt Holt
462128cd80 Merge pull request #706 from elcore/patch-3 
tls: Customize key type with key_type
 2016-04-02 13:40:49 -06:00
elcore
cf69d190a2 A new feature for the "tls" directive 2016-04-02 21:15:18 +02:00
Pieter Raubenheimer
3441cdef64 Add Etag header 2016-04-02 08:51:08 +01:00
Matt Holt
8a2f2f8d37 Merge pull request #705 from DenBeke/upstart-conf 
dist/init: caddy.conf for upstart
 2016-03-31 08:25:48 -06:00
MathiasB
86854dca89 dist/init: caddy.conf for upstart 2016-03-31 14:36:44 +02:00
Matt Holt
b3a5b725db Merge pull request #696 from mholt/templateUtils 
templates: Adding some useful utility functions
 2016-03-28 21:17:11 -06:00
Craig Peterson
f28d8b8601 Adding some useful utility functions for templates 2016-03-28 20:53:51 -06:00
Matt Holt
5989eb0635 Merge pull request #699 from eiszfuchs/socket-url 
proxy: fix req.URL.Path for unix sockets
 2016-03-28 14:31:53 -06:00
eiszfuchs
cbd9b814b9 fixed req.URL.Path for unix: sockets 2016-03-28 22:18:14 +02:00
Matthew Holt
32dbbfd64c Better way of checking gofmt 2016-03-28 10:52:48 -06:00
Matt Holt
3395f6c775 Merge pull request #698 from buddhamagnet/master 
Correct unused assignments
 2016-03-26 17:28:46 -06:00
buddhamagnet
61cf8b79bc drop unused md variable 2016-03-26 21:14:54 +00:00
buddhamagnet
bb6764fd22 drop unused len variable 2016-03-26 21:14:22 +00:00
buddhamagnet
c981b08b23 correct unused assignments 2016-03-26 21:05:19 +00:00
Matthew Holt
7271b57136 Add golint and ineffassign to CI scripts 
golint is not part of the tests since our Markdown dependency defines
an interface that is not lint-compliant (unfortunately).
See https://github.com/russross/blackfriday/issues/240
 2016-03-26 14:26:12 -06:00
Matthew Holt
874bcff564 Fix YAML syntax. Sigh... 2016-03-26 09:23:05 -06:00
Matthew Holt
eb279e7e8a Perform gofmt -s check 2016-03-26 08:53:00 -06:00
Matt Holt
f4c729bd22 Merge pull request #691 from MariadeAnton/MdA-travis-test 
Only bypass "bandwidth limit exceeded" errors on pushes
 2016-03-22 09:27:20 -06:00
María de Antón
ea35893be4 run bash dist/gitcookie.sh step only on build pushes 2016-03-22 16:15:17 +01:00
María de Antón
1efd1029dd Only bypass "bandwidth limit exceeded" errors on pushes 2016-03-22 16:08:29 +01:00
Matthew Holt
426d165254 expvar: Allow no args; publish number of goroutines 2016-03-21 22:39:57 -06:00
Matt Holt
a3127bed5f Merge pull request #285 from mem/master 
Add expvar middleware
 2016-03-21 21:54:18 -06:00
Marcelo E. Magallon
b94e513116 Add expvar middleware 
Right now it has a very simple configuration:

	expvar /debug/vars

It will return a JSON object with memory statistics and the command line
used to start caddy, which are the two expvars that expvar registers by
default.
 2016-03-21 21:46:41 -06:00
Matthew Holt
b6e5a599fb Update change log 2016-03-21 12:36:27 -06:00
Matt Holt
8fc35edc3b Merge pull request #689 from tpng/restart-inproc 
Add -restart=inproc option for in-process restart
 2016-03-21 12:32:59 -06:00
Benny Ng
260c023e1e Add -restart=inproc flag for in process restart 2016-03-22 02:25:32 +08:00
Matthew Holt
27f9b58c5d Bypass "bandwidth limit exceeded" errors when cloning from googlesource 
cf. golang/go#12933
 2016-03-21 12:05:16 -06:00
Matthew Holt
f23d8cb37f Add {upstream} placeholder when proxy middleware is used (closes #531) 
Middlewares can now make their own placeholders that may be useful in
logging, on a per-request basis. Proxy is the first one to do this.
 2016-03-20 21:56:13 -06:00
Matthew Holt
3f49b32086 Revert undesired changes to shell scripts 2016-03-20 14:13:50 -06:00
Matt Holt
0aacaea918 Merge pull request #686 from wmark/for-mholt 
Reflow all bash scripts
 2016-03-20 14:04:44 -06:00
Matt Holt
9e0b1b4216 Merge pull request #687 from abiosoft/fastcgi-except 
fastcgi: Add `except` to FastCGI. Minor refactor in proxy.
 2016-03-20 13:42:14 -06:00
Abiola Ibrahim
e7001e6538 Add except to FastCGI. Minor refactor in proxy. 2016-03-20 08:02:17 +01:00
Matthew Holt
4d9741dda6 pprof: Only handle if path matches /debug/pprof, add tests 2016-03-19 20:02:05 -06:00
W-Mark Kubacki
74a5cb2fe3 Convert the barbarism in dist/automate.sh to proper BASH structure 
When thy variables henceforth accept blessed white-space,
    guided will thy scripture be along righteous path(s).

    -- 4 BASH 3:42

Caddy's dist files sometimes ended up being owned by matt:staff or other
quite arcane and/or frightening names. If someone extracting didn't pay
attention a regular user who happened to have same uid by accident could
later tamper with the files' contents. It's 0:0 from now on.

Use all available threads when packaging distributables
Caddy binaries will be added to their archives in-place: This change
eliminates them being renamed within dist/builds one after another.
As does 'gox', dist/automate.sh will spare one available thread if possible.
 2016-03-20 01:33:58 +01:00
W-Mark Kubacki
ba2e9d80fd Use best practices in build.bash 
Format of main.buildDate has been locale-dependent,
and is now ISO-8601 compliant.

Caddy displayed with ```-version``` something like (mind the datetime format):

    Caddy 0.8.2 (+591b209 Fri Mar 18 21:22:55 UTC 2016)
     2 files changed, 9 insertions(+), 4 deletions(-)
    build.bash
    main.go

which is now:

    Caddy 0.8.2 (+591b209 2016-03-18 21:22:55Z)
     2 files changed, 9 insertions(+), 4 deletions(-)
    build.bash,main.go

See also:

 * http://wiki.bash-hackers.org/scripting/obsolete
 * https://google.github.io/styleguide/shell.xml
 * https://xkcd.com/1179/
 2016-03-19 17:04:53 +01:00
Abiola Ibrahim
a05a664d56 Merge pull request #679 from abiosoft/case-insensitive-fs 
Support for case insensitive paths using CASE_SENSITIVE_PATH env var.
 2016-03-19 08:53:18 +01:00
Abiola Ibrahim
9f9fbf2e1b Support for case insensitive paths using CASE_SENSITIVE_PATH environment variable. 2016-03-19 08:45:23 +01:00
Matt Holt
63e4352db7 Merge pull request #612 from captncraig/pprof 
pprof: Adding pprof middleware for profiling caddy.
 2016-03-18 15:45:57 -06:00