[Updated] D8485: url: fix a bytes vs str crash in processing proxy headers (issue6249)

[mharbison72 (Matt Harbison)]

Closed by commit rHG8dbaa361ecdb: url: fix a bytes vs str crash in processing proxy headers (issue6249) (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8485?vs=21225&id=21283

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8485/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8485

AFFECTED FILES
  mercurial/url.py

CHANGE DETAILS

diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -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-')
     }



To: mharbison72, #hg-reviewers, marmoute
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200507/c4d3457d/attachment.html>