From 1ce10b453fbfd01aae7887c4ff8e5730f7908f50 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Tue, 10 Sep 2019 13:11:27 -0600
Subject: Require Go 1.13; use Go 1.13's default support for TLS 1.3

---
 modules/caddytls/tls.go | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'modules/caddytls')

diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 88b7790..62ec98d 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -18,9 +18,7 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/caddyserver/caddy/v2"
@@ -31,12 +29,6 @@ import (
 
 func init() {
 	caddy.RegisterModule(TLS{})
-
-	// opt-in TLS 1.3 for Go1.12
-	// TODO: remove this line when Go1.13 is released.
-	if err := os.Setenv("GODEBUG", os.Getenv("GODEBUG")+",tls13=1"); err != nil {
-		log.Println("[ERROR] failed to set environment variable: ", err)
-	}
 }
 
 // TLS represents a process-wide TLS configuration.
-- 
cgit v1.2.3