This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2840

hgweb: allow defining Server response header for HTTP server
ClosedPublic

Authored by indygreg on Mar 13 2018, 3:11 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHG5890e5872f36: hgweb: allow defining Server response header for HTTP server
Summary

By default, the string contains the Python version. Server
operators may want to change this.

Because we like deterministic tests, we change the test harness
to always set this value to a known string. Various globs over
the server header have now been removed.

  1. no-check-commit because we add version_string()

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 13 2018, 3:11 PM
lothiraldan accepted this revision.Mar 14 2018, 5:33 AM
durin42 accepted this revision.Mar 19 2018, 9:36 PM
This revision is now accepted and ready to land.Mar 19 2018, 9:36 PM
Closed by commit rHG5890e5872f36: hgweb: allow defining Server response header for HTTP server (authored by indygreg). · Explain WhyMar 19 2018, 9:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6993

mercurial/configitems.py

default='', default='',
) )
coreconfigitem('web', 'push_ssl', coreconfigitem('web', 'push_ssl',
default=True, default=True,
) )
coreconfigitem('web', 'refreshinterval', coreconfigitem('web', 'refreshinterval',
default=20, default=20,
) )
coreconfigitem('web', 'server-header',
default=None,
)
coreconfigitem('web', 'staticurl', coreconfigitem('web', 'staticurl',
default=None, default=None,
) )
coreconfigitem('web', 'stripes', coreconfigitem('web', 'stripes',
default=1, default=1,
) )
coreconfigitem('web', 'style', coreconfigitem('web', 'style',
default='paper', default='paper',

mercurial/help/config.txt

How frequently directory listings re-scan the filesystem for new How frequently directory listings re-scan the filesystem for new
repositories, in seconds. This is relevant when wildcards are used repositories, in seconds. This is relevant when wildcards are used
to define paths. Depending on how much filesystem traversal is to define paths. Depending on how much filesystem traversal is
required, refreshing may negatively impact performance. required, refreshing may negatively impact performance.
Values less than or equal to 0 always refresh. Values less than or equal to 0 always refresh.
(default: 20) (default: 20)
``server-header``
Value for HTTP ``Server`` response header.
``staticurl`` ``staticurl``
Base URL to use for static files. If unset, static files (e.g. the Base URL to use for static files. If unset, static files (e.g. the
hgicon.png favicon) will be served by the CGI script itself. Use hgicon.png favicon) will be served by the CGI script itself. Use
this setting to serve them directly with the HTTP server. this setting to serve them directly with the HTTP server.
Example: ``http://hgserver/static/``. Example: ``http://hgserver/static/``.
``stripes`` ``stripes``
How many lines a "zebra stripe" should span in multi-line output. How many lines a "zebra stripe" should span in multi-line output.

mercurial/hgweb/server.py

self.wfile.write(data) self.wfile.write(data)
self.wfile.flush() self.wfile.flush()
def _done(self): def _done(self):
if self._chunked: if self._chunked:
self.wfile.write('0\r\n\r\n') self.wfile.write('0\r\n\r\n')
self.wfile.flush() self.wfile.flush()
def version_string(self):
if self.server.serverheader:
return self.server.serverheader
return httpservermod.basehttprequesthandler.version_string(self)
class _httprequesthandlerssl(_httprequesthandler): class _httprequesthandlerssl(_httprequesthandler):
"""HTTPS handler based on Python's ssl module""" """HTTPS handler based on Python's ssl module"""
url_scheme = 'https' url_scheme = 'https'
@staticmethod @staticmethod
def preparehttpserver(httpserver, ui): def preparehttpserver(httpserver, ui):
try: try:
alog = openlog(ui.config('web', 'accesslog'), ui.fout) alog = openlog(ui.config('web', 'accesslog'), ui.fout)
elog = openlog(ui.config('web', 'errorlog'), ui.ferr) elog = openlog(ui.config('web', 'errorlog'), ui.ferr)
self.accesslog = alog self.accesslog = alog
self.errorlog = elog self.errorlog = elog
self.addr, self.port = self.socket.getsockname()[0:2] self.addr, self.port = self.socket.getsockname()[0:2]
self.fqaddr = socket.getfqdn(addr[0]) self.fqaddr = socket.getfqdn(addr[0])
self.serverheader = ui.config('web', 'server-header')
class IPv6HTTPServer(MercurialHTTPServer): class IPv6HTTPServer(MercurialHTTPServer):
address_family = getattr(socket, 'AF_INET6', None) address_family = getattr(socket, 'AF_INET6', None)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if self.address_family is None: if self.address_family is None:
raise error.RepoError(_('IPv6 is not available on this system')) raise error.RepoError(_('IPv6 is not available on this system'))
super(IPv6HTTPServer, self).__init__(*args, **kwargs) super(IPv6HTTPServer, self).__init__(*args, **kwargs)
def create_server(ui, app): def create_server(ui, app):

tests/run-tests.py

hgrc.write(b'usercache = %s\n' % hgrc.write(b'usercache = %s\n' %
(os.path.join(self._testtmp, b'.cache/largefiles'))) (os.path.join(self._testtmp, b'.cache/largefiles')))
hgrc.write(b'[lfs]\n') hgrc.write(b'[lfs]\n')
hgrc.write(b'usercache = %s\n' % hgrc.write(b'usercache = %s\n' %
(os.path.join(self._testtmp, b'.cache/lfs'))) (os.path.join(self._testtmp, b'.cache/lfs')))
hgrc.write(b'[web]\n') hgrc.write(b'[web]\n')
hgrc.write(b'address = localhost\n') hgrc.write(b'address = localhost\n')
hgrc.write(b'ipv6 = %s\n' % str(self._useipv6).encode('ascii')) hgrc.write(b'ipv6 = %s\n' % str(self._useipv6).encode('ascii'))
hgrc.write(b'server-header = testing stub value\n')
for opt in self._extraconfigopts: for opt in self._extraconfigopts:
section, key = opt.encode('utf-8').split(b'.', 1) section, key = opt.encode('utf-8').split(b'.', 1)
assert b'=' in key, ('extra config opt %s must ' assert b'=' in key, ('extra config opt %s must '
'have an = for assignment' % opt) 'have an = for assignment' % opt)
hgrc.write(b'[%s]\n%s\n' % (section, key)) hgrc.write(b'[%s]\n%s\n' % (section, key))
def fail(self, msg): def fail(self, msg):

tests/test-archive.t

$ test_archtype gz tar.gz tar.bz2 zip $ test_archtype gz tar.gz tar.bz2 zip
% gz allowed should give 200 % gz allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz
content-type: application/x-gzip content-type: application/x-gzip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505 body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505
% tar.bz2 and zip disallowed should both give 403 % tar.bz2 and zip disallowed should both give 403
403 Archive type not allowed: bz2 403 Archive type not allowed: bz2
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
403 Archive type not allowed: zip 403 Archive type not allowed: zip
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7 body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7
$ test_archtype bz2 tar.bz2 zip tar.gz $ test_archtype bz2 tar.bz2 zip tar.gz
% bz2 allowed should give 200 % bz2 allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.bz2 content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.bz2
content-type: application/x-bzip2 content-type: application/x-bzip2
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=426, sha1=8d87f5aba6e14f1bfea6c232985982c278b2fb0b body: size=426, sha1=8d87f5aba6e14f1bfea6c232985982c278b2fb0b
% zip and tar.gz disallowed should both give 403 % zip and tar.gz disallowed should both give 403
403 Archive type not allowed: zip 403 Archive type not allowed: zip
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7 body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734 body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734
$ test_archtype zip zip tar.gz tar.bz2 $ test_archtype zip zip tar.gz tar.bz2
% zip allowed should give 200 % zip allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.zip content-disposition: attachment; filename=test-archive-1701ef1f1510.zip
content-type: application/zip content-type: application/zip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650
% tar.gz and tar.bz2 disallowed should both give 403 % tar.gz and tar.bz2 disallowed should both give 403
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734 body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734
403 Archive type not allowed: bz2 403 Archive type not allowed: bz2
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
check http return codes (with deprecated option) check http return codes (with deprecated option)
$ test_archtype_deprecated gz tar.gz tar.bz2 zip $ test_archtype_deprecated gz tar.gz tar.bz2 zip
% gz allowed should give 200 % gz allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.gz
content-type: application/x-gzip content-type: application/x-gzip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505 body: size=408, sha1=8fa06531bddecc365a9f5edb0f88b65974bfe505
% tar.bz2 and zip disallowed should both give 403 % tar.bz2 and zip disallowed should both give 403
403 Archive type not allowed: bz2 403 Archive type not allowed: bz2
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
403 Archive type not allowed: zip 403 Archive type not allowed: zip
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7 body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7
$ test_archtype_deprecated bz2 tar.bz2 zip tar.gz $ test_archtype_deprecated bz2 tar.bz2 zip tar.gz
% bz2 allowed should give 200 % bz2 allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.bz2 content-disposition: attachment; filename=test-archive-1701ef1f1510.tar.bz2
content-type: application/x-bzip2 content-type: application/x-bzip2
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=426, sha1=8d87f5aba6e14f1bfea6c232985982c278b2fb0b body: size=426, sha1=8d87f5aba6e14f1bfea6c232985982c278b2fb0b
% zip and tar.gz disallowed should both give 403 % zip and tar.gz disallowed should both give 403
403 Archive type not allowed: zip 403 Archive type not allowed: zip
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7 body: size=1451, sha1=cbfa5574b337348bfd0564cc534474d002e7d6c7
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734 body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734
$ test_archtype_deprecated zip zip tar.gz tar.bz2 $ test_archtype_deprecated zip zip tar.gz tar.bz2
% zip allowed should give 200 % zip allowed should give 200
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.zip content-disposition: attachment; filename=test-archive-1701ef1f1510.zip
content-type: application/zip content-type: application/zip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650
% tar.gz and tar.bz2 disallowed should both give 403 % tar.gz and tar.bz2 disallowed should both give 403
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734 body: size=1450, sha1=71f0b12d59f85fdcfe8ff493e2dc66863f2f7734
403 Archive type not allowed: bz2 403 Archive type not allowed: bz2
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352 body: size=1451, sha1=4c5cf0f574446c44feb7f88f4e0e2a56bd92c352
$ echo "allow_archive = gz bz2 zip" >> .hg/hgrc $ echo "allow_archive = gz bz2 zip" >> .hg/hgrc
$ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS

tests/test-basic.t

Create a repository: Create a repository:
$ hg config $ hg config
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)
largefiles.usercache=$TESTTMP/.cache/largefiles largefiles.usercache=$TESTTMP/.cache/largefiles
lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.promptecho=True ui.promptecho=True
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value
$ hg init t $ hg init t
$ cd t $ cd t
Prepare a changeset: Prepare a changeset:
$ echo a > a $ echo a > a
$ hg add a $ hg add a

tests/test-commandserver.t

lfs.usercache=$TESTTMP/.cache/lfs lfs.usercache=$TESTTMP/.cache/lfs
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.foo=bar ui.foo=bar
ui.nontty=true ui.nontty=true
web.address=localhost web.address=localhost
web\.ipv6=(?:True|False) (re) web\.ipv6=(?:True|False) (re)
web.server-header=testing stub value
*** runcommand init foo *** runcommand init foo
*** runcommand -R foo showconfig ui defaults *** runcommand -R foo showconfig ui defaults
ui.slash=True ui.slash=True
ui.interactive=False ui.interactive=False
ui.mergemarkers=detailed ui.mergemarkers=detailed
ui.nontty=true ui.nontty=true
$ rm -R foo $ rm -R foo

tests/test-hgweb-commands.t

wire protocol command to wrong base URL wire protocol command to wrong base URL
$ get-with-headers.py $LOCALIP:$HGPORT 'foo?cmd=capabilities' - $ get-with-headers.py $LOCALIP:$HGPORT 'foo?cmd=capabilities' -
404 Not Found 404 Not Found
content-length: 12 content-length: 12
content-type: application/mercurial-0.1 content-type: application/mercurial-0.1
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
0 0
Not Found Not Found
[1] [1]
heads heads
$ get-with-headers.py $LOCALIP:$HGPORT '?cmd=heads' $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=heads'

tests/test-http-protocol.t

$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
Server should send application/mercurial-0.1 to clients if no Accept is used Server should send application/mercurial-0.1 to clients if no Accept is used
$ get-with-headers.py --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - $ get-with-headers.py --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.1 content-type: application/mercurial-0.1
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
Server should send application/mercurial-0.1 when client says it wants it Server should send application/mercurial-0.1 when client says it wants it
$ get-with-headers.py --hgproto '0.1' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - $ get-with-headers.py --hgproto '0.1' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.1 content-type: application/mercurial-0.1
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
Server should send application/mercurial-0.2 when client says it wants it Server should send application/mercurial-0.2 when client says it wants it
$ get-with-headers.py --hgproto '0.2' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - $ get-with-headers.py --hgproto '0.2' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.2 content-type: application/mercurial-0.2
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
$ get-with-headers.py --hgproto '0.1 0.2' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - $ get-with-headers.py --hgproto '0.1 0.2' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.2 content-type: application/mercurial-0.2
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
Requesting a compression format that server doesn't support results will fall back to 0.1 Requesting a compression format that server doesn't support results will fall back to 0.1
$ get-with-headers.py --hgproto '0.2 comp=aa' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' - $ get-with-headers.py --hgproto '0.2 comp=aa' --headeronly $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.1 content-type: application/mercurial-0.1
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
#if zstd #if zstd
zstd is used if available zstd is used if available
$ get-with-headers.py --hgproto '0.2 comp=zstd' $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp $ get-with-headers.py --hgproto '0.2 comp=zstd' $LOCALIP:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
$ f --size --hexdump --bytes 36 --sha1 resp $ f --size --hexdump --bytes 36 --sha1 resp
resp: size=248, sha1=4d8d8f87fb82bd542ce52881fdc94f850748 resp: size=248, sha1=4d8d8f87fb82bd542ce52881fdc94f850748
0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu| 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 73 74 64 |t follows...zstd| 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 73 74 64 |t follows...zstd|
0020: 28 b5 2f fd |(./.| 0020: 28 b5 2f fd |(./.|
#endif #endif
application/mercurial-0.2 is not yet used on non-streaming responses application/mercurial-0.2 is not yet used on non-streaming responses
$ get-with-headers.py --hgproto '0.2' $LOCALIP:$HGPORT '?cmd=heads' - $ get-with-headers.py --hgproto '0.2' $LOCALIP:$HGPORT '?cmd=heads' -
200 Script output follows 200 Script output follows
content-length: 41 content-length: 41
content-type: application/mercurial-0.1 content-type: application/mercurial-0.1
date: $HTTP_DATE$ date: $HTTP_DATE$
server: * (glob) server: testing stub value
e93700bd72895c5addab234c56d4024b487a362f e93700bd72895c5addab234c56d4024b487a362f
Now test protocol preference usage Now test protocol preference usage
$ killdaemons.py $ killdaemons.py
$ hg serve --config server.compressionengines=none,zlib -R server -p $HGPORT -d --pid-file hg.pid $ hg serve --config server.compressionengines=none,zlib -R server -p $HGPORT -d --pid-file hg.pid
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS