github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-01 21:24:23 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,838 Commits 32 Branches 138 Tags 33 MiB
4c034f6ad1
Commit Graph

1838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenz Bischof
fea0d5ac3a Fix syntax in caddy.conf 2016-12-04 12:52:34 +01:00
ericdreeves
9f16ac84a0 Return HTTP 504 when FastCGI connect times out. 2016-12-03 16:31:29 -06:00
ericdreeves
5874fbeb7e Add send_timeout property to fastcgi directive. 
* Convert rwc field on FCGIClient from type io.ReadWriteCloser to net.Conn.
* Return HTTP 504 to the client when a timeout occurs.
* In Handler.ServeHTTP(), close the connection before returning an HTTP
502/504.
* Refactor tests and add coverage.
 2016-12-03 16:15:41 -06:00
Mateusz Gajewski
17e7e6076a Fix for #1276 - support integers and floats as metadata in markdown (#1278) 
* Fix for #1276

* Use strconv.Format

* Use map[string]interface{} as variables

* One more file

* Always run all tests before commit

* Get rid of DocFlags
 2016-12-02 23:35:33 -07:00
Mateusz Gajewski
9e98d6cd52 Fix for #1164 - allow only one header per line (#1280) 
* Fix for #1164 - allow only one header per line

* Include original reporter case
 2016-11-29 21:24:12 -07:00
ericdreeves
76f12f475b Merge pull request #1274 from mholt/fastcgi-timeout-defaults 
Fix read timeout and add default timeout values.
 2016-11-29 19:13:12 -06:00
Mateusz Gajewski
32fa0ce6a0 Merge branch 'master' into fastcgi-timeout-defaults 2016-11-29 19:06:43 +01:00
Matthew Holt
80eb45fcfb
tls: Improve flaky test depending on CPU scheduling (I think) 2016-11-28 23:37:22 -07:00
Matthew Holt
36f8759a7b
Ensure some tests remove temporary directories they created 2016-11-28 22:26:54 -07:00
Matt Holt
e2917784d0 Merge pull request #1275 from mholt/fup-1273 
Increase code coverage (caddy.go)
 2016-11-27 05:35:54 -07:00
Eldin Hadzic
fec840a861 Increase code coverage 2016-11-27 08:55:17 +00:00
elcore
d0bf3e1647 Fix network listener address comparison, fixes #1258 (#1273) 
* Fix issue #1258

* address comments

* add a test

* address comments 2
 2016-11-26 23:44:15 -07:00
ericdreeves
b8722d9af3 Fix read timeout and add default timeout values. 
By setting the read deadline in streamReader.Read(), the deadline was
extended by the read timeout on each subsequent call. To avoid this, the
deadline is set in FCGIClient.Request(), before the first read occurs.

See #1094.
 2016-11-25 10:30:51 -06:00
