mirror of
https://codeberg.org/Codeberg/pages-server.git
synced 2024-11-26 05:55:27 +00:00
bc9111a05f
HTTP uses GMT [1,2] rather than UTC as timezone for timestamps. However, the Last-Modified header used UTC which confused at least wget. Before, UTC was used: $ wget --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg ... Last-Modified: Sun, 11 Sep 2022 08:37:42 UTC ... Last-modified header invalid -- time-stamp ignored. ... After, GMT is used: $ wget --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg ... Last-Modified: Sun, 11 Sep 2022 08:37:42 GMT ... (no last-modified-header-invalid warning) [1]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified [2]: https://www.rfc-editor.org/rfc/rfc9110#name-date-time-formats Fixes #364 --- Whatt I noticed is that the If-Modified-Since header isn't accepted (neither with GMT nor with UTC): ``` $ wget --header "If-Modified-Since: Sun, 11 Sep 2022 08:37:42 GMT" --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg Spider mode enabled. Check if remote file exists. --2024-07-15 23:31:41-- https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg Resolving cb_pages_tests.localhost.mock.directory (cb_pages_tests.localhost.mock.directory)... 127.0.0.1 Connecting to cb_pages_tests.localhost.mock.directory (cb_pages_tests.localhost.mock.directory)|127.0.0.1|:4430... connected. WARNING: The certificate of ‘cb_pages_tests.localhost.mock.directory’ is not trusted. WARNING: The certificate of ‘cb_pages_tests.localhost.mock.directory’ doesn't have a known issuer. HTTP request sent, awaiting response... HTTP/1.1 200 OK Allow: GET, HEAD, OPTIONS Cache-Control: public, max-age=600 Content-Length: 124635 Content-Type: image/jpeg Etag: "073af1960852e2a4ef446202c7974768b9881814" Last-Modified: Sun, 11 Sep 2022 08:37:42 GMT Referrer-Policy: strict-origin-when-cross-origin Server: pages-server Strict-Transport-Security: max-age=63072000; includeSubdomains; preload Date: Mon, 15 Jul 2024 21:31:42 GMT Length: 124635 (122K) [image/jpeg] Remote file exists ``` I would have expected a 304 (Not Modified) rather than a 200 (OK). I assume this is simply not supported and on production 304 is returned by a caching proxy in front of pages-server. Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/365 Reviewed-by: crapStone <codeberg@crapstone.dev> Co-authored-by: Peter Gerber <peter@arbitrary.ch> Co-committed-by: Peter Gerber <peter@arbitrary.ch>
29 lines
997 B
Go
29 lines
997 B
Go
package upstream
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"codeberg.org/codeberg/pages/server/context"
|
|
"codeberg.org/codeberg/pages/server/gitea"
|
|
)
|
|
|
|
// setHeader set values to response header
|
|
func (o *Options) setHeader(ctx *context.Context, header http.Header) {
|
|
if eTag := header.Get(gitea.ETagHeader); eTag != "" {
|
|
ctx.RespWriter.Header().Set(gitea.ETagHeader, eTag)
|
|
}
|
|
if cacheIndicator := header.Get(gitea.PagesCacheIndicatorHeader); cacheIndicator != "" {
|
|
ctx.RespWriter.Header().Set(gitea.PagesCacheIndicatorHeader, cacheIndicator)
|
|
}
|
|
if length := header.Get(gitea.ContentLengthHeader); length != "" {
|
|
ctx.RespWriter.Header().Set(gitea.ContentLengthHeader, length)
|
|
}
|
|
if mime := header.Get(gitea.ContentTypeHeader); mime == "" || o.ServeRaw {
|
|
ctx.RespWriter.Header().Set(gitea.ContentTypeHeader, rawMime)
|
|
} else {
|
|
ctx.RespWriter.Header().Set(gitea.ContentTypeHeader, mime)
|
|
}
|
|
ctx.RespWriter.Header().Set(headerLastModified, o.BranchTimestamp.In(time.UTC).Format(http.TimeFormat))
|
|
}
|