Maximilian Hils
2bec6a35e2
fix #956
2016-02-19 00:30:37 +01:00
Maximilian Hils
ecb26c3c82
Merge remote-tracking branch 'duffer/pretty-host'
2016-02-18 23:17:02 +01:00
Maximilian Hils
7c6bf7abb3
Merge pull request #964 from mitmproxy/flat-structure
...
Flat structure
2016-02-18 23:10:47 +01:00
Shadab Zafar
d6ab9901d1
Fixup more tests
2016-02-18 21:58:32 +05:30
Shadab Zafar
9dc1224282
Incorporate comments made during review
2016-02-18 20:12:45 +05:30
Maximilian Hils
61cde30ef8
fix .landscape.yml
2016-02-18 13:28:49 +01:00
Maximilian Hils
20352f3453
fix test paths, move coverage config into setup.py
2016-02-18 13:24:17 +01:00
Maximilian Hils
d33d3663ec
combine projects
2016-02-18 13:03:40 +01:00
Maximilian Hils
294774d6f0
move pathod/.sources to root
2016-02-18 12:29:49 +01:00
Maximilian Hils
18b619e164
move mitmproxy/web to root
2016-02-18 12:29:35 +01:00
Thomas Kriechbaumer
be02dd105b
Merge pull request #962 from mitmproxy/simpler-issue-template
...
Simplify Issue Template
2016-02-18 11:55:53 +01:00
Maximilian Hils
3cbacf4e0b
remove nonmeaningful contributing section from the readme
2016-02-18 11:42:55 +01:00
Maximilian Hils
6bb39e2eb0
simplify issue template
2016-02-18 11:30:16 +01:00
Maximilian Hils
bf024cd153
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-18 11:27:40 +01:00
Maximilian Hils
f42af90612
move bin into release, update rtool
2016-02-18 11:25:29 +01:00
Shadab Zafar
175109e44e
Use host header values only when the ports match
2016-02-18 07:01:52 +05:30
Aldo Cortesi
31ab3a231e
Merge pull request #959 from thiagoarrais/doc-fix
...
Fix misleading documentation for clipboard command
2016-02-18 10:42:07 +13:00
Aldo Cortesi
57f3915f76
Merge branch 'Kriechi-h2'
2016-02-18 10:41:08 +13:00
Aldo Cortesi
b6e5e50c24
Make fuzzing run again
2016-02-18 10:40:16 +13:00
Thiago Arrais
3343882737
Fix help
...
'P' can also be used on the request screen!
2016-02-17 18:34:21 -03:00
Aldo Cortesi
46abde94a4
Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2
2016-02-18 10:22:33 +13:00
Aldo Cortesi
c914ad754a
Merge pull request #958 from Kriechi/issue-template
...
add issue template
2016-02-18 10:18:38 +13:00
Aldo Cortesi
36e070ee25
Pull bin to the top, move pathod examples to examples dir
2016-02-18 10:15:59 +13:00
Aldo Cortesi
2e7b29ce20
Merge remote-tracking branch 'origin/unify'
2016-02-18 10:10:31 +13:00
Aldo Cortesi
14f6bcd86e
Adjust release for new repo structure
2016-02-18 09:48:37 +13:00
Aldo Cortesi
92597f82ea
Docs and examples to top level
2016-02-18 09:27:08 +13:00
Thomas Kriechbaumer
09abd7eb9a
add issue template
2016-02-17 21:10:48 +01:00
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
Thomas Kriechbaumer
262b4bc482
upgrade h2, remove reset-stream hotfix
2016-02-17 15:34:31 +01:00
Shadab Zafar
6f96da08c9
Handle port numbers in host header
...
from: https://github.com/mitmproxy/netlib/pull/121
2016-02-17 08:48:59 +05:30
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
Maximilian Hils
b7701eb8c1
add combined MANIFEST.in and CHANGELOG
2016-02-17 00:02:18 +01: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
