From cd5ef042bbbe3155efd29a749a7aefa52728f98e Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 16 Jun 2016 18:13:36 +0530 Subject: Py3: pathoc should send bytes over wire --- pathod/pathoc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pathod/pathoc.py') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index 478ce2a2..b539fec4 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -241,8 +241,8 @@ class Pathoc(tcp.TCPClient): def http_connect(self, connect_to): self.wfile.write( - 'CONNECT %s:%s HTTP/1.1\r\n' % tuple(connect_to) + - '\r\n' + b'CONNECT %s:%d HTTP/1.1\r\n' % (connect_to[0].encode(), connect_to[1]) + + b'\r\n' ) self.wfile.flush() try: -- cgit v1.2.3 From 78785df16be237bfdbf4ee485639b61f06b4a47e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 16 Jun 2016 17:09:52 -0700 Subject: pathoc: use idna encoding for hostnames --- pathod/pathoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod/pathoc.py') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index b539fec4..ea21b747 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -241,7 +241,7 @@ class Pathoc(tcp.TCPClient): def http_connect(self, connect_to): self.wfile.write( - b'CONNECT %s:%d HTTP/1.1\r\n' % (connect_to[0].encode(), connect_to[1]) + + b'CONNECT %s:%d HTTP/1.1\r\n' % (connect_to[0].encode("idna"), connect_to[1]) + b'\r\n' ) self.wfile.flush() -- cgit v1.2.3 From eb3ed87100ff7c32e5bf040db7eb6ea3d0c06e12 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Fri, 17 Jun 2016 14:15:48 +0200 Subject: move custom HTTP/2 stack from netlib to pathod --- pathod/pathoc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pathod/pathoc.py') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index ea21b747..c6783878 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -11,18 +11,18 @@ import time import OpenSSL.crypto import six +import logging +from netlib.tutils import treq +from netlib import strutils from netlib import tcp, certutils, websockets, socks from netlib import exceptions from netlib.http import http1 -from netlib.http import http2 from netlib import basethread -from pathod import log, language +from . import log, language +from .protocols import http2 -import logging -from netlib.tutils import treq -from netlib import strutils logging.getLogger("hpack").setLevel(logging.WARNING) @@ -227,7 +227,7 @@ class Pathoc(tcp.TCPClient): "Pathoc might not be working as expected without ALPN.", timestamp=False ) - self.protocol = http2.HTTP2Protocol(self, dump_frames=self.http2_framedump) + self.protocol = http2.HTTP2StateProtocol(self, dump_frames=self.http2_framedump) else: self.protocol = http1 -- cgit v1.2.3