Commit 14a6e4b4 authored by Matthew Holt's avatar Matthew Holt

More minor text fixes

parent 72e4ba8b
(Are you asking for help with using Caddy? Please use our forum instead: https://forum.caddyserver.com. If you are filing a bug report, please answer the following questions. If your issue is not a bug report, you do not need to use this template. Either way, please consider donating if we've helped you. Thanks!) (Are you asking for help with using Caddy? Please use our forum instead: https://forum.caddyserver.com. If you are filing a bug report, please answer the following questions. If your issue is not a bug report, you do not need to use this template. Either way, please consider donating if we've helped you. Thanks!)
#### 1. What version of Caddy are you running (`caddy -version`)? ### 1. What version of Caddy are you running (`caddy -version`)?
#### 2. What are you trying to do? ### 2. What are you trying to do?
#### 3. What is your entire Caddyfile? ### 3. What is your entire Caddyfile?
```text ```text
(Put Caddyfile here) (Put Caddyfile here)
``` ```
#### 4. How did you run Caddy (give the full command and describe the execution environment)? ### 4. How did you run Caddy (give the full command and describe the execution environment)?
#### 5. What did you expect to see? ### 5. What did you expect to see?
#### 6. What did you see instead (give full error messages and/or log)? ### 6. What did you see instead (give full error messages and/or log)?
#### 7. How can someone who is starting from scratch reproduce this behavior as minimally as possible? ### 7. How can someone who is starting from scratch reproduce this behavior as minimally as possible?
...@@ -92,7 +92,8 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) { ...@@ -92,7 +92,8 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Since Go 1.7 HTTP/2 is enabled only if TLSConfig.NextProtos includes the string "h2".
// As of Go 1.7, HTTP/2 is enabled only if NextProtos includes the string "h2"
if HTTP2 && s.Server.TLSConfig != nil && len(s.Server.TLSConfig.NextProtos) == 0 { if HTTP2 && s.Server.TLSConfig != nil && len(s.Server.TLSConfig.NextProtos) == 0 {
s.Server.TLSConfig.NextProtos = []string{"h2"} s.Server.TLSConfig.NextProtos = []string{"h2"}
} }
......
...@@ -129,6 +129,7 @@ func RenewManagedCertificates(allowPrompts bool) (err error) { ...@@ -129,6 +129,7 @@ func RenewManagedCertificates(allowPrompts bool) (err error) {
// Apply changes to the cache // Apply changes to the cache
for _, cert := range renewed { for _, cert := range renewed {
// TODO: Don't do these until we have valid OCSP for the new cert
if cert.Names[len(cert.Names)-1] == "" { if cert.Names[len(cert.Names)-1] == "" {
// Special case: This is the default certificate. We must // Special case: This is the default certificate. We must
// flush it out of the cache so that we no longer point to // flush it out of the cache so that we no longer point to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment