Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-03 23:09:57 -05:00
Code Issues Activity

Small changes; mostly comments

Browse source
This commit is contained in:
Matthew Holt 2016-07-18 14:32:12 -06:00
parent 9315738dab
commit aede4ccbce
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CONTRIBUTING.md
View file

@ -92,6 +92,11 @@ we see fit; this is not an insult, just a basic security precaution in case
the account becomes inactive or abandoned. Privileges can always be restored the account becomes inactive or abandoned. Privileges can always be restored
later. later.
**Reviewing pull requests:** Please help submit and review pull requests as
you are able! We would ask that every pull request be reviewed by at least
one collaborator who did not open the pull request before merging. This will
help ensure high code quality as new collaborators are added to the project.
### Vulnerabilities ### Vulnerabilities

2
README.md
View file

@ -82,7 +82,7 @@ Wow! Caddy can do a lot with just a few lines.
To host multiple sites and do more with the Caddyfile, please see the To host multiple sites and do more with the Caddyfile, please see the
[Caddyfile documentation](https://caddyserver.com/docs/caddyfile). [Caddyfile documentation](https://caddyserver.com/docs/caddyfile).
Note that production sites (not localhost) are served over Note that production sites are served over
[HTTPS by default](https://caddyserver.com/docs/automatic-https). [HTTPS by default](https://caddyserver.com/docs/automatic-https).
Caddy has a command line interface. Run `caddy -h` to view basic help or see Caddy has a command line interface. Run `caddy -h` to view basic help or see

4
caddyhttp/proxy/upstream.go
View file

@ -274,9 +274,9 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
return err return err
} }
u.HealthCheck.Timeout = dur u.HealthCheck.Timeout = dur
case "header_upstream": case "proxy_header": // TODO: deprecate this shortly after 0.9
fallthrough fallthrough
case "proxy_header": case "header_upstream":
var header, value string var header, value string
if !c.Args(&header, &value) { if !c.Args(&header, &value) {
return c.ArgErr() return c.ArgErr()

2
caddytls/maintain.go
View file

@ -106,7 +106,7 @@ func RenewManagedCertificates(allowPrompts bool) (err error) {
// that we used to do this any time a renewal failed at startup. However, // that we used to do this any time a renewal failed at startup. However,
// after discussion in https://github.com/mholt/caddy/issues/642 we decided to // after discussion in https://github.com/mholt/caddy/issues/642 we decided to
// only stop startup if the certificate is expired. We still log the error // only stop startup if the certificate is expired. We still log the error
// otherwise. // otherwise. I'm not sure how permanent the change in #642 will be...
certCacheMu.RUnlock() certCacheMu.RUnlock()
return err return err
} }