Merge pull request web2py#1497 from niphlod/fix/1489

fixes web2py#1489
maxslimmer · Oct 14, 2016 · d15d0e6 · d15d0e6
2 parents 94d4496 + 8efd0cb
commit d15d0e6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/gluon/rocket.py b/gluon/rocket.py
@@ -11,7 +11,8 @@
 import socket
 import logging
 import platform
-from gluon._compat import iteritems, to_bytes, StringIO, urllib_unquote
+from gluon._compat import iteritems, to_bytes, StringIO
+from gluon._compat import urllib_unquote, to_native
 
 # Define Constants
 VERSION = '1.2.6'
@@ -1661,7 +1662,7 @@ def build_environ(self, sock_file, conn):
             try:
                 peercert = conn.socket.getpeercert(binary_form=True)
                 environ['SSL_CLIENT_RAW_CERT'] = \
-                    peercert and ssl.DER_cert_to_PEM_cert(peercert)
+                    peercert and to_native(ssl.DER_cert_to_PEM_cert(peercert))
             except Exception:
                 print(sys.exc_info()[1])
         else: