This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3435

hgweb: discard Content-Type header for 304 responses (issue5844)
ClosedPublic

Authored by indygreg on Apr 30 2018, 8:37 PM.

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHG11ee9bf24791: hgweb: discard Content-Type header for 304 responses (issue5844)
Summary

A side-effect of 98baf8dea553 was that hgwebdir always sets a global
default for the Content-Type header. HTTP 304 responses don't allow
the Content-Type header. So a side-effect of this change was that
HTTP 304 responses served via hgwebdir resulted in a ProgrammingError
being raised.

This commit teaches our 304 response issuing code to drop the
Content-Type header.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 30 2018, 8:37 PM
krbullock accepted this revision.May 2 2018, 10:10 PM
This revision is now accepted and ready to land.May 2 2018, 10:10 PM
Closed by commit rHG11ee9bf24791: hgweb: discard Content-Type header for 304 responses (issue5844) (authored by indygreg). · Explain WhyMay 2 2018, 10:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgweb_mod.py (6 lines)
Mtests/test-hgweb.t (4 lines)

Diff 8447

mercurial/hgweb/hgweb_mod.py

cmd = req.qsparams['cmd'] cmd = req.qsparams['cmd']
# Don't enable caching if using a CSP nonce because then it wouldn't # Don't enable caching if using a CSP nonce because then it wouldn't
# be a nonce. # be a nonce.
if rctx.configbool('web', 'cache') and not rctx.nonce: if rctx.configbool('web', 'cache') and not rctx.nonce:
tag = 'W/"%d"' % self.mtime tag = 'W/"%d"' % self.mtime
if req.headers.get('If-None-Match') == tag: if req.headers.get('If-None-Match') == tag:
res.status = '304 Not Modified' res.status = '304 Not Modified'
# Content-Type may be defined globally. It isn't valid on a
# 304, so discard it.
try:
del res.headers[b'Content-Type']
except KeyError:
pass
# Response body not allowed on 304. # Response body not allowed on 304.
res.setbodybytes('') res.setbodybytes('')
return res.sendresponse() return res.sendresponse()
res.headers['ETag'] = tag res.headers['ETag'] = tag
if cmd not in webcommands.__all__: if cmd not in webcommands.__all__:
msg = 'no such method: %s' % cmd msg = 'no such method: %s' % cmd

tests/test-hgweb.t

$ hg serve --web-conf hgweb.conf -p $HGPORT -d --pid-file hg.pid -E error.log $ hg serve --web-conf hgweb.conf -p $HGPORT -d --pid-file hg.pid -E error.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ get-with-headers.py --twice --headeronly localhost:$HGPORT 'repo/static/style.css' - date etag server $ get-with-headers.py --twice --headeronly localhost:$HGPORT 'repo/static/style.css' - date etag server
200 Script output follows 200 Script output follows
content-length: 2677 content-length: 2677
content-type: text/css content-type: text/css
500 Internal Server Error 304 Not Modified
transfer-encoding: chunked
[1]
$ killdaemons.py $ killdaemons.py
$ cd .. $ cd ..