Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | - Quick-fix for issue #128 | Michael Bisbjerg | 2013-05-21 | 1 | -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/mitmproxy | Aldo Cortesi | 2013-05-30 | 4 | -0/+106 | |
|\| | | | | ||||||
| * | | | | Merge pull request #131 from squidsoup/master | Aldo Cortesi | 2013-05-27 | 2 | -0/+16 | |
| |\ \ \ \ | | |/ / / | |/| | | | Easy dep install with pip | |||||
| | * | | | Added requirements.txt to ease installation of deps for hacking on mitmproxy. | Kit Randel | 2013-05-24 | 2 | -0/+16 | |
| |/ / / | ||||||
| * | | | Merge pull request #124 from liyanage/master | Aldo Cortesi | 2013-05-15 | 2 | -0/+90 | |
| |\ \ \ | | | |/ | | |/| | Add mitmproxywrapper.py script for OS X users | |||||
| | * | | Add mitmproxywrapper.py | Marc Liyanage | 2013-05-15 | 2 | -0/+90 | |
| |/ / | ||||||
* | | | Update license trove classifier. | Aldo Cortesi | 2013-05-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Update PyOpenSSL version requirement. | Aldo Cortesi | 2013-05-20 | 2 | -1/+2 | |
|/ / | ||||||
* | | Make ready for pyinstaller. | Aldo Cortesi | 2013-05-15 | 5 | -2/+39 | |
| | | ||||||
* | | Contributor sync. | Aldo Cortesi | 2013-05-15 | 1 | -14/+17 | |
| | | ||||||
* | | Styling. | Aldo Cortesi | 2013-05-15 | 1 | -1/+1 | |
| | | ||||||
* | | Mods to "How mitmproxy works" | Aldo Cortesi | 2013-05-14 | 1 | -17/+74 | |
| | | ||||||
* | | README, Linux transparent mode docs, requirements additions. | Aldo Cortesi | 2013-05-14 | 5 | -9/+63 | |
| | | ||||||
* | | Prin an error when mitmproxy runs in a non-UTF environment. | Aldo Cortesi | 2013-05-13 | 1 | -1/+7 | |
| | | ||||||
* | | Adapt for new request_client_cert option in netlib. | Aldo Cortesi | 2013-05-13 | 2 | -3/+5 | |
| | | ||||||
* | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-05-05 | 1 | -2/+5 | |
|\ \ | ||||||
| * \ | Merge pull request #118 from jasonanovak/protobufs | Aldo Cortesi | 2013-05-04 | 1 | -2/+5 | |
| |\ \ | | |/ | |/| | Add error checking to ViewProtobuf | |||||
| | * | Add error checking to ViewProtobuf | Jason A. Novak | 2013-04-21 | 1 | -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 Cortesi | 2013-05-05 | 4 | -8/+16 | |
| | | ||||||
* | | Minor coverage. | Aldo Cortesi | 2013-04-30 | 2 | -1/+2 | |
| | | ||||||
* | | Adapt docs for website embedding. | Aldo Cortesi | 2013-04-30 | 3 | -3/+6 | |
|/ | ||||||
* | Merge pull request #107 from rouli/master | Aldo Cortesi | 2013-04-19 | 3 | -2/+58 | |
|\ | | | | | Adding remote TCP and SSL setup timestamps | |||||
| * | adding tcp and ssl setup timestamps to get better resolution on flows ↵ | Rouli | 2013-03-19 | 3 | -2/+53 | |
| | | | | | | | | performance | |||||
| * | Merge remote-tracking branch 'upstream/master' | Rouli | 2013-03-18 | 58 | -2369/+1060 | |
| |\ | ||||||
| * \ | Merge remote-tracking branch 'upstream/master' | Rouli | 2013-02-28 | 17 | -410/+628 | |
| |\ \ | ||||||
| * | | | adding __str__ to make export to har nicer | Rouli | 2013-02-28 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Merge pull request #112 from hamstah/protobuf-view | Aldo Cortesi | 2013-04-19 | 3 | -1/+46 | |
|\ \ \ \ | | | | | | | | | | | Adds a new view for protocol buffers | |||||
| * | | | | Adds a new view for protocol buffers | Nicolas Esteves | 2013-04-06 | 3 | -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_example | Aldo Cortesi | 2013-04-19 | 1 | -0/+19 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add redirect example | |||||
| * | | | | | Add redirect example | Maximilian Hils | 2013-04-07 | 1 | -0/+19 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #116 from afh/pull/highlight_key_help | Aldo Cortesi | 2013-04-19 | 3 | -3/+11 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Correct display mode highlight keys | |||||
| * | | | | Correct display mode highlight keys | Alexis Hildebrandt | 2013-04-16 | 3 | -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-params | Aldo Cortesi | 2013-04-04 | 3 | -3/+5 | |
|\ \ \ \ | | | | | | | | | | | Keep blank URL parameters | |||||
| * | | | | Keep blank URL parameters | Eric Entzel | 2013-02-11 | 3 | -3/+5 | |
| |/ / / | | | | | | | | | | | | | TODO: This should probably be configurable | |||||
* | | | | Docs. | Aldo Cortesi | 2013-04-05 | 4 | -104/+61 | |
| | | | | ||||||
* | | | | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 6 | -10/+68 | |
| | | | | ||||||
* | | | | Trim docs. | Aldo Cortesi | 2013-03-23 | 2 | -24/+6 | |
| | | | | ||||||
* | | | | Fix crash on intercept. | Aldo Cortesi | 2013-03-23 | 1 | -2/+2 | |
| |_|/ |/| | | | | | | | | Fixes #106 | |||||
* | | | GPLv3 -> MIT | Aldo Cortesi | 2013-03-18 | 1 | -690/+19 | |
| | | | ||||||
* | | | Update styling, GameCenter highscore tutorial. | Aldo Cortesi | 2013-03-18 | 12 | -49/+125 | |
| | | | ||||||
* | | | Un-break unit tests. Tsk tsk. | Aldo Cortesi | 2013-03-17 | 2 | -2/+5 | |
| | | | ||||||
* | | | Enable --host option for mitmdump | Aldo Cortesi | 2013-03-17 | 1 | -5/+6 | |
| | | | ||||||
* | | | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 9 | -8/+56 | |
| | | | | | | | | | | | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | |||||
* | | | Fix bug that caused mis-identification of some HTTPS connections in ↵ | Aldo Cortesi | 2013-03-17 | 1 | -10/+11 | |
| | | | | | | | | | | | | transparent mode. | |||||
* | | | Add filter to mitmdump examples. | Aldo Cortesi | 2013-03-17 | 1 | -4/+18 | |
| | | | ||||||
* | | | Update Android cert install documents. | Aldo Cortesi | 2013-03-17 | 1 | -18/+11 | |
| | | | ||||||
* | | | Add instructions for installing the CA in the IOS Simulator. | Aldo Cortesi | 2013-03-17 | 5 | -18/+41 | |
| | | | ||||||
* | | | Update CONTRIBUTORS. | Aldo Cortesi | 2013-03-17 | 1 | -18/+32 | |
| | | | ||||||
* | | | Fix typo in setup.py | Aldo Cortesi | 2013-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | Fixes #105 | |||||
* | | | Introduce a filtered flow writer, and use it in dump.py | Aldo Cortesi | 2013-03-14 | 9 | -18/+48 | |
| | | | | | | | | | | | | Fixes #104 |