Geno
7dc23b18ae Init switch from HOME to Caddy (#1272) 
* INIT-systemd use CADDYPATH instatt of HOME

* INIT-upstart use CADDYPATH instatt of HOME

* INIT-upstart use CADDYPATH instatt of HOME

* INIT-upstart use CADDYPATH instatt of HOME
 2016-11-23 14:12:19 -07:00
Matthew Holt
9d398adf5d
dist: Give more slack to numProcs test (was failing on Travis CI) 2016-11-20 21:50:46 -07:00
Matthew Holt
22a266a259 templates: Add arguments to .Include 2016-11-20 21:40:06 -07:00
ericdreeves
5a6b765673 Add connect_timeout and read_timeout to fastcgi. (#1257) 2016-11-19 09:05:29 -07:00
Matt Holt
8acf043297 Merge pull request #1268 from mholt/fix-files-test 
Sort the resulting slice before the comparison.
 2016-11-19 08:47:53 -07:00
ericdreeves
98c17bcdf2 Sort the resulting slice before the comparison. 2016-11-19 08:37:36 -06:00
Matt Holt
8c392a02c8 Merge pull request #1267 from DenBeke/launchd 
launchd service file for Mac
 2016-11-18 15:00:09 -07:00
MathiasB
30337ac33f launchd service file for Mac 2016-11-18 17:58:40 +01:00
Gyula Voros
b783caaaed Filter empty headers (#1239) 
* Filter empty headers

Some web servers (e.g. Jetty 9.3) don’t like HTTP headers with empty values. This commit filters header replacements with zero length.

* Extend tests to verify removal of empty headers

* Handle add-header case

* Change - Use short variable assignment
 2016-11-16 21:41:53 -07:00
Mateusz Gajewski
c972ea39c8 Fastcgi upstreams (#1264) 
* Make fastcgi load balanceable too

* Address one more corner case - invalid configuration fastcgi /

* After review fixes

* Simplify conditions

* Error message

* New fastcgi syntax

* golint will be happy

* Change syntax
 2016-11-16 21:29:43 -07:00
Tw
12fd349916 Merge pull request #1232 from mholt/fix-1229 
proxy: record request Body for retry (fixes #1229)
 2016-11-08 19:24:38 +08:00
Benny Ng
dd4c4d7eb6 proxy: record request Body for retry (fixes #1229) 2016-11-04 19:15:36 +08:00
Ngo The Trung
0cdaaba4b8 Add maxrequestbody directive (#1163) 2016-11-04 08:25:49 +08:00
Mateusz Gajewski
63f749112b Use http.Header instead of custom type (#1214) 
* Use http.Header

* This initialization was just stupid
 2016-11-03 12:24:26 -06:00
Matt Holt
e19a007b38 Merge pull request #1238 from tw4452852/1234 
proxy: make sure value is optional when removing a header
 2016-11-03 12:13:39 -06:00
Tw
e85ba0d4db proxy: make value is optional when removing a header 
fix issue #1234

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-11-03 22:50:51 +00:00
Matthew Holt
b89cbe18e2 Move header up above errors in directive order (fix #1183) 2016-11-02 08:13:58 -06:00
Matthew Holt
14500d8204 header: Implement Flusher and CloseNotifier 2016-11-02 08:13:58 -06:00
Tw
a2900e46f4 header: only register deletion operation (#1212) 
fix issue #1183

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-11-01 22:08:02 -06:00
ericdreeves
08c17c7c31 Add Files action to template context. (closes #1198) (#1226) 
* Add Files action to template context. (#1198)

* Fixes to testFiles().

- Set os.ModePerm on directories created during test.
- Use filepath.Join() to create directory path.
- Use Fatalf, not Fatal.

* Make additional fixes to test cases.

* Fix test cases to use correct path format.

Dir.Open() in net/http requires '/'-separated paths while
filepath.Join() may produce paths with different separator.

* Remove directory created by test at end of loop.

* Close the FileSystem before returning.

* Initialize names slice to the number of entries.

Also, do not call os.RemoveAll() unless the path to the directory
is a valid one.
 2016-11-01 22:04:53 -06:00
Matthew Holt
49cb225cbd Ensure user always sees fatal errors at startup 2016-10-31 21:45:12 -06:00
elcore
53e117802f Add support for OCSP Must-Staple for Let's Encrypt certs (#1221) 
* Fix Caddytls

* Let the user decide

* Address comments
 2016-10-29 08:44:49 -06:00
Matthew Holt
23f89f30e9 Add sourcegraph link to readme 2016-10-27 19:27:39 -06:00
Matt Holt
ff32ade1d8 Merge pull request #1216 from chris-bandce/patch-1 
Punctuation
 2016-10-26 11:23:00 -06:00
chris-bandce
3ce9075d3d Punctuation 2016-10-26 16:27:35 +01:00
Matt Holt
f2e999aab2 Merge pull request #1213 from mholt/simplify_code 
Remove dead code, do struct alignment, simplify code
 2016-10-26 00:05:08 -06:00
Mateusz Gajewski
8cc3416bbc
Remove dead code, do struct alignment, simplify code 2016-10-25 19:19:54 +02:00
Toby Allen
c4d64a418b Log site info output at start. Fix for #1205 (#1210) 
* Log Site start to -log. Fix for #1205

* Removed Comment
 2016-10-25 09:31:21 -06:00
Matt Holt
f3108bb7bf Merge pull request #1207 from tw4452852/1206 
proxy: set request's body to nil explicitly
 2016-10-25 09:30:10 -06:00
Mateusz Gajewski
c2853ea64b Use proper Request (#1197) 
* Use proper Request

* Fixes
 2016-10-25 09:28:53 -06:00
Matt Holt
561069fdb6 Merge pull request #1211 from mholt/LogStartupCmd 
Log Startup and Shutdown Commands
 2016-10-24 14:26:54 -06:00
Toby Allen
66a07773ab Log Startup and Shutdown Commands 2016-10-24 20:48:36 +01:00
Tw
a1dd6f0b34 proxy: set request's body to nil explicitly 
fix issue #1206

Signed-off-by: Tw <tw19881113@gmail.com>
 2016-10-24 11:10:12 +08:00
Henrique Dias
2b9bbc5236 Moving File Manager higher in the directive list (#1199) 
* Moving File Manager higher in the directive list

See hacdias/caddy-filemanager#35.

* gofmt
 2016-10-20 14:52:43 -06:00
Matt Holt
2f5e840ea9 Merge pull request #1193 from mholt/Go-1.7.3 
Update to Go 1.7.3
 2016-10-19 18:00:00 -06:00
Eldin Hadzic
ab3cc8f961 Update to Go 1.7.3 2016-10-19 21:26:04 +00:00
Matt Holt
efb1c54e13 Merge pull request #1189 from rndmh3ro/more_upstart_scripts 
add separate upstart scripts for centos 6 and ubuntu 12.04
 2016-10-19 08:13:44 -06:00