Commit Graph

4145 Commits

Author SHA1 Message Date
Jason Pepas
b174fd5e1f Adding example which turns every reponse into an HTTP 500. (#1136)
* Adding example which turns every reponse into an HTTP 500.

* Prefer b"" over None for response.content.
2016-05-11 15:26:17 -06:00
Thomas Kriechbaumer
bbf7b6f690 Merge pull request #1134 from mhils/fix-versions
Fix `version.NAME`
2016-05-11 13:27:58 -05:00
Maximilian Hils
acab4fea5a fix version.NAME 2016-05-11 13:02:19 -06:00
Thomas Kriechbaumer
bef72c1b02 Merge pull request #1121 from Kriechi/fix-cookies
improve cookie parsing
2016-05-11 12:30:44 -05:00
Thomas Kriechbaumer
e2ee48a0ee replace SimpleCookie with our own parser lib 2016-05-11 12:20:21 -05:00
Maximilian Hils
67a37e6d1f improve script loading 2016-05-11 11:15:36 -06:00
Thomas Kriechbaumer
e34b2d7e65 Merge pull request #1132 from mhils/improve-script-loading
Improve script loading
2016-05-11 11:58:44 -05:00
Maximilian Hils
4c8e334642 actually fix tests 2016-05-10 12:19:26 -06:00
Maximilian Hils
bb4f9611f5 Revert "fix tests"
This reverts commit f315dc1eb9.
2016-05-10 12:18:05 -06:00
Maximilian Hils
f315dc1eb9 fix tests 2016-05-10 12:17:25 -06:00
Thomas Kriechbaumer
08002282e8 improve cookie parsing
allows '/' to be within a cookie name
removes deprecated cookie getter/setter
fixes #1118
2016-05-10 11:13:12 -05:00
Thomas Kriechbaumer
595a01de4e Merge pull request #1086 from Kriechi/h2-improv
cleanup h2
2016-05-10 11:09:11 -05:00
Thomas Kriechbaumer
73a5d479bb cleanup h2 layer 2016-05-10 10:57:25 -05:00
Maximilian Hils
9d47d3b1ec fix #1120 2016-05-09 12:15:20 -06:00
Maximilian Hils
01f52ee56a fix mitmdump shutdown 2016-05-08 16:54:30 -06:00
Maximilian Hils
3c644274e9 mitmdump: make sure to always call done() in inline scripts 2016-05-08 16:49:36 -06:00
Maximilian Hils
9ac9df82c4 actually fix #1115 2016-05-06 12:48:44 -07:00
Maximilian Hils
99178c57db issue-1115 2016-05-06 12:39:00 -07:00
Maximilian Hils
ff53e7a6eb scripts: allow package imports 2016-05-03 19:54:16 -07:00
Maximilian Hils
714ba16111 disable py.test timeout by default, this breaks interactive debuggers 2016-05-02 16:51:49 -07:00
Maximilian Hils
b5e5917f7f web: update dependencies 2016-05-02 14:33:43 -07:00
Thomas Kriechbaumer
ea983f775c Merge pull request #1107 from javabrett/dev-dot-sh
README.rst should refer to ./dev.sh not ./dev
2016-05-01 14:32:41 +02:00
Brett Randall
69adcce566 README.rst should refer to ./dev.sh not ./dev 2016-05-01 22:26:44 +10:00
Maximilian Hils
d84fc645a7 docs: minor fixes 2016-04-30 15:25:02 -07:00
Thomas Kriechbaumer
f456591db0 Merge pull request #1102 from mitmproxy/stateobject-list
Add support for stateobject lists
2016-04-30 12:05:57 +02:00
Steven Noble
96512dd848 Include correct documentation URL in error message 2016-04-30 00:45:07 -07:00
Maximilian Hils
74cfd7a4e2 stateobject: support lists 2016-04-29 20:59:26 -07:00
Maximilian Hils
cb1119f3ee fix bugs introduced in 317b4be 2016-04-29 20:58:51 -07:00
Maximilian Hils
30bafea41a tcp protocol: stop on server shutdown 2016-04-29 20:33:07 -07:00
Maximilian Hils
317b4becca mitmdump: don't fail for other flowtypes 2016-04-29 20:18:32 -07:00
Maximilian Hils
60bbc250d4 mitmdump: fix shutdown after reading flow file 2016-04-29 20:17:18 -07:00
Maximilian Hils
4c331e2d01 fix bug introduced in 909d5ec 2016-04-29 12:36:07 -07:00
Maximilian Hils
54c4859a95 remove netlib version check 2016-04-29 12:00:38 -07:00
Maximilian Hils
909d5ec87e FlowReadError -> FlowReadException 2016-04-29 11:17:49 -07:00
Maximilian Hils
c7a85d1b9e fix #1089 2016-04-28 17:51:53 -07:00
Maximilian Hils
613a05b5b7 Update certinstall.rst 2016-04-28 15:22:23 -07:00
Zohar Lorberbaum
acaca765e4 Generate better function names for root url. (#1100) 2016-04-28 15:09:42 -07:00
Steven Van Acker
66267ad276 support for setting/sending multiple cookies (#1091)
* support for setting/sending multiple cookies

* py.test for multiple cookie support
2016-04-22 11:16:05 -07:00
Maximilian Hils
3876a1f38c release: always build tags 2016-04-21 22:52:30 -07:00
Maximilian Hils
5b12720962 silence flaky pathod test 2016-04-21 18:29:16 -07:00
Maximilian Hils
9f92855c99 update reverse proxy documentation, fix #1092 2016-04-21 17:56:18 -07:00
Maximilian Hils
ecf4adf30b dependency update 2016-04-21 17:25:00 -07:00
Maximilian Hils
028f5c4929 downgrade pyparsing to fix #1087 and #1090 2016-04-21 17:11:28 -07:00
Maximilian Hils
49d1bcc8a2 fix CONNECT display in upstream mode 2016-04-20 15:27:39 -07:00
Maximilian Hils
c17ccead6d mitmdump: allow stdin as infile 2016-04-18 16:04:37 -07:00
Maximilian Hils
02ba76ea09 fix proxy authorization bug, refs #988 2016-04-17 15:44:37 -07:00
Maximilian Hils
423c076c61 cleanup mitmproxy.controller, raise Kill in Channel (#1085) 2016-04-14 12:03:29 -07:00
Maximilian Hils
bc60c26c7b py3++ 2016-04-13 22:34:28 -07:00
Maximilian Hils
03c011cf4b Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-04-13 20:37:22 -07:00
Maximilian Hils
1ab51a1d3d fix #1082 2016-04-13 20:32:05 -07:00