Commit Graph

4211 Commits

Author SHA1 Message Date
Thomas Kriechbaumer
1b7b968526 Merge branch 'ParthGanatra-pip-upgrade' 2016-02-23 19:59:59 +01:00
Parth Ganatra
ed5260290f Update dev.sh 2016-02-23 19:59:30 +01:00
Maximilian Hils
bfbcbfd737 fix coverage collection 2016-02-23 18:07:12 +01:00
Aldo Cortesi
dca9139fb2 Merge pull request #967 from dufferzafar/766
Fix minor issues with har_extractor
2016-02-22 10:09:28 +13:00
Aldo Cortesi
08f44b9fad Doc tweaks
This patch does the following:

- Fixes all warnings in the doc tree
- Adds a modd + devd conf file that renders HTML and treats doc warnings as
errors. This lets you send warning output to your desktop notifier, and gives
livereload similar to the livehtml entry in the Makefile.
- Some small tweaks

Sphinx currently has a bug that causes unknown options to generate a warning:

https://github.com/sphinx-doc/sphinx/issues/2229

This is fixed in stable, but not yet released. You can update Sphinx to the
latest stable like so:

pip install --upgrade https://github.com/sphinx-doc/sphinx/archive/stable.zip
2016-02-21 11:47:17 +13:00
Aldo Cortesi
cf3182a6d4 Merge branch 'master' of github.com:mitmproxy/mitmproxy 2016-02-21 10:53:16 +13:00
Maximilian Hils
cf57020038 fix proxy reconnect 2016-02-20 22:08:49 +01:00
Thomas Kriechbaumer
985213a6bc fix tests 2016-02-20 18:55:43 +01:00
Shadab Zafar
6bb27c162f har_extractor: Replace deprecated stuff with recommended ones 2016-02-20 21:01:59 +05:30
Shadab Zafar
be9329dfd4 har_extractor: Use items() instead of iteritems() 2016-02-20 21:01:27 +05:30
Aldo Cortesi
5441683037 First-order conversion of rtool to flat directory structure 2016-02-19 16:43:26 +13:00
Maximilian Hils
e8611acb76 fix #951 2016-02-19 00:46:57 +01:00
Maximilian Hils
614e2ebf29 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-19 00:30:51 +01:00
Maximilian Hils
2bec6a35e2 fix #956 2016-02-19 00:30:37 +01:00
Aldo Cortesi
a635e04fbf console: slightly less hacky hack show http2 warning after first tick 2016-02-19 12:16:55 +13:00
Aldo Cortesi
3d477c72d3 Merge pull request #960 from Kriechi/enable-h2
enable HTTP/2 by default if available
2016-02-19 11:56:50 +13:00
Thomas Kriechbaumer
7d2c7efa57 enable HTTP/2 by default if available 2016-02-18 23:53:53 +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