Commit Graph

4717 Commits

Author SHA1 Message Date
Aldo Cortesi
a5cb241c7c If a message has been acked, all other processors are skipped
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.
2016-06-08 12:58:58 +12:00
Aldo Cortesi
b3bf754e53 Simplify script concurrency helpers
We now have take() to prevent double-replies.
2016-06-08 11:21:38 +12:00
Aldo Cortesi
a388ddfd78 A new interface for reply
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.
2016-06-08 10:44:20 +12:00
Aldo Cortesi
982077ec31 Add reply.ack and reply.kill 2016-06-08 10:14:34 +12:00
Aldo Cortesi
db11fe0087 Merge branch 'master' into beautiful-json 2016-06-08 09:19:25 +12:00
Aldo Cortesi
eb680e7764 Merge pull request #1226 from Kriechi/travis-tox
use tox in Travis
2016-06-08 09:06:47 +12:00
Thomas Kriechbaumer
14ac916bce use tox in Travis 2016-06-07 19:59:49 +02:00
Clemens
dbbda03020 sorting done, ready to review 2016-06-07 11:22:52 +02:00
Clemens
fa3ad2382b sorting done, ready to review 2016-06-07 11:07:25 +02:00
Clemens
1aac283e23 moved redux state injection closer to child 2016-06-07 11:07:25 +02:00
Clemens
ff2129773f start with sort, continue tomorrow 2016-06-07 11:07:25 +02:00
Clemens
ac2d8549e5 moved sort state to redux, missing apply sort 2016-06-07 11:07:25 +02:00
Maximilian Hils
c98c83190b tests++ 2016-06-07 01:03:08 -07:00
Maximilian Hils
637a3be937 disable codecov comments 2016-06-07 01:00:23 -07:00
Maximilian Hils
c6180a7b26 don't declare codecov as dev dependency 2016-06-07 00:48:32 -07:00
Maximilian Hils
5ea363afad use codecov pypi package 2016-06-07 00:45:43 -07:00
Maximilian Hils
e7ba89a327 Update README.rst 2016-06-07 00:32:29 -07:00
Shadab Zafar
d254fe791a Py3: Fix a test_language_writer test by using a byte literal 2016-06-07 00:01:41 -07:00
Maximilian Hils
4f3ace1a62 Merge branch 'port-pathod-language-writer' 2016-06-07 00:00:20 -07:00
Maximilian Hils
e115859bbd Merge pull request #1216 from dufferzafar/pathod-lang-ws
Python 3 - pathod.language.websocket
2016-06-06 23:57:50 -07:00
Maximilian Hils
1904afe3f0 add codecov too appveyor 2016-06-06 23:41:41 -07:00
Maximilian Hils
009a4d2add s/coveralls/codecov/ 2016-06-06 23:38:21 -07:00
Shadab Zafar
d2281e0ab3 Enable Travis for test/pathod/test_language_websocket 2016-06-07 11:40:17 +05:30
Maximilian Hils
ba466dbb35 simplify pretty_json, improve test coverage 2016-06-06 23:08:58 -07:00
Maximilian Hils
71b6e369f8 change content views: escape in raw mode, show utf8 in json 2016-06-06 22:42:11 -07:00
Aldo Cortesi
1ffc273c94 Utils cleanups
- 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.
2016-06-07 17:12:52 +12:00
Maximilian Hils
b180bfcf35 fix docs 2016-06-06 19:30:45 -07:00
Maximilian Hils
7f0c8ab40e travis: stricter doc checks 2016-06-06 19:10:19 -07:00
Maximilian Hils
83f8522981 docs: remove option directive
inserting " .. option::" tags create ugly markup, so we just ditch this
entirely and continue using refs.
2016-06-06 19:10:19 -07:00
Maximilian Hils
9a1cc16643 fix MultiView docs 2016-06-06 19:10:19 -07:00
Maximilian Hils
38d2e6432c minor fixes 2016-06-06 19:10:19 -07:00
Aldo Cortesi
9b7de5c98f docs: adjust theme override inclusion
https://github.com/rtfd/readthedocs.org/issues/2116
2016-06-07 13:54:40 +12:00
Aldo Cortesi
75ebd638eb Merge remote-tracking branch 'upstream/master' 2016-06-07 12:56:51 +12:00
Aldo Cortesi
e037fe05ff Migrate pathod docs to Sphinx
All the content of the pathod docs are moved into Sphinx. The interactive
format has not translated well to static docs, and there's still a lot of
rewriting, format fixing, structuring, etc to be done.
2016-06-07 12:55:32 +12:00
Maximilian Hils
80292c0ac3 fix all pathod tests on Windows 🎉 2016-06-06 16:03:45 -07:00
Maximilian Hils
3bf36854e7 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-06-06 15:59:48 -07:00
Maximilian Hils
f2f5beb75d Merge branch 'pathod-lang-http' 2016-06-06 15:59:24 -07:00
Maximilian Hils
54ee8ff4d4 web: accept all falsey sortFns in sortedIndexOf 2016-06-06 15:47:31 -07:00
Maximilian Hils
7cb7d9ad32 netlib: always disconnect when using context manager 2016-06-06 15:10:03 -07:00
Maximilian Hils
2ee5e8ef0e fix NestedMessage encoding 2016-06-06 13:39:38 -07:00
Maximilian Hils
6447c8ae22 fix .freeze(), improve tests 2016-06-06 13:31:44 -07:00
Maximilian Hils
c973fd881f update pyparsing 2016-06-06 13:29:39 -07:00
Shadab Zafar
afa2ad81df Py3: encode() status code responses 2016-06-06 11:52:45 -07:00
Shadab Zafar
b03a98f9fc Py3: Exception doesn't have to be bytes 2016-06-06 11:52:45 -07:00
Shadab Zafar
f48073af56 Py3: Fix status_code and other tests by using byte literals 2016-06-06 11:52:45 -07:00
Shadab Zafar
5a2932adc1 Py3: Fix corresponding base.Integer test in test_language_base 2016-06-06 11:52:45 -07:00
Shadab Zafar
daba944151 Py3: Store base.Integer value as bytes 2016-06-06 11:52:45 -07:00
Shadab Zafar
40056e1cd7 Py3: Fix useragent tests 2016-06-06 11:52:45 -07:00
Shadab Zafar
78b2fa3a13 Py3: UASTRINGS should be indexed by and return bytes 2016-06-06 11:52:45 -07:00
Shadab Zafar
da38ce2e6e Py3: decode() input before creating new Header token 2016-06-06 11:52:45 -07:00