aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use ~bq / ~bs for messages sent from client / serverShadab Zafar2016-07-162-19/+31
* Replace http decorator with one that handles different flowtypesShadab Zafar2016-07-161-20/+29
* Add TCPFlow.matchShadab Zafar2016-07-161-0/+21
* Add tests for HTTPFlow only filtersShadab Zafar2016-07-161-0/+50
* Add decorator for HTTPFlow filtersShadab Zafar2016-07-161-0/+25
* Add test for operators (& | !)Shadab Zafar2016-07-161-0/+25
* Add test for addresses (~src, ~dst)Shadab Zafar2016-07-161-0/+16
* Add test for body (~b)Shadab Zafar2016-07-162-6/+23
* Add test for error (~e)Shadab Zafar2016-07-161-1/+16
* console: don't let messages overwrite promptsAldo Cortesi2016-07-161-1/+2
* Merge pull request #1362 from cortesi/errorsAldo Cortesi2016-07-1618-60/+78
|\
| * Make mitmdump return an error exit status if errors occurred during runAldo Cortesi2016-07-162-0/+6
| * Flash a status bar message if an error log event occursAldo Cortesi2016-07-161-0/+3
| * Add a helper to translate a log level to a tierAldo Cortesi2016-07-163-4/+8
| * Trigger "start" when scripts are reloaded.Aldo Cortesi2016-07-161-0/+1
| * add_event -> add_log throughout projectAldo Cortesi2016-07-1613-47/+47
| * Fix log level handlingAldo Cortesi2016-07-166-9/+13
| * Add addons after initialisation in mitmproxy consoleAldo Cortesi2016-07-161-3/+3
|/
* Zap unused test scriptsAldo Cortesi2016-07-1511-59/+9
* fix #1358Maximilian Hils2016-07-152-11/+11
* Merge pull request #1356 from cortesi/scriptAldo Cortesi2016-07-1535-708/+676
|\
| * Script cleanupsAldo Cortesi2016-07-153-18/+100
| * Fix HAR extractorAldo Cortesi2016-07-152-6/+9
| * Adjust concurrent tests for start methodAldo Cortesi2016-07-152-3/+1
| * Add .start for addons and scriptsAldo Cortesi2016-07-1514-21/+46
| * Fix windows parse_args testAldo Cortesi2016-07-151-1/+1
| * Always use PollingObserverAldo Cortesi2016-07-141-7/+2
| * Merge branch 'master' into scriptAldo Cortesi2016-07-141-0/+2
| |\ | |/ |/|
* | Add missing mitmweb optionAldo Cortesi2016-07-141-0/+2
| * Adjust for new options schemeAldo Cortesi2016-07-141-1/+1
| * Add a tick event for addons and scripts, and use it for race-free reloadAldo Cortesi2016-07-143-14/+24
| * Tighten the tick loopAldo Cortesi2016-07-141-17/+14
| * Script cleanup: editing in console, Python3 compatibility fixesAldo Cortesi2016-07-147-61/+38
| * Convert examples and example tests for new-style scriptsAldo Cortesi2016-07-1414-261/+120
| * Zap old scripts infrastructure, fix concurrency testsAldo Cortesi2016-07-149-216/+43
| * First-order integration of scripts addonAldo Cortesi2016-07-1416-184/+379
|/
* Re-add deletion of stickycookies (#1355)Shadab Zafar2016-07-142-4/+24
* Merge pull request #1354 from mhils/explicit-optionsAldo Cortesi2016-07-1414-135/+192
|\
| * minor fixesMaximilian Hils2016-07-133-3/+3
| * make options explicitMaximilian Hils2016-07-1313-134/+191
|/
* Merge pull request #1353 from cortesi/streamAldo Cortesi2016-07-148-118/+167
|\
| * Stream to file -> addonAldo Cortesi2016-07-148-118/+167
* | Merge pull request #1352 from cortesi/stickycookieAldo Cortesi2016-07-1411-208/+204
|\|
| * Fix indeterminacy in sticky cookie testsAldo Cortesi2016-07-141-6/+9
| * Zap unused importsAldo Cortesi2016-07-141-3/+0
| * Ditch StickyCookie moduleAldo Cortesi2016-07-142-65/+2
| * StickyCookies to addonAldo Cortesi2016-07-149-140/+199
* | Merge pull request #1351 from cortesi/anticacheAldo Cortesi2016-07-148-21/+43
|\|
| * Merge remote-tracking branch 'upstream/master' into anticacheAldo Cortesi2016-07-140-0/+0
| |\ | |/ |/|
* | Merge pull request #1350 from cortesi/addons-cleanupAldo Cortesi2016-07-148-19/+39
|\ \