Commit Graph

4250 Commits

Author SHA1 Message Date
Will Coster
0fc348d211 Fix failing unit tests caused by a69d223b 2016-02-15 20:36:21 -08:00
Maximilian Hils
5101843683 fix wheel creation, re-add MANIFEST.in 2016-02-16 04:28:10 +01:00
Maximilian Hils
c31df4fa25 travis: remove sdist builds 2016-02-16 02:04:58 +01:00
Maximilian Hils
2d569527f2 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-16 02:02:40 +01:00
Maximilian Hils
bc7db1be2d temporarily silence flaky tests 2016-02-16 02:02:32 +01:00
Maximilian Hils
718e298dba Merge pull request #948 from fimad/master
Preserve host header when modifying request path
2016-02-16 01:27:16 +01:00
Will Coster
a69d223b33 Preserve host header when modifying request path
Currently the path_components and query setters of the Request object
use the url setter under the hood. The url setter updates all parts of
the URL including the host. If the host header and the host in the
request URL are different (as is common when making HTTPS requests)
then the host header will be updated to the value in the URL as a
result of modifying the path.

This change fixes this problem by modifying the query and
path_components setters to not use the url setter and instead directly
update the path field.
2016-02-15 16:21:20 -08:00
Maximilian Hils
4583fa7922 remove MANIFEST.in, move Dockerfile to root 2016-02-16 00:57:42 +01:00
Maximilian Hils
ec4f7ab050 update mitmproxy changelog 2016-02-16 00:45:43 +01:00
Maximilian Hils
df92228b93 rtool: remove support for source distributions 2016-02-16 00:39:07 +01:00
Maximilian Hils
615e4ec163 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-16 00:22:41 +01:00
Maximilian Hils
10f9b6faa7 fix release tool, refs #947 2016-02-16 00:22:38 +01:00
Aldo Cortesi
d17ae31452 Satisfy pip constraints, set +x on executables 2016-02-16 12:04:25 +13:00
Maximilian Hils
f864266ccc update shield.io badges 2016-02-15 23:05:30 +01:00
Maximilian Hils
87d9afcf2e Merge pull request #937 from mhils/single-repo
Combine mitmproxy, pathod and netlib in a single repo.
2016-02-15 23:00:11 +01:00
Maximilian Hils
3d9a5157e7 use own shields instance, update pathod readme 2016-02-15 21:13:06 +01:00
Maximilian Hils
a78c6f1cb0 update README.rst, minor fixes 2016-02-15 19:43:55 +01:00
Maximilian Hils
fc9fa87827 fix ALPN checks 2016-02-15 18:43:06 +01:00
Maximilian Hils
b7af845523 fix appveyor, re-introduce requirements.txt 2016-02-15 18:12:12 +01:00
Maximilian Hils
a1190c3696 adjust travis 2016-02-15 17:06:32 +01:00
Maximilian Hils
b211bef9a1 fix tests 2016-02-15 16:34:38 +01:00
Maximilian Hils
d7158f975e move tests into shared folder 2016-02-15 16:34:22 +01:00
Maximilian Hils
5fe473fb43 dev -> dev.sh 2016-02-15 16:03:42 +01:00
Maximilian Hils
95cef3c0e9 merge metadata files 2016-02-15 15:43:59 +01:00
Maximilian Hils
dd2c500294 add release 2016-02-15 14:58:53 +01:00
Maximilian Hils
175ce43a30 add pathod 2016-02-15 14:58:49 +01:00
Maximilian Hils
43c3e164ec add netlib 2016-02-15 14:58:48 +01:00
Maximilian Hils
33fa49277a move mitmproxy 2016-02-15 14:58:46 +01:00
Maximilian Hils
36f34f7019 convert old flows to 0.17 2016-02-14 18:34:11 +01:00
Maximilian Hils
925c206249 make sure that we don't have build race conditions 2016-02-14 17:41:54 +01:00
Maximilian Hils
c07e4be678 Merge branch 'master' of https://github.com/mitmproxy/release 2016-02-14 17:28:32 +01:00
Maximilian Hils
cf8588f125 fix minor bugs 2016-02-14 17:28:25 +01:00
Maximilian Hils
e8598f5f7a bump version 2016-02-14 17:25:30 +01:00
Maximilian Hils
aafa69a738 bump version 2016-02-14 17:25:30 +01:00
Maximilian Hils
5cf0aea62f bump version 2016-02-14 17:25:30 +01:00
Maximilian Hils
38e9176a45 update dependencies 2016-02-14 17:04:47 +01:00
Maximilian Hils
e6285468b4 fix plain http proxying 2016-02-14 16:59:21 +01:00
Maximilian Hils
ced78ba107 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-14 16:37:20 +01:00
Maximilian Hils
885e619a7e mitmweb: fix _strip_content 2016-02-14 16:37:09 +01:00
Maximilian Hils
ea0ba6d143 Merge pull request #935 from mitmproxy/coding-style
Improve Coding Style
2016-02-14 15:10:09 +01:00
Thomas Kriechbaumer
4767474d4b remove noop code 2016-02-14 14:58:36 +01:00
Thomas Kriechbaumer
6746cf5f54 autoflake 2016-02-14 14:45:27 +01:00
Thomas Kriechbaumer
efcfc62b73 autopep8 2016-02-14 14:43:48 +01:00
Thomas Kriechbaumer
5e65b933b2 improve landscape config 2016-02-14 14:36:44 +01:00
Thomas Kriechbaumer
c394ee31fb Merge pull request #933 from mitmproxy/http2-log
Print HTTP2 frames to debug log
2016-02-14 14:33:02 +01:00
Maximilian Hils
7c17c6ddbe print http2 frames to debug log 2016-02-14 14:18:31 +01:00
Maximilian Hils
5968983b4c make travis less noisy 2016-02-14 12:53:46 +01:00
Maximilian Hils
fb6cbbb7ac don't print while displaying a progress bar 2016-02-14 01:44:54 +01:00
Maximilian Hils
a54fc2785f Merge pull request #932 from fimad/master
Do not send Proxy-Agent in CONNECT responses, fix #783
2016-02-14 01:27:51 +01:00
Will Coster
d60257e767 Do not send Proxy-Agent in CONNECT responses
Sending any headers at all in response to a CONNECT request breaks
proxying Android emulators on all non-80 ports.

Issue: #783
2016-02-13 16:16:12 -08:00