aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1635 from cortesi/refactor3Aldo Cortesi2016-10-1921-27/+27
|\
| * console: fix master invocation orderAldo Cortesi2016-10-192-2/+2
| * mitmproxy.protocol -> mitmproxy.proxy.protocolAldo Cortesi2016-10-1919-25/+25
|/
* Merge pull request #1634 from cortesi/pathocThomas Kriechbaumer2016-10-191-1/+4
|\
| * pathoc: handle error when selecting on read fileAldo Cortesi2016-10-191-1/+4
|/
* debug: add missing print output file paramaterAldo Cortesi2016-10-191-1/+1
* Merge pull request #1633 from cortesi/refactor2Aldo Cortesi2016-10-19104-427/+428
|\
| * Move all tools into mitmproxy.tools, move models/* to top levelAldo Cortesi2016-10-1995-378/+381
| * Remove flow module entirely, move contents to top levelAldo Cortesi2016-10-1923-53/+51
* | Merge pull request #1632 from cortesi/refactorAldo Cortesi2016-10-1975-247/+157
|\|
| * flow.state -> addons.stateAldo Cortesi2016-10-199-118/+26
| * addons.Addons -> addonmanager, builtins -> addonsAldo Cortesi2016-10-1965-79/+81
| * controller.Log -> log.LogAldo Cortesi2016-10-197-51/+51
|/
* Merge pull request #1631 from cortesi/nomasterAldo Cortesi2016-10-1931-232/+241
|\
| * Kill flow.master - create master.MasterAldo Cortesi2016-10-1931-232/+241
* | Merge pull request #1630 from cortesi/multiservAldo Cortesi2016-10-1928-79/+75
|\|
| * Let's dispense with this fiction that we support multiple serversAldo Cortesi2016-10-1928-79/+75
* | Merge pull request #1629 from cortesi/addonhaltAldo Cortesi2016-10-195-3/+12
|\|
| * addons: add AddonHalt exceptionAldo Cortesi2016-10-195-3/+12
* | Merge pull request #1628 from cortesi/webappAldo Cortesi2016-10-1936-151/+262
|\|
| * web app cleanups: tests and examplesAldo Cortesi2016-10-193-26/+10
| * pathoc: Guess the Host header from the path if possibleAldo Cortesi2016-10-191-3/+14
| * Web apps to addonsAldo Cortesi2016-10-1934-143/+259
* | Merge pull request #1627 from cortesi/statecleanAldo Cortesi2016-10-183-16/+21
|\|
| * No need for all builtins to be loaded for server testsAldo Cortesi2016-10-183-16/+21
* | Merge pull request #1626 from cortesi/stateAldo Cortesi2016-10-1830-173/+121
|\|
| * Convert flow.state to an addonAldo Cortesi2016-10-1825-158/+101
| * accept_addon -> resume, intercept/resume eventsAldo Cortesi2016-10-188-18/+23
* | Merge pull request #1625 from cortesi/dupflowAldo Cortesi2016-10-188-24/+28
|\|
| * master.duplicate_flow -> state.duplicate_flowAldo Cortesi2016-10-188-24/+28
* | Merge pull request #1624 from cortesi/streambodiesAldo Cortesi2016-10-1811-53/+76
|\|
| * Response body streaming to addonAldo Cortesi2016-10-1811-53/+76
|/
* Remove mention of pathod.net from READMEAldo Cortesi2016-10-181-6/+1
* dumper: limit url lengthMaximilian Hils2016-10-171-0/+2
* fix testsMaximilian Hils2016-10-171-2/+4
* remove empty lines at beginning of fileThomas Kriechbaumer2016-10-1788-91/+0
* removed unused importThomas Kriechbaumer2016-10-171-2/+0
* Merge pull request #1619 from mhils/fix-socks-tlsMaximilian Hils2016-10-162-3/+13
|\
| * fix socks5 mode with tlsMaximilian Hils2016-10-162-3/+13
* | fix redirect_requests.py exampleMaximilian Hils2016-10-161-2/+1
|/
* python3: update README and setup.py trove classifiersAldo Cortesi2016-10-172-5/+3
* update protobuf, reenable for py3 (#1618)Maximilian Hils2016-10-161-2/+2
* Merge pull request #1617 from cortesi/objectAldo Cortesi2016-10-17167-391/+261
|\
| * python3: clean up super and __future__Aldo Cortesi2016-10-17140-267/+136
| * python3: clean up class bracketsAldo Cortesi2016-10-1769-122/+122
| * Zap object base classAldo Cortesi2016-10-1765-114/+115
|/
* actually fix merge :see_no_evil:Maximilian Hils2016-10-162-16/+15
* fix mergeMaximilian Hils2016-10-161-7/+1
* Merge branch 'such-types'Maximilian Hils2016-10-1627-230/+202
|\
| * py2--: inline type infoMaximilian Hils2016-10-1627-239/+206
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:00:43 +0000