From 32f3bc453f2fb6b3694ef5baf73c482e0aefe29c Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Thu, 23 Aug 2018 22:18:15 +1000
Subject: [PATCH] Revert "Try this to speed up /uploads/, we might have to
 revert it if it breaks the caches."

This reverts commit 5d4ea4d2e0be74108cf9dabc1f24dd285ac5ebde.
---
 gen_router.go      | 35 ++++++++++++++++++++++++++++++++---
 router_gen/main.go | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/gen_router.go b/gen_router.go
index 3dcf9e6b..0f66dde3 100644
--- a/gen_router.go
+++ b/gen_router.go
@@ -539,6 +539,32 @@ func (w gzipResponseWriter) Write(b []byte) (int, error) {
 	return w.Writer.Write(b)
 }
 
+type WriterIntercept struct {
+	w http.ResponseWriter
+	code int
+}
+
+func NewWriterIntercept(w http.ResponseWriter) *WriterIntercept {
+	return &WriterIntercept{w:w,code:200}
+}
+
+func (writ *WriterIntercept) Header() http.Header {
+	return writ.w.Header()
+}
+
+func (writ *WriterIntercept) Write(pieces []byte) (int, error) {
+	return writ.w.Write(pieces)
+}
+
+func (writ *WriterIntercept) WriteHeader(code int) {
+	writ.w.WriteHeader(code)
+	writ.code = code
+}
+
+func (writ *WriterIntercept) GetCode() int {
+	return writ.code
+}
+
 type GenRouter struct {
 	UploadHandler func(http.ResponseWriter, *http.Request)
 	extraRoutes map[string]func(http.ResponseWriter, *http.Request, common.User) common.RouteError
@@ -555,9 +581,12 @@ func NewGenRouter(uploads http.Handler) (*GenRouter, error) {
 
 	return &GenRouter{
 		UploadHandler: func(w http.ResponseWriter, req *http.Request) {
-			w.Header().Set("Cache-Control", "max-age=" + strconv.Itoa(int(common.Day)))
-			w.Header().Set("Vary", "Accept-Encoding")
-			http.StripPrefix("/uploads/",uploads).ServeHTTP(w,req)
+			writ := NewWriterIntercept(w)
+			http.StripPrefix("/uploads/",uploads).ServeHTTP(writ,req)
+			if writ.GetCode() == 200 {
+				w.Header().Set("Cache-Control", "max-age=" + strconv.Itoa(int(common.Day)))
+				w.Header().Set("Vary", "Accept-Encoding")
+			} 
 		},
 		extraRoutes: make(map[string]func(http.ResponseWriter, *http.Request, common.User) common.RouteError),
 		requestLogger: log.New(f, "", log.LstdFlags),
diff --git a/router_gen/main.go b/router_gen/main.go
index 72ebb6b8..25b2da88 100644
--- a/router_gen/main.go
+++ b/router_gen/main.go
@@ -310,6 +310,32 @@ func (w gzipResponseWriter) Write(b []byte) (int, error) {
 	return w.Writer.Write(b)
 }
 
+type WriterIntercept struct {
+	w http.ResponseWriter
+	code int
+}
+
+func NewWriterIntercept(w http.ResponseWriter) *WriterIntercept {
+	return &WriterIntercept{w:w,code:200}
+}
+
+func (writ *WriterIntercept) Header() http.Header {
+	return writ.w.Header()
+}
+
+func (writ *WriterIntercept) Write(pieces []byte) (int, error) {
+	return writ.w.Write(pieces)
+}
+
+func (writ *WriterIntercept) WriteHeader(code int) {
+	writ.w.WriteHeader(code)
+	writ.code = code
+}
+
+func (writ *WriterIntercept) GetCode() int {
+	return writ.code
+}
+
 type GenRouter struct {
 	UploadHandler func(http.ResponseWriter, *http.Request)
 	extraRoutes map[string]func(http.ResponseWriter, *http.Request, common.User) common.RouteError
@@ -326,9 +352,12 @@ func NewGenRouter(uploads http.Handler) (*GenRouter, error) {
 
 	return &GenRouter{
 		UploadHandler: func(w http.ResponseWriter, req *http.Request) {
-			w.Header().Set("Cache-Control", "max-age=" + strconv.Itoa(int(common.Day)))
-			w.Header().Set("Vary", "Accept-Encoding")
-			http.StripPrefix("/uploads/",uploads).ServeHTTP(w,req)
+			writ := NewWriterIntercept(w)
+			http.StripPrefix("/uploads/",uploads).ServeHTTP(writ,req)
+			if writ.GetCode() == 200 {
+				w.Header().Set("Cache-Control", "max-age=" + strconv.Itoa(int(common.Day)))
+				w.Header().Set("Vary", "Accept-Encoding")
+			} 
 		},
 		extraRoutes: make(map[string]func(http.ResponseWriter, *http.Request, common.User) common.RouteError),
 		requestLogger: log.New(f, "", log.LstdFlags),