Skip to content
This repository was archived by the owner on Jan 13, 2021. It is now read-only.

Add proxy support #164

Merged
Lukasa merged 20 commits into from
Oct 11, 2015
Merged

Add proxy support #164

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3f84dce
Update connection constructors with proxies param
fredthomsen Jun 13, 2015
d8d9148
Merge branch 'development' into add_proxy_support
fredthomsen Jul 27, 2015
2b2a56c
Merge branch 'development' into add_proxy_support
fredthomsen Aug 23, 2015
d156855
Update connection constructors and connect methods for proxy support
fredthomsen Aug 31, 2015
6b3aa8e
Merge branch 'development' into add_proxy_support
fredthomsen Aug 31, 2015
2a460e2
Fix issues not on pull request with host and port not being set prope…
fredthomsen Aug 31, 2015
f49b601
Handle proxy string split better
fredthomsen Sep 9, 2015
5f905e5
Add http11 init tests for proxy
fredthomsen Sep 9, 2015
ecb7b57
Add proxy support to test server
fredthomsen Sep 12, 2015
9c8bc24
Fix proxy server woops
fredthomsen Sep 12, 2015
88ee2f1
Add proxy test to http11 integration
fredthomsen Sep 12, 2015
38153ea
Actually connect to proxy for integration tests
fredthomsen Sep 13, 2015
fe16703
Fix proxy server add issues
fredthomsen Sep 14, 2015
8539cb6
Add proxy port keyword parameter and update tests accordingly
fredthomsen Sep 16, 2015
e221dda
Merge branch 'development' into add_proxy_support
fredthomsen Sep 27, 2015
a2af966
Add tests to ensure enabling proxy doesnt hit host header
fredthomsen Sep 28, 2015
c2ff27c
Update overly complicated proxy integration test cases with simple ones
fredthomsen Sep 28, 2015
a598c39
Fix proxy port used in connect
fredthomsen Sep 28, 2015
ea56e36
Make suggested updates to http11 and http20 constructors
fredthomsen Oct 5, 2015
ca04c73
Clean up excessively long lines
fredthomsen Oct 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix proxy server woops
  • Loading branch information
@fredthomsen
fredthomsen committed Sep 12, 2015
commit 9c8bc241c064f36867357794b7522f9c115d63f8
4 changes: 2 additions & 2 deletions test/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _wrap_socket(self, sock):
raise NotImplementedError()

def run(self):
self.proxy = self._start_proxy()
self.proxy_server = self._start_proxy()


class SocketLevelTest(object):
Expand Down Expand Up @@ -158,7 +158,7 @@ def _start_server(self, socket_handler):
self.port = self.server_thread.port
self.secure = self.server_thread.secure

if proxy:
if self.proxy:
self._start_proxy()
self.proxy_host = self.proxy_thread.proxy_host

Expand Down