From 2c4371b6a974e8be365fbd1a3e6a02a23b8b96ff Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Thu, 13 Jul 2023 01:30:33 +0800 Subject: [PATCH] http3: add Date response header if not set (#3952) * automatically add date header if not already set * improve comment for Date header --------- Co-authored-by: Marten Seemann --- http3/response_writer.go | 6 ++++++ http3/response_writer_test.go | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/http3/response_writer.go b/http3/response_writer.go index b7c79d50..26e45a09 100644 --- a/http3/response_writer.go +++ b/http3/response_writer.go @@ -55,6 +55,12 @@ func (w *responseWriter) WriteHeader(status int) { if status < 100 || status >= 200 { w.headerWritten = true + // Add Date header. + // This is what the standard library does. + // Can be disabled by setting the Date header to nil. + if _, ok := w.header["Date"]; !ok { + w.header.Set("Date", time.Now().UTC().Format(http.TimeFormat)) + } } w.status = status diff --git a/http3/response_writer_test.go b/http3/response_writer_test.go index 467201a4..637353aa 100644 --- a/http3/response_writer_test.go +++ b/http3/response_writer_test.go @@ -65,8 +65,9 @@ var _ = Describe("Response Writer", func() { It("writes status", func() { rw.WriteHeader(http.StatusTeapot) fields := decodeHeader(strBuf) - Expect(fields).To(HaveLen(1)) + Expect(fields).To(HaveLen(2)) Expect(fields).To(HaveKeyWithValue(":status", []string{"418"})) + Expect(fields).To(HaveKey("date")) }) It("writes headers", func() { @@ -116,8 +117,9 @@ var _ = Describe("Response Writer", func() { rw.WriteHeader(http.StatusOK) rw.WriteHeader(http.StatusInternalServerError) fields := decodeHeader(strBuf) - Expect(fields).To(HaveLen(1)) + Expect(fields).To(HaveLen(2)) Expect(fields).To(HaveKeyWithValue(":status", []string{"200"})) + Expect(fields).To(HaveKey("date")) }) It("allows calling WriteHeader() several times when using the 103 status code", func() { @@ -137,8 +139,9 @@ var _ = Describe("Response Writer", func() { // According to the spec, headers sent in the informational response must also be included in the final response fields = decodeHeader(strBuf) - Expect(fields).To(HaveLen(2)) + Expect(fields).To(HaveLen(3)) Expect(fields).To(HaveKeyWithValue(":status", []string{"200"})) + Expect(fields).To(HaveKey("date")) Expect(fields).To(HaveKeyWithValue("link", []string{"; rel=preload; as=style", "; rel=preload; as=script"})) Expect(getData(strBuf)).To(Equal([]byte("foobar")))