aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * web: update dependenciesMaximilian Hils2014-11-274-13039/+11952
| |
| * introduce revised views, port over changes from multiple_views branchMaximilian Hils2014-11-2613-327/+679
| |
* | Merge pull request #425 from tekii/masterMaximilian Hils2014-12-113-10/+23
|\ \ | | | | | | append option added to dump (flow file is open in append mode instead of overwrite)
| * | append file mode for saving flows merged to masterMarcelo Glezer2014-12-113-10/+23
| | |
| * | Merge remote-tracking branch 'base/master'Marcelo Glezer2014-12-1170-781/+1979
| |\ \ | |/ / |/| |
* | | fix #304Maximilian Hils2014-12-091-1/+25
| | |
* | | fix #411Maximilian Hils2014-12-081-3/+3
| | |
* | | fix #419Maximilian Hils2014-12-081-1/+10
| | |
* | | fix HTTPResponse creationMaximilian Hils2014-12-041-2/+1
| | |
* | | fix testsMaximilian Hils2014-12-012-9/+17
| | |
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-12-012-8/+2
|\ \ \
| * \ \ Merge pull request #416 from elimisteve/patch-1Maximilian Hils2014-11-291-7/+1
| |\ \ \ | | | | | | | | | | README: Fixed double-quote and whitespace issues
| | * | | README: Fixed double-quote and whitespace issuesSteve Phillips2014-11-291-7/+1
| |/ / /
| * | | Merge pull request #415 from gabe-k/flowbasic-fixMaximilian Hils2014-11-281-1/+1
| |\ \ \ | | | | | | | | | | Changed argument name from confdir to cadir in flowbasic example
| | * | | Changed argument name from confdir to cadir in flowbasic exampleGabriel Kirkpatrick2014-11-281-1/+1
| |/ / /
* | | | add inline script example for websocket passthrough, fix #340Maximilian Hils2014-12-012-0/+33
| | | |
* | | | make header processing configurable by inline scripts, refs #340Maximilian Hils2014-12-011-11/+15
|/ / /
* | | fix #413Maximilian Hils2014-11-281-3/+4
| | |
* | | fix error htmlMaximilian Hils2014-11-261-1/+1
| |/ |/|
* | fix limit_txt, fix #412Maximilian Hils2014-11-231-2/+2
| |
* | retain raw filter str on filt objectsMaximilian Hils2014-11-222-5/+7
| |
* | add sni support to LiveConnection.change_serverMaximilian Hils2014-11-191-2/+11
| |
* | fix testsMaximilian Hils2014-11-152-2/+3
| |
* | Merge pull request #410 from JustusW/masterMaximilian Hils2014-11-153-1/+217
|\ \ | | | | | | Added HAR generation as inline script
| * | Added try/except block for import errors with harparser and pytz.Justus Wingert2014-11-151-2/+8
| | |
| * | Updated setup.py and moved requirements to examples section. Included ↵Justus Wingert2014-11-153-17/+27
| | | | | | | | | | | | examples section in requirements.txt. Updated har_extractor to use command line arguments.
| * | Switched to pytz. Added comment for clarification on behaviour of ↵Justus Wingert2014-11-152-15/+9
| | | | | | | | | | | | HAREncodable. Added missing parameter in reset(). Fixed accessing headers.
| * | It seems get_decoded_content can actually be shorter than content due to ↵Justus Wingert2014-11-151-1/+1
| | | | | | | | | | | | encoding issues. Since I'm not crazy after all it seems safe to push.
| * | Removed the globals and replaced them with internal attributes of _HARLog. ↵Justus Wingert2014-11-151-34/+46
| | | | | | | | | | | | Minor bugfixes to make ssl timings work.
| * | Hopefully fixed dependency fuckup.Justus Wingert2014-11-151-1/+1
| | |
| * | Added script dependencie to harparser.Justus Wingert2014-11-151-0/+1
| | |
| * | Typo...Justus Wingert2014-11-151-1/+1
| | |
| * | Improved helper method, marginally.Justus Wingert2014-11-151-4/+4
| | |
| * | Updated documentation and cleaned up the code.Justus Wingert2014-11-151-105/+91
| | |
| * | Initial checkin with har_extractor script.Justus Wingert2014-11-151-0/+207
| | |
* | | One common --version flagAldo Cortesi2014-11-151-15/+5
| | |
* | | Remove last vestiges of argparseAldo Cortesi2014-11-151-7/+6
| | |
* | | Exclude main.py from coverage analysisAldo Cortesi2014-11-152-1/+4
| | |
* | | Make sure all command-line arguments have a long formAldo Cortesi2014-11-151-21/+20
| | | | | | | | | | | | ... so they can be used in config files
* | | Enable config file parsingAldo Cortesi2014-11-152-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We support 4 different config files: ~/.mitmproxy/common.conf: Options that are common to all tools ~/.mitmproxy/mitmproxy.conf: Options for mitmproxy ~/.mitmproxy/mitmdump.conf: Options for mitmdump ~/.mitmproxy/mitmweb.conf: Options for mitmweb Options in the tool-specific config files over-ride options in common.conf. If a non-common option is put in common.conf, an error will be raised if a non-supporting tool is used.
* | | Refactor command-line argument definitionAldo Cortesi2014-11-152-122/+124
| | | | | | | | | | | | | | | - Argument definitions live in cmdline.py - Parsing and initial processing lives in main.py
* | | Adjust testsAldo Cortesi2014-11-152-9/+9
| | |
* | | Remove sortedcontainers from deps - we don't use itAldo Cortesi2014-11-151-1/+0
| | |
* | | First-order integration of configargparser to add config file supportAldo Cortesi2014-11-156-71/+165
| | |
* | | Some additions to the release checklistAldo Cortesi2014-11-151-0/+15
|/ /
* | always show error messagesMaximilian Hils2014-11-152-2/+2
| |
* | Changelog, plus fix date of previous releaseAldo Cortesi2014-11-151-1/+6
| |
* | bump versionMaximilian Hils2014-11-141-1/+1
| |
* | fix #409Maximilian Hils2014-11-141-1/+5
| |
* | handle script hooks in replay, fix tests, fix #402Maximilian Hils2014-11-143-43/+55
| |