aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* @mhils can't mergeMaximilian Hils2016-07-161-1/+1
* Merge remote-tracking branch 'duffer/tcpflow-filter'Maximilian Hils2016-07-165-32/+342
|\
| * Allow DummyFlow to match ~e, ~src and ~dstShadab Zafar2016-07-163-18/+37
| * Sort filt items alphabeticallyShadab Zafar2016-07-161-14/+14
| * Add DummyFlow and its TestsShadab Zafar2016-07-161-1/+59
| * Add tests for TCPFlow.matchShadab Zafar2016-07-161-1/+15
| * Add ~http and ~tcp filtersShadab Zafar2016-07-162-1/+31
| * 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
* | Merge pull request #1306 from mitmproxy/message-body-encodingMaximilian Hils2016-07-1629-353/+644
|\ \
| * | preserve content-type parameter orderMaximilian Hils2016-07-152-2/+5
| * | Merge remote-tracking branch 'origin/master' into message-body-encodingMaximilian Hils2016-07-15162-2901/+3176
| |\|
| * | improve message content semanticsMaximilian Hils2016-07-1510-130/+194
| * | minor fixMaximilian Hils2016-07-041-1/+1
| * | raise ValueError if content-encoding is invalidMaximilian Hils2016-07-049-69/+154
| * | tests++Maximilian Hils2016-07-022-4/+46
| * | make the linter happyMaximilian Hils2016-07-023-3/+1
| * | update examples: no decoded() anymore :tada:Maximilian Hils2016-07-027-54/+46
| * | message.content -> .raw_content, implement .textMaximilian Hils2016-07-0223-268/+377
* | | Merge pull request #1363 from cortesi/replaceAldo Cortesi2016-07-1612-83/+122
|\ \ \ | |_|/ |/| |
| * | replacehooks -> addonAldo Cortesi2016-07-1612-83/+122
|/ /
* | 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