# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1311809735 18000
# Node ID 4f39610996fade2926152974916f2715f973447c
# Parent  494b26ad87365d9c309a1f487271df255d90a0c3
http2: send an extra header to signal a non-broken client

Some proxies strip the expect header because they forward requests in
a non-compliant way or as a way to defend against bogus clients.

diff -r 494b26ad8736 -r 4f39610996fa mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Fri Jul 29 12:46:45 2011 -0500
+++ b/mercurial/hgweb/hgweb_mod.py	Wed Jul 27 18:35:35 2011 -0500
@@ -129,8 +129,9 @@
                 # A client that sends unbundle without 100-continue will
                 # break if we respond early.
                 if (cmd == 'unbundle' and
-                    req.env.get('HTTP_EXPECT',
-                                '').lower() != '100-continue'):
+                    (req.env.get('HTTP_EXPECT',
+                                 '').lower() != '100-continue') or
+                    req.env.get('X-HgHttp2', '')):
                     req.drain()
                 req.respond(inst, protocol.HGTYPE)
                 return '0\n%s\n' % inst.message
diff -r 494b26ad8736 -r 4f39610996fa mercurial/httprepo.py
--- a/mercurial/httprepo.py	Fri Jul 29 12:46:45 2011 -0500
+++ b/mercurial/httprepo.py	Wed Jul 27 18:35:35 2011 -0500
@@ -78,6 +78,7 @@
 
         if data and self.ui.configbool('ui', 'usehttp2', False):
             headers['Expect'] = '100-Continue'
+            headers['X-HgHttp2'] = '1'
 
         self.ui.debug("sending %s command\n" % cmd)
         q = [('cmd', cmd)]