aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* always read files in binary modeMaximilian Hils2013-06-169-18/+18
|
* Merge pull request #132 from ipopov/masterAldo Cortesi2013-06-082-8/+9
|\ | | | | A humble pull request
| * Use lsof instead of pfctl to find target host on OSX in transparent mode.Ivaylo Popov2013-05-272-8/+9
| |
* | Massage content-type before sending it to mime detectionAldo Cortesi2013-06-091-0/+1
| | | | | | | | Fixes #67
* | Make UTF environment detection more robust.Aldo Cortesi2013-06-091-2/+4
| | | | | | | | Fixes #125
* | Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
| | | | | | | | Fixes #133
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-06-091-3/+3
|\ \
| * \ Merge pull request #129 from LordMike/masterAldo Cortesi2013-06-081-3/+3
| |\ \ | | |/ | |/| Quick fix for issue #128
| | * - Quick-fix for issue #128Michael Bisbjerg2013-05-211-3/+3
| | | | | | | | | | | | New bug: It correct-cases Content-Length for any webserver sending other casings, like CONTENT-LENGTH.
* | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-05-304-0/+106
|\| |
| * | Merge pull request #131 from squidsoup/masterAldo Cortesi2013-05-272-0/+16
| |\ \ | | |/ | |/| Easy dep install with pip
| | * Added requirements.txt to ease installation of deps for hacking on mitmproxy.Kit Randel2013-05-242-0/+16
| |/
| * Merge pull request #124 from liyanage/masterAldo Cortesi2013-05-152-0/+90
| |\ | | | | | | Add mitmproxywrapper.py script for OS X users
| | * Add mitmproxywrapper.pyMarc Liyanage2013-05-152-0/+90
| |/
* | Update license trove classifier.Aldo Cortesi2013-05-301-1/+1
| |
* | Update PyOpenSSL version requirement.Aldo Cortesi2013-05-202-1/+2
|/
* Make ready for pyinstaller.Aldo Cortesi2013-05-155-2/+39
|
* Contributor sync.Aldo Cortesi2013-05-151-14/+17
|
* Styling.Aldo Cortesi2013-05-151-1/+1
|
* Mods to "How mitmproxy works"Aldo Cortesi2013-05-141-17/+74
|
* README, Linux transparent mode docs, requirements additions.Aldo Cortesi2013-05-145-9/+63
|
* Prin an error when mitmproxy runs in a non-UTF environment.Aldo Cortesi2013-05-131-1/+7
|
* Adapt for new request_client_cert option in netlib.Aldo Cortesi2013-05-132-3/+5
|
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-05-051-2/+5
|\
| * Merge pull request #118 from jasonanovak/protobufsAldo Cortesi2013-05-041-2/+5
| |\ | | | | | | Add error checking to ViewProtobuf
| | * Add error checking to ViewProtobufJason A. Novak2013-04-211-2/+5
| |/ | | | | | | | | | | | | | | There are protobufs that protoc can't parse. When protoc --decode_raw fails, it returns nothing to stdin, and writes "Failed to parse input." to stderr. Before this commit, if protoc --decode_raw couldn't parse the protobuf, the blank stdout output would get returned to the view; with this commit stderr gets caught and returned to the view.
* | Fix crash in client playback.Aldo Cortesi2013-05-054-8/+16
| |
* | Minor coverage.Aldo Cortesi2013-04-302-1/+2
| |
* | Adapt docs for website embedding.Aldo Cortesi2013-04-303-3/+6
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-193-2/+58
|\ | | | | Adding remote TCP and SSL setup timestamps
| * adding tcp and ssl setup timestamps to get better resolution on flows ↵Rouli2013-03-193-2/+53
| | | | | | | | performance
| * Merge remote-tracking branch 'upstream/master'Rouli2013-03-1858-2369/+1060
| |\
| * \ Merge remote-tracking branch 'upstream/master'Rouli2013-02-2817-410/+628
| |\ \
| * | | adding __str__ to make export to har nicerRouli2013-02-281-0/+5
| | | |
* | | | Merge pull request #112 from hamstah/protobuf-viewAldo Cortesi2013-04-193-1/+46
|\ \ \ \ | | | | | | | | | | Adds a new view for protocol buffers
| * | | | Adds a new view for protocol buffersNicolas Esteves2013-04-063-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view uses protoc from the Google protocol buffer tools. If the tool isn't installed, the view isn't shown. Google protobuf repo: https://code.google.com/p/protobuf/
* | | | | Merge pull request #113 from mhils/redirect_exampleAldo Cortesi2013-04-191-0/+19
|\ \ \ \ \ | | | | | | | | | | | | Add redirect example
| * | | | | Add redirect exampleMaximilian Hils2013-04-071-0/+19
| |/ / / /
* | | | | Merge pull request #116 from afh/pull/highlight_key_helpAldo Cortesi2013-04-193-3/+11
|\ \ \ \ \ | |/ / / / |/| | | | Correct display mode highlight keys
| * | | | Correct display mode highlight keysAlexis Hildebrandt2013-04-163-3/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | Add html display mode to the help documentation. Correct html and hex display mode highlight keys (help used 'h' for hex). Correct json display mode highlight keys.
* | | | Merge pull request #101 from eentzel/keep-blank-paramsAldo Cortesi2013-04-043-3/+5
|\ \ \ \ | | | | | | | | | | Keep blank URL parameters
| * | | | Keep blank URL parametersEric Entzel2013-02-113-3/+5
| |/ / / | | | | | | | | | | | | TODO: This should probably be configurable
* | | | Docs.Aldo Cortesi2013-04-054-104/+61
| | | |
* | | | Add a basic built-in web app.Aldo Cortesi2013-03-256-10/+68
| | | |
* | | | Trim docs.Aldo Cortesi2013-03-232-24/+6
| | | |
* | | | Fix crash on intercept.Aldo Cortesi2013-03-231-2/+2
| |_|/ |/| | | | | | | | Fixes #106
* | | GPLv3 -> MITAldo Cortesi2013-03-181-690/+19
| | |
* | | Update styling, GameCenter highscore tutorial.Aldo Cortesi2013-03-1812-49/+125
| | |
* | | Un-break unit tests. Tsk tsk.Aldo Cortesi2013-03-172-2/+5
| | |
* | | Enable --host option for mitmdumpAldo Cortesi2013-03-171-5/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 09:47:25 +0000