aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #170 from jsoriano/masterAldo Cortesi2013-12-081-20/+17
|\
| * New method establish_ssl to avoid duplicated codeJaime Soriano Pastor2013-09-261-29/+15
| * Reverse proxy works with SSLJaime Soriano Pastor2013-09-261-2/+13
* | Remove obsolete test.Aldo Cortesi2013-12-081-10/+0
* | 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
* | | | Add a note to the docs about pf redirection of traffic from the host itself.Aldo Cortesi2013-12-081-0/+12
* | | | Merge branch 'fix_invalid_tcp_close'Aldo Cortesi2013-12-084-3/+25
|\ \ \ \ | |/ / / |/| | |
| * | | attempt to fix https://github.com/mitmproxy/netlib/issues/24Maximilian Hils2013-11-191-2/+2
| |/ /
| * | add status images to README, include TestHTTPS againMaximilian Hils2013-08-252-1/+3
| * | exclude TestHTTPS for testing travis/coverageMaximilian Hils2013-08-251-1/+1
| * | fix travis, loose requirements.txtMaximilian Hils2013-08-252-15/+16
| * | re-add requirements.txtMaximilian Hils2013-08-251-0/+15
| * | add coveralls.ioMaximilian Hils2013-08-251-1/+5
| |/
* | Merge pull request #173 from joebowbeer/patch-1Maximilian Hils2013-10-221-4/+3
|\ \ | |/ |/|
| * Update android.htmljoebowbeer2013-10-181-4/+3
|/
* Version bump.Aldo Cortesi2013-08-251-1/+1
* Prep for release: CHANGELOG and CONTRIBUTORSAldo Cortesi2013-08-254-36/+53
* Merge pull request #162 from mhils/add_travis_ciAldo Cortesi2013-08-222-0/+11
|\
| * add jsbeautifier to requirements.txtMaximilian Hils2013-08-201-0/+1
| * travis ci: fix pip install orderMaximilian Hils2013-08-201-1/+1
| * travis ci: make sure that netlib is installed from headMaximilian Hils2013-08-201-1/+4
| * add travis ciMaximilian Hils2013-08-201-0/+7
* | Fix pretty_size unit tests.Aldo Cortesi2013-08-231-1/+1
* | Tweak timing displayAldo Cortesi2013-08-234-10/+10
* | Merge pull request #159 from kmanna/elapsed_timeAldo Cortesi2013-08-223-2/+13
|\ \ | |/ |/|
| * 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
* | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-08-172-22/+5
|\|
| * Revamp dummy cert storeAldo Cortesi2013-08-122-21/+4
| * Better handling of cert errors on connection.Aldo Cortesi2013-08-101-1/+1
* | update gitignore to not include PyCharmsMaximilian Hils2013-08-171-0/+1
|/
* Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-0119-287/+2
* Make use of a change to netlib.tcp that clarifies error conditions for flush ...Aldo Cortesi2013-07-302-6/+3
* 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-285-34/+30
* Properly terminate SSL server connections.Aldo Cortesi2013-07-281-1/+3
* Move app instantiation out of proxy.py.Aldo Cortesi2013-07-248-24/+57
* 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 #143 from liyanage/upstream-pull-request-2013-07-07Aldo Cortesi2013-07-111-16/+70
|\
| * Pass extra command line arguments to mitmproxyMarc Liyanage2013-07-081-5/+13
| * Re-run mitmproxywrapper.py with sudo if necessary.Marc Liyanage2013-06-021-0/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 15:00:11 +0000