Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | disable erroneous linting errors | Maximilian Hils | 2016-10-24 | 1 | -8/+9 | |
| | | | ||||||
* | | | add version check for Python 3.4- | Maximilian Hils | 2016-10-24 | 1 | -0/+6 | |
|/ / | ||||||
* | | Merge pull request #1649 from cortesi/kill | Maximilian Hils | 2016-10-22 | 3 | -3/+1 | |
|\ \ | |/ |/| | Don't call error for flow kill | |||||
| * | Don't call error for flow kill | Aldo Cortesi | 2016-10-22 | 3 | -3/+1 | |
| | | | | | | | | | | This is now the error handler on master, so whatever the intetion was it's now definitely wrong. | |||||
* | | Merge pull request #1655 from mhils/fix-encoding | Maximilian Hils | 2016-10-22 | 5 | -16/+40 | |
|\ \ | | | | | | | Encoding Fixes | |||||
| * | | various encoding fixes, fix #1650 | Maximilian Hils | 2016-10-22 | 5 | -25/+41 | |
| | | | ||||||
| * | | Handle `bytes` in request parameters | Slobodan Mišković | 2016-10-22 | 1 | -2/+10 | |
| |/ | ||||||
* | | Merge pull request #1653 from mhils/issue-1651 | Maximilian Hils | 2016-10-22 | 2 | -5/+8 | |
|\ \ | |/ |/| | Fix README Syntax (#1651) | |||||
| * | add README.rst validation to CI | Maximilian Hils | 2016-10-22 | 1 | -2/+6 | |
| | | ||||||
| * | fix README syntax | Maximilian Hils | 2016-10-22 | 1 | -3/+2 | |
|/ | ||||||
* | Merge pull request #1648 from cortesi/console | Aldo Cortesi | 2016-10-22 | 1 | -1/+1 | |
|\ | | | | | console: give statusbar messages a default timeout | |||||
| * | console: give statusbar messages a default timeout | Aldo Cortesi | 2016-10-22 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1647 from babldev/fix-flowfilter-example | Aldo Cortesi | 2016-10-22 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix method call in flowfilter example | |||||
| * | | The first argument should be the filter, then the flow. | Brady Law | 2016-10-21 | 1 | -1/+1 | |
|/ / | ||||||
* / | Adjust issue template | Aldo Cortesi | 2016-10-22 | 1 | -12/+10 | |
|/ | | | | | | - Mention mitmdump --sysinfo - Remove the "what went wrong" and "what was the expected behaviour" sections. It's a bit officious, and 99% of the time is explicit from the problem description. | |||||
* | Merge pull request #1644 from cortesi/multidict | Aldo Cortesi | 2016-10-21 | 4 | -112/+6 | |
|\ | | | | | Clean up multidict a bit | |||||
| * | multidict: remove to_dict | Aldo Cortesi | 2016-10-21 | 2 | -28/+0 | |
| | | | | | | | | | | We never use it, and it is dangerously ambiguous when a key is associated with a list. | |||||
| * | multidict: ditch ImmutableMultiDict | Aldo Cortesi | 2016-10-21 | 4 | -84/+6 | |
| | | | | | | | | A contorted class we only use for cookie attributes. We don't need it. | |||||
* | | Merge pull request #1642 from cortesi/dox | Aldo Cortesi | 2016-10-21 | 1 | -3/+3 | |
|\| | | | | | docs: fix broken version | |||||
| * | docs: fix broken version | Aldo Cortesi | 2016-10-21 | 1 | -3/+3 | |
|/ | ||||||
* | dev.sh: pin to v3.5 for now | Aldo Cortesi | 2016-10-21 | 1 | -2/+2 | |
| | | | | We can generalise this again when 3.6 comes out... | |||||
* | console: correct log event handling i | Aldo Cortesi | 2016-10-21 | 1 | -3/+4 | |
| | | | | Fixes #1640 | |||||
* | Merge pull request #1637 from cortesi/tatanetlib | Aldo Cortesi | 2016-10-20 | 211 | -893/+907 | |
|\ | | | | | This PR merges netlib into mitmproxy | |||||
| * | The final piece: netlib -> mitproxy.net | Aldo Cortesi | 2016-10-20 | 150 | -282/+275 | |
| | | ||||||
| * | netlib.tutils -> mitmproxy.test.tutils | Aldo Cortesi | 2016-10-20 | 38 | -104/+104 | |
| | | | | | | | | There's a LOT more to be done refactoring our different conflicting test utils. | |||||
| * | Improve exception hierarchy | Aldo Cortesi | 2016-10-20 | 2 | -15/+16 | |
| | | | | | | | | | | ProxyException -> MitmproxyException NetlibException inherits from MitmproxyException | |||||
| * | netlib.exceptions.* -> mitmproxy.exceptions | Aldo Cortesi | 2016-10-20 | 34 | -172/+164 | |
| | | ||||||
| * | netlib.encoding -> netlib.http.encoding | Aldo Cortesi | 2016-10-20 | 3 | -2/+3 | |
| | | | | | | | | Encoding is highly specific to http, and only used within this module. | |||||
| * | netlib.certutils -> mitmproxy.certs | Aldo Cortesi | 2016-10-20 | 9 | -86/+97 | |
| | | ||||||
| * | netlib.utils -> netlib.check | Aldo Cortesi | 2016-10-20 | 9 | -21/+21 | |
| | | | | | | | | | | | | Now only contains is_valid_[host,port] Intermediate step - this will be in mitproxy.net soon. | |||||
| * | netlib.utils.[get,set]bit -> mitmproxy.utils.bits | Aldo Cortesi | 2016-10-20 | 7 | -30/+29 | |
| | | ||||||
| * | netlib.utils.BiDi -> mitmproxy.types.bidi.BiDi | Aldo Cortesi | 2016-10-20 | 7 | -49/+53 | |
| | | ||||||
| * | netlib.debug -> mitmproxy.utils.debug | Aldo Cortesi | 2016-10-20 | 3 | -2/+2 | |
| | | ||||||
| * | mitmproxy.types.[basethread,multidict,serializable] | Aldo Cortesi | 2016-10-20 | 24 | -32/+32 | |
| | | ||||||
| * | netlib.strutils -> mitmproxy.utils.strutils | Aldo Cortesi | 2016-10-20 | 26 | -25/+33 | |
| | | ||||||
| * | netlib.human -> mitmproxy.utils.human | Aldo Cortesi | 2016-10-20 | 13 | -13/+15 | |
| | | ||||||
| * | Create mitmproxy.utils hierarchy | Aldo Cortesi | 2016-10-20 | 16 | -67/+69 | |
| | | | | | | | | - Add mitproxy.utils.lrucache, mitproxy.utils.data | |||||
| * | netlib.version -> mitmproxy.version | Aldo Cortesi | 2016-10-20 | 16 | -17/+18 | |
|/ | ||||||
* | Merge pull request #1635 from cortesi/refactor3 | Aldo Cortesi | 2016-10-19 | 21 | -27/+27 | |
|\ | | | | | mitmproxy.protocol -> mitmproxy.proxy.protocol | |||||
| * | console: fix master invocation order | Aldo Cortesi | 2016-10-19 | 2 | -2/+2 | |
| | | ||||||
| * | mitmproxy.protocol -> mitmproxy.proxy.protocol | Aldo Cortesi | 2016-10-19 | 19 | -25/+25 | |
|/ | | | | | The protocols here are compltely proxy-specific, are only used from within the proxy module, and are not exposed to users. | |||||
* | Merge pull request #1634 from cortesi/pathoc | Thomas Kriechbaumer | 2016-10-19 | 1 | -1/+4 | |
|\ | | | | | pathoc: handle error when selecting on read file | |||||
| * | pathoc: handle error when selecting on read file | Aldo Cortesi | 2016-10-19 | 1 | -1/+4 | |
|/ | ||||||
* | debug: add missing print output file paramater | Aldo Cortesi | 2016-10-19 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #1633 from cortesi/refactor2 | Aldo Cortesi | 2016-10-19 | 104 | -427/+428 | |
|\ | | | | | Continue module structure cleanup | |||||
| * | Move all tools into mitmproxy.tools, move models/* to top level | Aldo Cortesi | 2016-10-19 | 95 | -378/+381 | |
| | | | | | | | | | | | | The primary motivation here (and for all the other moving around) is to present a clean "front of house" to library users, and to migrate primary objects to the top of the module hierarchy. | |||||
| * | Remove flow module entirely, move contents to top level | Aldo Cortesi | 2016-10-19 | 23 | -53/+51 | |
| | | | | | | | | | | mitmproxy.flow.io -> mitmproxy.io mitmproxy.flow.export -> mitmproxy.export | |||||
* | | Merge pull request #1632 from cortesi/refactor | Aldo Cortesi | 2016-10-19 | 75 | -247/+157 | |
|\| | | | | | Start rationalising our module structure bit by bit | |||||
| * | flow.state -> addons.state | Aldo Cortesi | 2016-10-19 | 9 | -118/+26 | |
| | | ||||||
| * | addons.Addons -> addonmanager, builtins -> addons | Aldo Cortesi | 2016-10-19 | 65 | -79/+81 | |
| | |