Extend write deadline beyond the read deadline

1 files changed, 9 insertions, 4 deletions

diff --git a/roseh.moe.go b/roseh.moe.go
index fd48b3c..0aa75be 100644
--- a/roseh.moe.go
+++ b/roseh.moe.go
@@ -1155,7 +1155,9 @@ func (h *timeoutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if err := rc.SetReadDeadline(deadline); err != nil {
 		log.Printf("Error: set read deadline: %s", err)
 	}
-	if err := rc.SetWriteDeadline(deadline); err != nil {
+	// Give some extra time to write the error
+	writeDeadline := deadline.Add(time.Minute)
+	if err := rc.SetWriteDeadline(writeDeadline); err != nil {
 		log.Printf("Error: set write deadline: %s", err)
 	}
 	ctx, cancel := context.WithDeadline(ctx, deadline)
@@ -1241,12 +1243,13 @@ func main() {
 	apiMux.HandleFunc("PUT /api/wormhole/{name}", wormholeAPIUpload)
 	mux.Handle("/api/", apiMux)
 	mux.Handle("/", &timeoutHandler{h: http.HandlerFunc(notFound), timeout: 5 * time.Minute})
-	http.Handle(selfURL.Hostname()+"/", http.NewCrossOriginProtection().Handler(&gzipHandler{mux}))
+	serverMux := http.NewServeMux()
+	serverMux.Handle(selfURL.Hostname()+"/", http.NewCrossOriginProtection().Handler(&gzipHandler{mux}))
 	jellyfinURL, err := url.Parse("http://127.0.0.1:8096")
 	if err != nil {
 		log.Fatal(err)
 	}
-	http.Handle("cinema."+selfURL.Hostname()+"/", &authHandler{h: &httputil.ReverseProxy{
+	serverMux.Handle("cinema."+selfURL.Hostname()+"/", &authHandler{h: &httputil.ReverseProxy{
 		Rewrite: func(r *httputil.ProxyRequest) {
 			r.SetURL(jellyfinURL)
 			r.SetXForwarded()
@@ -1268,8 +1271,10 @@ func main() {
 	}
 	cgitCGI.PathLocationHandler = cgitCGI
 	codeMux.Handle("/", &timeoutHandler{h: cgitCGI, timeout: 5 * time.Minute})
-	http.Handle("code."+selfURL.Hostname()+"/", &gzipHandler{codeMux})
+	serverMux.Handle("code."+selfURL.Hostname()+"/", &gzipHandler{codeMux})
 	server := &http.Server{
+		Handler: serverMux,
+
 		ReadHeaderTimeout: 5 * time.Minute,
 		IdleTimeout:       10 * time.Minute,
 	}