change revision timeout to be max duration of a request

knative · May 9, 2024 · e304adc · e304adc
1 parent cede1ec
commit e304adc
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/pkg/http/handler/timeout.go b/pkg/http/handler/timeout.go
@@ -126,8 +126,9 @@ func (h *timeoutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			}
 			return
 		case <-timeout.C():
-			timeoutDrained = true
-			if tw.tryTimeoutAndWriteError(h.body) {
+			timedOut := tw.tryTimeoutAndWriteError(h.body)
+			if timedOut {
+				timeoutDrained = true
 				return
 			}
 		case now := <-idleTimeoutCh:
@@ -224,12 +225,8 @@ func (tw *timeoutWriter) tryTimeoutAndWriteError(msg string) bool {
 	tw.mu.Lock()
 	defer tw.mu.Unlock()
 
-	if tw.lastWriteTime.IsZero() {
-		tw.timeoutAndWriteError(msg)
-		return true
-	}
-
-	return false
+	tw.timeoutAndWriteError(msg)
+	return true
 }
 
 // tryResponseStartTimeoutAndWriteError writes an error to the responsewriter if