##// END OF EJS Templates
hgweb: support constructing URLs from an alternate base URL...
hgweb: support constructing URLs from an alternate base URL The web.baseurl config option allows server operators to define a custom URL for hosted content. The way it works today is that hgwebdir parses this config option into URL components then updates the appropriate WSGI environment variables so the request "lies" about its details. For example, SERVER_NAME is updated to reflect the alternate base URL's hostname. The WSGI environment should not be modified because WSGI applications may want to know the original request details (for debugging, etc). This commit teaches our request parser about the existence of an alternate base URL. If defined, the advertised URL and other self-reflected paths will take the alternate base URL into account. The hgweb WSGI application didn't use web.baseurl. But hgwebdir did. We update hgwebdir to alter the environment parsing accordingly. The old code around environment manipulation has been removed. With this change, parserequestfromenv() has grown to a bit unwieldy. Now that practically everyone is using it, it is obvious that there is some unused features that can be trimmed. So look for this in follow-up commits. Differential Revision: https://phab.mercurial-scm.org/D2822

File last commit:

r31771:5e92ba77 default
r36916:219b2335 default
Show More
test-serve.t
81 lines | 1.8 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve
Patrick Mezard
tests: convert test-serve to new format
r13540
$ hgserve()
> {
> hg serve -a localhost -d --pid-file=hg.pid -E errors.log -v $@ \
> | sed -e "s/:$HGPORT1\\([^0-9]\\)/:HGPORT1\1/g" \
> -e "s/:$HGPORT2\\([^0-9]\\)/:HGPORT2\1/g" \
> -e 's/http:\/\/[^/]*\//http:\/\/localhost\//'
> cat hg.pid >> "$DAEMON_PIDS"
> echo % errors
> cat errors.log
Matt Mackall
tests: drop explicit $TESTDIR from executables...
r25472 > killdaemons.py hg.pid
Patrick Mezard
tests: convert test-serve to new format
r13540 > }
$ hg init test
$ cd test
$ echo '[web]' > .hg/hgrc
$ echo 'accesslog = access.log' >> .hg/hgrc
$ echo "port = $HGPORT1" >> .hg/hgrc
Without -v
$ hg serve -a localhost -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> "$DAEMON_PIDS"
$ if [ -f access.log ]; then
Mads Kiilerich
tests: fix incorrect markup of continued lines of sh commands
r16487 > echo 'access log created - .hg/hgrc respected'
> fi
Patrick Mezard
tests: convert test-serve to new format
r13540 access log created - .hg/hgrc respected
errors
$ cat errors.log
With -v
$ hgserve
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
With -v and -p HGPORT2
$ hgserve -p "$HGPORT2"
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/ (bound to *$LOCALIP*:HGPORT2) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
With -v and -p daytime (should fail because low port)
Matt Harbison
test-serve: disable unfixable tests on Windows...
r31771 #if no-root no-windows
Patrick Mezard
tests: convert test-serve to new format
r13540 $ KILLQUIETLY=Y
$ hgserve -p daytime
abort: cannot start server at 'localhost:13': Permission denied
abort: child process failed to start
% errors
$ KILLQUIETLY=N
Matt Mackall
tests: skip tests that require not having root (issue4089)...
r20008 #endif
Patrick Mezard
tests: convert test-serve to new format
r13540
With --prefix foo
$ hgserve --prefix foo
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
With --prefix /foo
$ hgserve --prefix /foo
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
With --prefix foo/
$ hgserve --prefix foo/
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
With --prefix /foo/
$ hgserve --prefix /foo/
Matt Harbison
test-serve: make the 'listening at *' lines optional...
r31769 listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?)
Patrick Mezard
tests: convert test-serve to new format
r13540 % errors
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..