Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handling user script exceptions, fix #2839 | kira0204 | 2018-04-10 | 3 | -10/+29 |
* | Merge pull request #3035 from cortesi/aiosimpler | Aldo Cortesi | 2018-04-07 | 35 | -295/+285 |
|\ | |||||
| * | asyncio: ditch the handler context | Aldo Cortesi | 2018-04-07 | 7 | -54/+21 |
| * | asyncio: remove master.add_log, in favor of a persistent log.Log instance | Aldo Cortesi | 2018-04-07 | 6 | -25/+12 |
| * | asyncio: remove test master.has_log | Aldo Cortesi | 2018-04-07 | 7 | -30/+40 |
| * | asyncio: move log mechanism onto the event loop | Aldo Cortesi | 2018-04-07 | 21 | -94/+128 |
| * | asyncio simplify: we don't need a queue for proxy->main loop comms | Aldo Cortesi | 2018-04-07 | 13 | -85/+83 |
| * | asyncio: remove last vestiage of channel input from master | Aldo Cortesi | 2018-04-07 | 3 | -17/+11 |
|/ | |||||
* | Merge pull request #3031 from itzikBraun/add-httpie-export | Aldo Cortesi | 2018-04-06 | 2 | -4/+52 |
|\ | |||||
| * | added option to export request as httpie command | itzikBraun | 2018-04-02 | 2 | -4/+52 |
* | | Merge pull request #2971 from kira0204/user-script-exception | Aldo Cortesi | 2018-04-06 | 2 | -6/+38 |
|\ \ | |||||
| * | | use error handler function | kira0204 | 2018-03-26 | 2 | -7/+7 |
| * | | User script exception handler[squash] | kira0204 | 2018-03-07 | 2 | -0/+32 |
* | | | Merge pull request #3046 from cortesi/backlog | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | Remove socket listen backlog constraint | Aldo Cortesi | 2018-04-06 | 1 | -2/+1 |
|/ / / | |||||
* | | | update release instructions | Maximilian Hils | 2018-04-05 | 1 | -0/+5 |
* | | | update CHANGELOG | Maximilian Hils | 2018-04-05 | 1 | -2/+14 |
* | | | Merge pull request #3044 from mhils/issue-3038 | Maximilian Hils | 2018-04-05 | 2 | -52/+27 |
|\ \ \ | |||||
| * | | | fix http retry timeout | Maximilian Hils | 2018-04-05 | 2 | -52/+27 |
|/ / / | |||||
* | | | Merge pull request #3032 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-04-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | [requires.io] dependency update | requires.io | 2018-04-02 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #3029 from cortesi/eventloop | Aldo Cortesi | 2018-04-04 | 16 | -224/+170 |
|\ \ \ | |||||
| * | | | minor fixes | Aldo Cortesi | 2018-04-03 | 2 | -10/+4 |
| * | | | asyncio: factor out test server startup wait | Aldo Cortesi | 2018-04-03 | 3 | -12/+7 |
| * | | | asyncio: cleanup and lint | Aldo Cortesi | 2018-04-02 | 5 | -6/+10 |
| * | | | asyncio: rebase mitmweb Tornado event loop on asyncio | Aldo Cortesi | 2018-04-02 | 1 | -1/+4 |
| * | | | asyncio: test cleanup | Aldo Cortesi | 2018-04-02 | 5 | -8/+27 |
| * | | | asyncio: shift console over to asyncio eventloop | Aldo Cortesi | 2018-04-02 | 2 | -9/+5 |
| * | | | asyncio: make http2 tests pass | Aldo Cortesi | 2018-04-02 | 3 | -9/+16 |
| * | | | asyncio: fix a few remaining issues in proxy/test_server.py | Aldo Cortesi | 2018-04-02 | 2 | -9/+14 |
| * | | | asyncio: fix channel interface and tests | Aldo Cortesi | 2018-04-01 | 4 | -24/+33 |
| * | | | asyncio: fix client replay | Aldo Cortesi | 2018-04-01 | 2 | -23/+3 |
| * | | | asyncio: start a test loop for unit tests | Aldo Cortesi | 2018-04-01 | 6 | -17/+9 |
| * | | | Remove support for Python 3.5 | Aldo Cortesi | 2018-04-01 | 1 | -2/+2 |
| * | | | asyncio: clean up event loop acquisition | Aldo Cortesi | 2018-04-01 | 2 | -97/+20 |
| * | | | asyncio: brutally rip out our old queue mechanism | Aldo Cortesi | 2018-04-01 | 10 | -140/+159 |
| |/ / | |||||
* | | | Merge pull request #3033 from emilstahl/master | Thomas Kriechbaumer | 2018-04-03 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fixed --no-mouse parameter message | Emil Stahl | 2018-04-03 | 1 | -1/+1 |
|/ / | |||||
* | | Update dev.ps1 | Thomas Kriechbaumer | 2018-03-31 | 1 | -3/+3 |
* | | Merge pull request #3025 from Kriechi/py36 | Aldo Cortesi | 2018-04-01 | 11 | -49/+21 |
|\ \ | |||||
| * | | Python 3.5 is dead -- long live Python 3.6! | Thomas Kriechbaumer | 2018-03-31 | 11 | -49/+21 |
* | | | Merge pull request #3026 from ghillu/master | Thomas Kriechbaumer | 2018-03-31 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update addons-overview.md | ghillu | 2018-04-01 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #3012 from Kriechi/docs-options | Aldo Cortesi | 2018-03-30 | 13 | -65/+126 |
|\ \ | |||||
| * | | docs: add auto-generated options reference | Thomas Kriechbaumer | 2018-03-25 | 13 | -68/+115 |
| * | | docs: add skeleton for options script | Maximilian Hils | 2018-03-24 | 1 | -0/+14 |
* | | | simplify README | Maximilian Hils | 2018-03-28 | 1 | -2/+1 |
* | | | fix badges | Thomas Kriechbaumer | 2018-03-27 | 1 | -4/+9 |
* | | | fix docs-related URLs | Thomas Kriechbaumer | 2018-03-27 | 1 | -3/+3 |
* | | | Merge pull request #3014 from MikeShi42/patch-1 | Thomas Kriechbaumer | 2018-03-27 | 1 | -1/+1 |
|\ \ \ |