Merge pull request #731 from cryptix/dev

increase minimum version for HTTPS to TLS 1.0 (POODLE, fixes #730)
release/v1.15
无闻 2014-12-11 18:32:49 -05:00
commit 35140f1cc7
1 changed files with 4 additions and 1 deletions

View File

@ -5,6 +5,7 @@
package cmd
import (
"crypto/tls"
"fmt"
"html/template"
"io/ioutil"
@ -453,7 +454,9 @@ func runWeb(*cli.Context) {
case setting.HTTP:
err = http.ListenAndServe(listenAddr, m)
case setting.HTTPS:
err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
cfg := &tls.Config{MinVersion: tls.VersionTLS10}
server := &http.Server{Addr: listenAddr, TLSConfig: cfg, Handler: m}
err = server.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
case setting.FCGI:
err = fcgi.Serve(nil, m)
default: