# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1587925787 14400
# Node ID a50f33f1ff24466d6d721685cc65a732cb4c522c
# Parent  3d5fb6cab832475975c96b6503f66c8adb7b984c
url: fix a bytes vs str crash in processing proxy headers (issue6249)

I have no idea how to make a test for this, so if somebody knows, feel free to
add one or follow up on this.  The bug reporter reported that it worked for
them, so there may not be other hidden issues here.

Differential Revision: https://phab.mercurial-scm.org/D8485

diff -r 3d5fb6cab832 -r a50f33f1ff24 mercurial/url.py
--- a/mercurial/url.py	Fri Apr 24 20:00:25 2020 +0200
+++ b/mercurial/url.py	Sun Apr 26 14:29:47 2020 -0400
@@ -225,7 +225,7 @@
 
 def _generic_proxytunnel(self):
     proxyheaders = {
-        x: self.headers[x]
+        pycompat.bytestr(x): pycompat.bytestr(self.headers[x])
         for x in self.headers
         if x.lower().startswith('proxy-')
     }