aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* backport changes to fix testsMaximilian Hils2013-12-083-5/+6
|
* Merge branch 'master' into 0.10Maximilian Hils2013-12-086-35/+61
|\
| * Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-0816-98/+162
| |\
| | * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-0812-63/+101
| | |\ | | | | | | | | Support multiple scripts and script arguments. refs #76
| | * \ Merge pull request #166 from ghjc/forward-proxyAldo Cortesi2013-12-082-2/+21
| | |\ \ | | | | | | | | | | Added -F http[s]://server:port option that allows MITM to forward traffi...
| | | * | Added -F http[s]://server:port option that allows MITM to forward traffic to ↵JC2013-08-302-2/+21
| | | | | | | | | | | | | | | | | | | | another http server upstream.
| | * | | Merge pull request #170 from jsoriano/masterAldo Cortesi2013-12-081-20/+17
| | |\ \ \ | | | | | | | | | | | | Reverse proxy works with SSL
| | | * | | 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 serverconnection scripthook
| | | * | | 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 same
| | | * | | | 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
| | | |/ / /
* | | | | | Merge remote-tracking branch 'origin/0.10' into 0.10Maximilian Hils2013-12-085-29/+34
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #161 from mitmproxy/external_webappAldo Cortesi2013-12-085-29/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | External webapp
| | * | | | | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-185-29/+34
| | | | | | | |
* | | | | | | | Merge branch 'master' into 0.10Maximilian Hils2013-12-081-4/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-081-4/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | |
| | * | | | Merge pull request #173 from joebowbeer/patch-1Maximilian Hils2013-10-221-4/+3
| | |\ \ \ \ | | | |_|/ / | | |/| | | Update android.html
| | | * | | Update android.htmljoebowbeer2013-10-181-4/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png). /sdcard/Download (singular) is the correct path.
* | | / / Merge branch 'master' into 0.10Maximilian Hils2013-09-1412-42/+103
|\| | | | | |_|/ / |/| | |
| * | | 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
| |/ /
| * | 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 travis CI
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove elapsed time. Space is at a premium here, and this is somewhat redundant with the rate figure. We should display complete timing information somewhere in the detailed flow view. - Tone down the colour. Reserve highlights for stuff that should really pop out to the user. - Make rate calculation more acurate. Include header sizes. Use response start and end time, rather than request end and response end. This means that we show actual transfer rates, not including DNS requests and so forth.
| * | | Merge pull request #159 from kmanna/elapsed_timeAldo Cortesi2013-08-223-2/+13
| |\ \ \ | | |/ / | |/| | Transfer Rate and Elapsed Time Statistics
| | * | console: Add support for displaying transfer rateKyle Manna2013-08-131-0/+3
| | | | | | | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis.
| | * | console: Add support for displaying elapsed timeKyle Manna2013-08-132-1/+9
| | | | | | | | | | | | | | | | | | | | * Display the elapsed time in the the response row. * Very handy for passive performance analysis.
| | * | utils: Add missing "B" for pretty_size()Kyle Manna2013-08-131-1/+1
| | | | | | | | | | | | | | | | * Add missing unit for megabytes, should print "MB".
* | | | Merge branch 'master' into 0.10Maximilian Hils2013-08-1753-456/+561
|\| | |
| * | | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-08-172-22/+5
| |\| |
| | * | Revamp dummy cert storeAldo Cortesi2013-08-122-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | We no longer keep these on disk. This is for a number of reasons, including some race conditions and the fact that some valid IDNA-encoded domain names are not valid file names on Windows.
| | * | 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
| | | | | | | | | | | | Thanks to Roy Shamir for reporting this.
| * | Make use of a change to netlib.tcp that clarifies error conditions for flush ↵Aldo Cortesi2013-07-302-6/+3
| | | | | | | | | | | | | | | | | | and close. Should fix #144.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 17:03:04 +0000