--- a/tests/test-https.t Thu Jul 14 20:14:19 2016 -0700
+++ b/tests/test-https.t Tue Jul 12 23:12:03 2016 -0700
@@ -397,27 +397,11 @@
#if sslcontext
-Start patched hgweb that requires client certificates:
+Start hgweb that requires client certificates:
- $ cat << EOT > reqclientcert.py
- > import ssl
- > from mercurial.hgweb import server
- > class _httprequesthandlersslclientcert(server._httprequesthandlerssl):
- > @staticmethod
- > def preparehttpserver(httpserver, ui):
- > certfile = ui.config('web', 'certificate')
- > sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
- > sslcontext.verify_mode = ssl.CERT_REQUIRED
- > sslcontext.load_cert_chain(certfile)
- > # verify clients by server certificate
- > sslcontext.load_verify_locations(certfile)
- > httpserver.socket = sslcontext.wrap_socket(httpserver.socket,
- > server_side=True)
- > server._httprequesthandlerssl = _httprequesthandlersslclientcert
- > EOT
$ cd test
$ hg serve -p $HGPORT -d --pid-file=../hg0.pid --certificate=$PRIV \
- > --config extensions.reqclientcert=../reqclientcert.py
+ > --config devel.servercafile=$PRIV --config devel.serverrequirecert=true
$ cat ../hg0.pid >> $DAEMON_PIDS
$ cd ..