aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #180 from mitmproxy/add_serverconnection_scripthookAldo Cortesi2013-12-082-0/+8
|\
| * add serverconnect script hookMaximilian Hils2013-11-182-0/+8
* | Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssueAldo Cortesi2013-12-081-1/+1
|\ \
| * | Fix divide by zero issue when timestamp start and end are the sameRich Somerfield2013-11-261-1/+1
| |/
* / attempt to fix https://github.com/mitmproxy/netlib/issues/24Maximilian Hils2013-11-191-2/+2
|/
* Version bump.Aldo Cortesi2013-08-251-1/+1
* Tweak timing displayAldo Cortesi2013-08-234-10/+10
* console: Add support for displaying transfer rateKyle Manna2013-08-131-0/+3
* console: Add support for displaying elapsed timeKyle Manna2013-08-132-1/+9
* utils: Add missing "B" for pretty_size()Kyle Manna2013-08-131-1/+1
* Revamp dummy cert storeAldo Cortesi2013-08-121-18/+4
* Better handling of cert errors on connection.Aldo Cortesi2013-08-101-1/+1
* Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-0117-255/+2
* Make use of a change to netlib.tcp that clarifies error conditions for flush ...Aldo Cortesi2013-07-301-5/+2
* Show an error when attempting to decode invalid data.Aldo Cortesi2013-07-292-3/+10
* Repair minor user interface issue that caused brief flashes of duplicate flow...Aldo Cortesi2013-07-291-0/+2
* fix #144Maximilian Hils2013-07-281-1/+1
* Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
* Terminate can be called on an unconnected server connection.Aldo Cortesi2013-07-281-8/+9
* Some refactoring of the console inteface.Aldo Cortesi2013-07-284-33/+29
* Properly terminate SSL server connections.Aldo Cortesi2013-07-281-1/+3
* Move app instantiation out of proxy.py.Aldo Cortesi2013-07-245-19/+45
* Make a start on mitmproxy web app.Aldo Cortesi2013-07-2311-2/+198
* Don't take minor version into account when checking serialized data compatibl...Aldo Cortesi2013-07-132-2/+3
* Merge pull request #137 from caujka/masterAldo Cortesi2013-07-011-1/+1
|\
| * Added handling for EOF reading error in gzipped content.Oleksandr Sheremet2013-06-171-1/+1
* | proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
* | Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
|/
* Revert "Use lsof instead of pfctl to find target host on OSX in transparent m...Aldo Cortesi2013-06-162-9/+8
* Version bump, doc extension, URLs to github.com/mitmproxy/*Aldo Cortesi2013-06-161-1/+1
* always read files in binary modeMaximilian Hils2013-06-164-5/+5
* Merge pull request #132 from ipopov/masterAldo Cortesi2013-06-082-8/+9
|\
| * 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
* | Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
* | - Quick-fix for issue #128Michael Bisbjerg2013-05-211-3/+3
|/
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-05-051-2/+5
|\
| * Add error checking to ViewProtobufJason A. Novak2013-04-211-2/+5
* | Fix crash in client playback.Aldo Cortesi2013-05-051-0/+1
* | Minor coverage.Aldo Cortesi2013-04-301-1/+0
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-192-2/+30
|\
| * adding tcp and ssl setup timestamps to get better resolution on flows perform...Rouli2013-03-192-2/+25
| * Merge remote-tracking branch 'upstream/master'Rouli2013-03-1811-307/+154
| |\
| * \ Merge remote-tracking branch 'upstream/master'Rouli2013-02-286-195/+250
| |\ \
| * | | adding __str__ to make export to har nicerRouli2013-02-281-0/+5
* | | | Merge pull request #112 from hamstah/protobuf-viewAldo Cortesi2013-04-191-1/+36
|\ \ \ \
| * | | | Adds a new view for protocol buffersNicolas Esteves2013-04-061-1/+36
* | | | | Correct display mode highlight keysAlexis Hildebrandt2013-04-163-3/+11
|/ / / /
* | | | Merge pull request #101 from eentzel/keep-blank-paramsAldo Cortesi2013-04-041-1/+1
|\ \ \ \
| * | | | Keep blank URL parametersEric Entzel2013-02-111-1/+1
| |/ / /