Commit Graph

3865 Commits

Author SHA1 Message Date
Aldo Cortesi 49464de1cb Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy 2016-02-18 09:05:54 +13:00
Aldo Cortesi 10047a025f One CHANGELOG at the top of the repo 2016-02-18 09:05:24 +13:00
Aldo Cortesi 10eed53d0a Merge pull request #952 from fimad/master
Add a content view for query parameters
2016-02-18 08:57:42 +13:00
Will Coster 595d2a2fa0 Add a content view for query parameters
The query content view uses format_dict to display a table of query
parameters and is made the default content view for requests with
query parameters and no request body.

To facilitate this the query parameter dictionary of HTTPRequests is
added to the metadata content view parameter under the "query" key.

Additionally, the logic for handling "no content" messages is moved
from contentviews.get_content_view to ViewAuto. This is necessary as
it allows the query content view to be displayed when there is no
request body.
2016-02-16 18:50:10 -08:00
Aldo Cortesi 887ecf8896 Merge pull request #950 from Kriechi/rename
Rename lib folders
2016-02-17 10:35:41 +13:00
Thomas Kriechbaumer b87797ea25 remove test/ from py.test commands 2016-02-16 22:15:10 +01:00
Thomas Kriechbaumer e2ca4ea923 fix minor things 2016-02-16 22:01:50 +01:00
Thomas Kriechbaumer 6c9aeaab9e move py.test options to ini-file 2016-02-16 21:53:16 +01:00
Thomas Kriechbaumer 6b585023fd move tservers helper 2016-02-16 21:53:16 +01:00
Thomas Kriechbaumer 8242f2cc9d rename ProxTest -> ProxyTest 2016-02-16 21:15:50 +01:00
Thomas Kriechbaumer 1785f70a19 fix all libpathod->pathod references 2016-02-16 21:11:19 +01:00
Thomas Kriechbaumer d95a1f9819 fix all libmproxy->mitmproxy references 2016-02-16 20:56:33 +01:00
Thomas Kriechbaumer f1a0a3b228 rename mitmproxy source directory 2016-02-16 20:37:59 +01:00
Thomas Kriechbaumer dedca54099 rename pathod source directory 2016-02-16 20:37:53 +01:00
Aldo Cortesi ef8e95956d Merge pull request #949 from fimad/master
Fix failing unit tests caused by a69d223b
2016-02-16 17:55:23 +13:00
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