Commit Graph

3959 Commits

Author SHA1 Message Date
Thomas Kriechbaumer
c903efcf5b temporarily disable pypy with new openssl on travis 2015-08-18 21:17:20 +02:00
Thomas Kriechbaumer
af6fefb5b4 temporarily disable pypy on travis 2015-08-18 21:14:37 +02:00
Thomas Kriechbaumer
67e6e5c7d8 temporarily disable pypy on travis 2015-08-18 21:13:46 +02:00
Maximilian Hils
231656859f TCPClient: more sophisticated address handling 2015-08-18 21:08:42 +02:00
Maximilian Hils
62416daa4a add Reader.peek() 2015-08-18 21:08:01 +02:00
Maximilian Hils
c92dc1b868 re-add form_out 2015-08-18 21:07:38 +02:00
Maximilian Hils
ab1549e0ef yield -> callbacks 2015-08-18 15:59:44 +02:00
Maximilian Hils
96de7ad562 various fixes 2015-08-18 14:15:08 +02:00
Maximilian Hils
99129ab5a1 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
	libmproxy/protocol2/http.py
2015-08-17 19:20:28 +02:00
Aldo Cortesi
9286f5b5b4 Small tweaks to read_dumpfile example. 2015-08-17 11:29:24 +12:00
Aldo Cortesi
3d30667125 Bump netlib version - 0.13.1 is already out 2015-08-17 10:21:30 +12:00
Maximilian Hils
a2b8504889 improve protocol handling 2015-08-16 23:25:02 +02:00
Thomas Kriechbaumer
38c456bb62 implement Http1 and Http2 protocols as layers 2015-08-16 15:19:11 +02:00
Maximilian Hils
c04fa1b233 minor fixes 2015-08-16 12:52:34 +02:00
Maximilian Hils
61afac8637 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
	libmproxy/protocol2/http_proxy.py
	libmproxy/protocol2/tls.py
	libmproxy/proxy/connection.py
2015-08-16 12:47:13 +02:00
Maximilian Hils
4c31ffd90f minor fixes 2015-08-16 12:43:15 +02:00
Aldo Cortesi
7da47bd720 Merge branch 'master' of ssh.github.com:mitmproxy/netlib 2015-08-16 21:47:42 +12:00
Aldo Cortesi
99e89a1efc Remove stray prints from test suite 2015-08-16 21:47:26 +12:00
Aldo Cortesi
bf773f822c OSX tarfiles, remove obsolete osx-binaries 2015-08-16 21:45:45 +12:00
Aldo Cortesi
c428578c83 First pass PyInstaller specs for OSX binaries 2015-08-16 21:44:54 +12:00
Thomas Kriechbaumer
85cede47aa allow direct ALPN callback method 2015-08-16 11:41:34 +02:00
Aldo Cortesi
19a17933cc Disable mitmweb OSX binary generation for now 2015-08-16 21:40:41 +12:00
Thomas Kriechbaumer
1e40d34e94 add ALPN to proxy connections 2015-08-16 11:36:31 +02:00
Aldo Cortesi
a13fe94b7c Cleanup, restructuring, extract version in project config 2015-08-16 20:42:52 +12:00
Aldo Cortesi
10b377bb10 README -> README.mkd 2015-08-16 20:11:17 +12:00
Aldo Cortesi
11c626cf84 OSX binary builds in Python script 2015-08-16 20:09:33 +12:00
Aldo Cortesi
be498bc1a3 Adapt mitmdump and mitmweb for certifi and release process 2015-08-16 19:55:55 +12:00
Aldo Cortesi
b1908e6639 Updates
build -> rtool to avoid clashing with standard pyinstaller dirs
checklist updates
script adaptations
2015-08-16 17:25:38 +12:00
Aldo Cortesi
2973a79c59 Adapt mitmproxy.spec for new cryptography, certifi and new release structure 2015-08-16 17:24:40 +12:00
Aldo Cortesi
5b957ac658 constants -> CONSTANTS 2015-08-16 12:57:24 +12:00
Aldo Cortesi
c3fffe152e Build script, extension of contributors command, .gitignore 2015-08-16 12:51:52 +12:00
Aldo Cortesi
20d89cd34f Initial checkin 2015-08-16 12:39:06 +12:00
Aldo Cortesi
7e4020213c Remove release tools 2015-08-16 12:31:51 +12:00
Maximilian Hils
a175572447 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor 2015-08-15 20:22:45 +02:00
Maximilian Hils
2a15479cdb fix bugs, make https work 2015-08-15 20:20:46 +02:00
Thomas Kriechbaumer
b7e6e1c9b2 add HTTP/1.1 ALPN version string 2015-08-15 17:49:59 +02:00
Thomas Kriechbaumer
a9dd82c986 add ALPN to proxy connections 2015-08-15 17:49:40 +02:00
Maximilian Hils
0dd243c5e4 various fixes 2015-08-15 16:26:12 +02:00
Maximilian Hils
747699b126 more work on http protocol 2015-08-14 16:49:52 +02:00
Maximilian Hils
808218f4bc more work on http layer 2015-08-14 10:41:11 +02:00
Maximilian Hils
aef3b626a7 wip commit 2015-08-11 20:32:14 +02:00
Maximilian Hils
026330a3b0 cleaner Exceptions, ssl -> tls, upstream proxy mode 2015-08-11 20:32:13 +02:00
Maximilian Hils
314e0f5839 add reverseproxy mode, fix bugs 2015-08-11 20:32:12 +02:00
Maximilian Hils
aac0ab23eb simplify layer code, add yield_from_callback decorator 2015-08-11 20:32:12 +02:00
Maximilian Hils
c46e3f90bb apply fixes from proxy-refactor-cb branch 2015-08-11 20:32:11 +02:00
Maximilian Hils
531ca4a356 minor fixes 2015-08-11 20:32:10 +02:00
Maximilian Hils
e815915b22 add auto layer, multiple other fixes 2015-08-11 20:32:10 +02:00
Maximilian Hils
c1d016823c move files around 2015-08-11 20:32:09 +02:00
Maximilian Hils
be995ddbd6 add ssl layer 2015-08-11 20:32:09 +02:00
Maximilian Hils
863113f989 first initial proof-of-concept 2015-08-11 20:32:08 +02:00