| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | [web] fix shortcut for header fields | Jason | 2016-06-09 | 3 | -2/+3 | |
| | | | | ||||||
| | * | | [web] separate flowtable to multiple files | Jason | 2016-06-09 | 13 | -394/+407 | |
| | | | | ||||||
| | | * | tox: Pull Py3 test list out into an environment variable | Aldo Cortesi | 2016-06-11 | 1 | -2/+4 | |
| | | | | | | | | | | | | | Suggestion from @resam | |||||
| | | * | We're not using tox-travis any more - ditch it. | Aldo Cortesi | 2016-06-10 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Remove explicit versions in tox CI environments | Aldo Cortesi | 2016-06-10 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | Tox matches the environment prefix against its std environs, so we don't need to be explicit with versions here. | |||||
| | | * | Distinguish between CI and interactive versions of tox | Aldo Cortesi | 2016-06-10 | 2 | -7/+19 | |
| | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | - This patch changes tox so that local invocation runs the tests with paralellism, coverage disabled, and without attempting to report coverage upstream. - You can now run specific tests for the py27 environment: tox -e py27 ./path/to/my/test We can't do this for py35 just yet, because of our junk filter, and the fact that we specify which tests to run directly in the conf file. Once these are cleaned up, we can extend. | |||||
| * | | Fix a crash when pathoc connections fail | Aldo Cortesi | 2016-06-10 | 2 | -66/+62 | |
| | | | | | | | | | Use the new handler to tidy this up. | |||||
| * | | Merge remote-tracking branch 'upstream/master' into pathodlog | Aldo Cortesi | 2016-06-10 | 11 | -61673/+1037 | |
| |\| | ||||||
| | * | Merge pull request #1233 from gzzhanghao/master | Maximilian Hils | 2016-06-09 | 10 | -61671/+1035 | |
| | |\ | | | | | | | [web] ProxyApp and MainView with ES6 | |||||
| | | * | [web] update build | Jason | 2016-06-09 | 3 | -61343/+488 | |
| | | | | ||||||
| | | * | [web] fix updateLocation | Jason | 2016-06-09 | 5 | -663/+853 | |
| | | | | ||||||
| | | * | [web] rewrite ProxyApp and MainView with es6 | Jason | 2016-06-09 | 6 | -356/+385 | |
| | |/ | ||||||
| | * | fix default websocket state | Maximilian Hils | 2016-06-08 | 1 | -2/+2 | |
| | | | ||||||
| | * | Merge pull request #1232 from cortesi/odict | Aldo Cortesi | 2016-06-09 | 8 | -334/+26 | |
| | |\ | | | | | | | Remove odict | |||||
| * | | | Remove timestamps from pathoc output | Aldo Cortesi | 2016-06-10 | 4 | -17/+21 | |
| | |/ |/| | | | | | | | | | Pathoc is an interactive tool, no need for a long leading timestamp. More generally, make timestamps optional in the logging mechanism so we can configure this with command-line flags or something down the track. | |||||
| * | | Remove odict | Aldo Cortesi | 2016-06-09 | 8 | -334/+26 | |
| |/ | | | | | | | | - Adds default implementations for _kconv and _reduce_values to MultiDict. Without these, operations fail in really, really non-obvious ways. - Replace the remaining few instances of ODict Fixes #1159 | |||||
| * | Merge pull request #1220 from mitmproxy/add_sorting_with_redux | Maximilian Hils | 2016-06-08 | 7 | -816/+1097 | |
| |\ | | | | | Add sorting with redux | |||||
| | * | sorting add pr review changes | Clemens | 2016-06-08 | 5 | -29/+60 | |
| | | | ||||||
| | * | sorting done, ready to review | Clemens | 2016-06-07 | 2 | -7/+5 | |
| | | | ||||||
| | * | sorting done, ready to review | Clemens | 2016-06-07 | 4 | -72/+58 | |
| | | | ||||||
| | * | moved redux state injection closer to child | Clemens | 2016-06-07 | 3 | -16/+38 | |
| | | | ||||||
| | * | start with sort, continue tomorrow | Clemens | 2016-06-07 | 3 | -36/+14 | |
| | | | ||||||
| | * | moved sort state to redux, missing apply sort | Clemens | 2016-06-07 | 5 | -788/+1054 | |
| | | | ||||||
| * | | properly fail on test failures | Thomas Kriechbaumer | 2016-06-08 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #1230 from redfast00/master | Maximilian Hils | 2016-06-08 | 1 | -2/+2 | |
| |\ \ | | | | | | | fix after cleanup of netlib.utils in mitmproxy.console.statusbar | |||||
| | * | | fix after cleanup of netlib.utils in mitmproxy.console.statusbar | redfast00 | 2016-06-08 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge pull request #1223 from dufferzafar/pathod-lang-http2 | Thomas Kriechbaumer | 2016-06-08 | 3 | -42/+42 | |
| |\ \ \ | |/ / |/| | | Python 3 - pathod.language.http2 | |||||
| | * | | Py3: encode() the spec before appending to path | Shadab Zafar | 2016-06-08 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Py3: Find content-length header by bytes | Shadab Zafar | 2016-06-08 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Py3: Pass bytes to http Request and Response | Shadab Zafar | 2016-06-08 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | Enable Travis for test_language_http2 | Shadab Zafar | 2016-06-08 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Py3: Fix test_language_http2 tests by using byte literals | Shadab Zafar | 2016-06-08 | 1 | -23/+23 | |
| | | | | ||||||
| | * | | Py3: Use global next() instead of iterator method | Shadab Zafar | 2016-06-08 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Py3: Use BytesIO instead of StringIO | Shadab Zafar | 2016-06-08 | 1 | -8/+8 | |
| | | | | ||||||
| | * | | Py3: Properly encode() access to user_agents | Shadab Zafar | 2016-06-08 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #1228 from cortesi/controller2 | Aldo Cortesi | 2016-06-08 | 12 | -135/+115 | |
| |\ \ | | | | | | | Controller refactoring | |||||
| | * | | If a message has been acked, all other processors are skipped | Aldo Cortesi | 2016-06-08 | 3 | -22/+40 | |
| | | | | | | | | | | | | | | | | | | | This applies the constraint, but does to clumsily. When we've unified modules and processors it will be much nicer. We also make some exceptions for the master processors that we may want to re-evaluate down the track. | |||||
| | * | | Simplify script concurrency helpers | Aldo Cortesi | 2016-06-08 | 3 | -55/+19 | |
| | | | | | | | | | | | | | We now have take() to prevent double-replies. | |||||
| | * | | A new interface for reply | Aldo Cortesi | 2016-06-08 | 6 | -41/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply is now explicit - it's no longer a callable itself. Instead, we have: reply.kill() - kill the flow reply.ack() - ack, but don't send anything reply.send(message) - send a response This is part of an incremental move to detach reply from our flow objects, and unify the script and handler interfaces. | |||||
| | * | | Add reply.ack and reply.kill | Aldo Cortesi | 2016-06-08 | 4 | -27/+37 | |
| |/ / | ||||||
| * | | Merge branch 'master' into beautiful-json | Aldo Cortesi | 2016-06-08 | 9 | -39/+70 | |
| |\ \ | ||||||
| | * \ | Merge pull request #1226 from Kriechi/travis-tox | Aldo Cortesi | 2016-06-08 | 3 | -25/+38 | |
| | |\ \ | | |/ | |/| | use tox in Travis | |||||
| | | * | use tox in Travis | Thomas Kriechbaumer | 2016-06-07 | 3 | -25/+38 | |
| | |/ | ||||||
| | * | tests++ | Maximilian Hils | 2016-06-07 | 2 | -8/+24 | |
| | | | ||||||
| | * | disable codecov comments | Maximilian Hils | 2016-06-07 | 1 | -0/+1 | |
| | | | ||||||
| | * | don't declare codecov as dev dependency | Maximilian Hils | 2016-06-07 | 3 | -3/+2 | |
| | | | ||||||
| | * | use codecov pypi package | Maximilian Hils | 2016-06-07 | 3 | -2/+3 | |
| | | | ||||||
| | * | Update README.rst | Maximilian Hils | 2016-06-07 | 1 | -3/+3 | |
| | | | ||||||
| | * | Py3: Fix a test_language_writer test by using a byte literal | Shadab Zafar | 2016-06-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'port-pathod-language-writer' | Maximilian Hils | 2016-06-07 | 1 | -2/+2 | |
| | |\ | ||||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |