Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
caddy
Commits
aede4ccb
Commit
aede4ccb
authored
Jul 18, 2016
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small changes; mostly comments
parent
9315738d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
CONTRIBUTING.md
CONTRIBUTING.md
+5
-0
README.md
README.md
+1
-1
caddyhttp/proxy/upstream.go
caddyhttp/proxy/upstream.go
+2
-2
caddytls/maintain.go
caddytls/maintain.go
+1
-1
No files found.
CONTRIBUTING.md
View file @
aede4ccb
...
@@ -92,6 +92,11 @@ we see fit; this is not an insult, just a basic security precaution in case
...
@@ -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
...
...
README.md
View file @
aede4ccb
...
@@ -82,7 +82,7 @@ Wow! Caddy can do a lot with just a few lines.
...
@@ -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
...
...
caddyhttp/proxy/upstream.go
View file @
aede4ccb
...
@@ -274,9 +274,9 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
...
@@ -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
()
...
...
caddytls/maintain.go
View file @
aede4ccb
...
@@ -106,7 +106,7 @@ func RenewManagedCertificates(allowPrompts bool) (err error) {
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment