aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'upstream/master' into pathodlogAldo Cortesi2016-06-1011-61673/+1037
|\|
| * Merge pull request #1233 from gzzhanghao/masterMaximilian Hils2016-06-0910-61671/+1035
| |\ | | | | | | [web] ProxyApp and MainView with ES6
| | * [web] update buildJason2016-06-093-61343/+488
| | |
| | * [web] fix updateLocationJason2016-06-095-663/+853
| | |
| | * [web] rewrite ProxyApp and MainView with es6Jason2016-06-096-356/+385
| |/
| * fix default websocket stateMaximilian Hils2016-06-081-2/+2
| |
| * Merge pull request #1232 from cortesi/odictAldo Cortesi2016-06-098-334/+26
| |\ | | | | | | Remove odict
* | | Remove timestamps from pathoc outputAldo Cortesi2016-06-104-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 odictAldo Cortesi2016-06-098-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_reduxMaximilian Hils2016-06-087-816/+1097
|\ | | | | Add sorting with redux
| * sorting add pr review changesClemens2016-06-085-29/+60
| |
| * sorting done, ready to reviewClemens2016-06-072-7/+5
| |
| * sorting done, ready to reviewClemens2016-06-074-72/+58
| |
| * moved redux state injection closer to childClemens2016-06-073-16/+38
| |
| * start with sort, continue tomorrowClemens2016-06-073-36/+14
| |
| * moved sort state to redux, missing apply sortClemens2016-06-075-788/+1054
| |
* | properly fail on test failuresThomas Kriechbaumer2016-06-081-1/+1
| |
* | Merge pull request #1230 from redfast00/masterMaximilian Hils2016-06-081-2/+2
|\ \ | | | | | | fix after cleanup of netlib.utils in mitmproxy.console.statusbar
| * | fix after cleanup of netlib.utils in mitmproxy.console.statusbarredfast002016-06-081-2/+2
| | |
* | | Merge pull request #1223 from dufferzafar/pathod-lang-http2Thomas Kriechbaumer2016-06-083-42/+42
|\ \ \ | |/ / |/| | Python 3 - pathod.language.http2
| * | Py3: encode() the spec before appending to pathShadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Find content-length header by bytesShadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Pass bytes to http Request and ResponseShadab Zafar2016-06-081-5/+5
| | |
| * | Enable Travis for test_language_http2Shadab Zafar2016-06-081-1/+1
| | |
| * | Py3: Fix test_language_http2 tests by using byte literalsShadab Zafar2016-06-081-23/+23
| | |
| * | Py3: Use global next() instead of iterator methodShadab Zafar2016-06-081-2/+2
| | |
| * | Py3: Use BytesIO instead of StringIOShadab Zafar2016-06-081-8/+8
| | |
| * | Py3: Properly encode() access to user_agentsShadab Zafar2016-06-081-1/+1
|/ /
* | Merge pull request #1228 from cortesi/controller2Aldo Cortesi2016-06-0812-135/+115
|\ \ | | | | | | Controller refactoring
| * | If a message has been acked, all other processors are skippedAldo Cortesi2016-06-083-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 helpersAldo Cortesi2016-06-083-55/+19
| | | | | | | | | | | | We now have take() to prevent double-replies.
| * | A new interface for replyAldo Cortesi2016-06-086-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.killAldo Cortesi2016-06-084-27/+37
|/ /
* | Merge branch 'master' into beautiful-jsonAldo Cortesi2016-06-089-39/+70
|\ \
| * \ Merge pull request #1226 from Kriechi/travis-toxAldo Cortesi2016-06-083-25/+38
| |\ \ | | |/ | |/| use tox in Travis
| | * use tox in TravisThomas Kriechbaumer2016-06-073-25/+38
| |/
| * tests++Maximilian Hils2016-06-072-8/+24
| |
| * disable codecov commentsMaximilian Hils2016-06-071-0/+1
| |
| * don't declare codecov as dev dependencyMaximilian Hils2016-06-073-3/+2
| |
| * use codecov pypi packageMaximilian Hils2016-06-073-2/+3
| |
| * Update README.rstMaximilian Hils2016-06-071-3/+3
| |
| * Py3: Fix a test_language_writer test by using a byte literalShadab Zafar2016-06-071-1/+1
| |
| * Merge branch 'port-pathod-language-writer'Maximilian Hils2016-06-071-2/+2
| |\
| | * Reenable pathod.language.writer testsMaximilian Hils2016-06-061-2/+2
| | | | | | | | | | | | This reverts commit 1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68.
| * | Merge pull request #1216 from dufferzafar/pathod-lang-wsMaximilian Hils2016-06-062-3/+3
| |\ \ | | | | | | | | Python 3 - pathod.language.websocket
| | * | Enable Travis for test/pathod/test_language_websocketShadab Zafar2016-06-072-3/+3
| | | |
| * | | add codecov too appveyorMaximilian Hils2016-06-061-0/+2
| | | |
| * | | s/coveralls/codecov/Maximilian Hils2016-06-062-2/+1
| |/ /
* | | simplify pretty_json, improve test coverageMaximilian Hils2016-06-062-10/+6
| | |
* | | change content views: escape in raw mode, show utf8 in jsonMaximilian Hils2016-06-061-2/+12
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:29:50 +0000