doit05
diff --git a/‎src/http/controller/download.go
Lines changed: 16 additions & 3 deletions b/‎src/http/controller/download.go
Lines changed: 16 additions & 3 deletions
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/labstack/echo"
 	"github.com/polaris1119/config"
@@ -38,28 +39,40 @@ func (DownloadController) GoDl(ctx echo.Context) error {
 
 var filenameReg = regexp.MustCompile(`\d+\.\d[a-z\.]*\d+`)
 
-func (DownloadController) FetchGoInstallPackage(ctx echo.Context) error {
+func (self DownloadController) FetchGoInstallPackage(ctx echo.Context) error {
 	filename := ctx.Param("filename")
 
 	officalUrl := GoStoragePrefix + filename
-	resp, err := http.Head(officalUrl)
+	resp, err := self.headWithTimeout(officalUrl)
 	if err == nil && resp.StatusCode == http.StatusOK {
+		resp.Body.Close()
 		return ctx.Redirect(http.StatusSeeOther, officalUrl)
 	}
+	resp.Body.Close()
 
 	goVersion := filenameReg.FindString(filename)
 	filePath := fmt.Sprintf("go/%s/%s", goVersion, filename)
 
 	dlUrls := strings.Split(config.ConfigFile.MustValue("download", "dl_urls"), ",")
 	for _, dlUrl := range dlUrls {
 		dlUrl += filePath
-		resp, err = http.Head(dlUrl)
+		resp, err = self.headWithTimeout(dlUrl)
 		if err == nil && resp.StatusCode == http.StatusOK {
+			resp.Body.Close()
 			return ctx.Redirect(http.StatusSeeOther, dlUrl)
 		}
+		resp.Body.Close()
 	}
 
 	getLogger(ctx).Infoln("download:", filename, "from the site static directory")
 
 	return ctx.Redirect(http.StatusSeeOther, "/static/"+filePath)
 }
+
+func (DownloadController) headWithTimeout(dlUrl string) (*http.Response, error) {
+	client := http.Client{
+		Timeout: 2 * time.Second,
+	}
+
+	return client.Head(dlUrl)
+}