aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix after cleanup of netlib.utils in mitmproxy.console.statusbarredfast002016-06-081-2/+2
|
* 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
|/ /
* | Utils cleanupsAldo Cortesi2016-06-0718-99/+90
| | | | | | | | | | | | | | | | - Move more stuff that belongs in netlib.human - Move some stuff to near the only use - Zap mitmproxy.utils.timestamp(). I see the rationale, but we used it interchangeably with time.time() throughout the project. Since time.time() dominates in the codebase and timestamp() is such low utility, away it goes.
* | fix docsMaximilian Hils2016-06-061-1/+1
| |
* | travis: stricter doc checksMaximilian Hils2016-06-061-1/+1
| |
* | docs: remove option directiveMaximilian Hils2016-06-0618-54/+54
| | | | | | | | | | inserting " .. option::" tags create ugly markup, so we just ditch this entirely and continue using refs.
* | fix MultiView docsMaximilian Hils2016-06-061-4/+10
| |
* | minor fixesMaximilian Hils2016-06-063-6/+6
| |
* | docs: adjust theme override inclusionAldo Cortesi2016-06-071-5/+2
| | | | | | | | https://github.com/rtfd/readthedocs.org/issues/2116
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-0723-1539/+1600
|\ \
| * | fix all pathod tests on Windows :tada:Maximilian Hils2016-06-061-14/+14
| | |
| * | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-06-061-8/+4
| |\ \
| | * | web: accept all falsey sortFns in sortedIndexOfMaximilian Hils2016-06-061-8/+4
| | | |
| * | | Merge branch 'pathod-lang-http'Maximilian Hils2016-06-069-108/+115
| |\ \ \ | | |/ / | |/| |
| | * | fix NestedMessage encodingMaximilian Hils2016-06-062-2/+2
| | | |
| | * | fix .freeze(), improve testsMaximilian Hils2016-06-063-6/+11
| | | |
| | * | update pyparsingMaximilian Hils2016-06-061-1/+1
| | | |
| | * | Py3: encode() status code responsesShadab Zafar2016-06-061-1/+1
| | | |
| | * | Py3: Exception doesn't have to be bytesShadab Zafar2016-06-061-1/+1
| | | |
| | * | Py3: Fix status_code and other tests by using byte literalsShadab Zafar2016-06-061-7/+7
| | | |
| | * | Py3: Fix corresponding base.Integer test in test_language_baseShadab Zafar2016-06-062-2/+2
| | | |
| | * | Py3: Store base.Integer value as bytesShadab Zafar2016-06-061-2/+2
| | | |
| | * | Py3: Fix useragent testsShadab Zafar2016-06-061-4/+4
| | | |
| | * | Py3: UASTRINGS should be indexed by and return bytesShadab Zafar2016-06-061-1/+1
| | | |
| | * | Py3: decode() input before creating new Header tokenShadab Zafar2016-06-061-4/+4
| | | |
| | * | Py3: Fix websocket testsShadab Zafar2016-06-061-10/+10
| | | |
| | * | Py3: Use BytesIO in tutils.renderShadab Zafar2016-06-061-1/+2
| | | |
| | * | Py3: Use bytes_to_escaped_str for escaping messageShadab Zafar2016-06-061-3/+4
| | | |
| | * | Py3: More byte literalsShadab Zafar2016-06-061-6/+6
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-02 08:39:51 +0000