bumped to v0.2.2

Signed-off-by: Vishal Rana <[email protected]>
labstack · Nov 8, 2016 · 3857de8 · 3857de8
1 parent 84e7810
commit 3857de8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:edge
 MAINTAINER Vishal Rana <[email protected]>
 
-ENV VERSION 0.2.1
+ENV VERSION 0.2.2
 
 # https://letsencrypt.org
 RUN apk add --no-cache ca-certificates

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.2.1
+VERSION = 0.2.2
 
 build:
 	GOOS=linux GOARCH=amd64 go build -o build/armor-$(VERSION)_linux-64 github.com/labstack/armor/cmd/armor

diff --git a/armor.go b/armor.go
@@ -43,5 +43,5 @@ type (
 )
 
 const (
-	Version = "0.2.1"
+	Version = "0.2.2"
 )
diff --git a/http/http.go b/http/http.go
@@ -142,10 +142,13 @@ func (h *HTTP) startTLS(a *armor.Armor, e *echo.Echo) error {
 	}
 
 	s.TLSConfig.GetCertificate = func(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
-		if a.TLS.Auto {
+		if cert, ok := s.TLSConfig.NameToCertificate[clientHello.ServerName]; ok {
+			// Use provided certificate
+			return cert, nil
+		} else if a.TLS.Auto {
 			return h.tlsManager.GetCertificate(clientHello)
 		}
-		return nil, nil // Certificate will be looked in `NameToCertificate`
+		return nil, nil // No certificate
 	}
 
 	return e.StartServer(s)

diff --git a/website/content/guide/getting-started.md b/website/content/guide/getting-started.md
@@ -41,7 +41,7 @@ Type `armor` in your terminal
 |   _   ||   |  | || ||_|| ||       ||   |  | |
 |__| |__||___|  |_||_|   |_||_______||___|  |_|
 
-https://armor.labstack.com               v0.2.1
+https://armor.labstack.com               v0.2.2
 
 Uncomplicated HTTP server, supports HTTP/2 and
 auto TLS
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,5 @@ type ( @@
     )
     const (
-    	Version = "0.2.1"
+    	Version = "0.2.2"
     )