Merge branch '315-gzip-content-length' into 'master'

Set Content-Length when Content-Encoding is set

Closes #315

See merge request gitlab-org/gitlab-pages!227

1 files changed, 6 insertions, 1 deletions

diff --git a/internal/serving/disk/helpers.go b/internal/serving/disk/helpers.go
index 01f59767..271b63cc 100644
--- a/internal/serving/disk/helpers.go
+++ b/internal/serving/disk/helpers.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 
 	"golang.org/x/sys/unix"
@@ -68,11 +69,15 @@ func handleGZip(w http.ResponseWriter, r *http.Request, fullPath string) string
 	gzipPath := fullPath + ".gz"
 
 	// Ensure the .gz file is not a symlink
-	if fi, err := os.Lstat(gzipPath); err != nil || !fi.Mode().IsRegular() {
+	fi, err := os.Lstat(gzipPath)
+	if err != nil || !fi.Mode().IsRegular() {
 		return fullPath
 	}
 
 	w.Header().Set("Content-Encoding", "gzip")
 
+	// http.ServeContent doesn't set Content-Length if Content-Encoding is set
+	w.Header().Set("Content-Length", strconv.FormatInt(fi.Size(), 10))
+
 	return gzipPath
 }