517e5e6688
handle a hook changing connection parameters
2013-12-12 09:22:55 +01:00
7b6057fa64
serverconnect hook: Set sc.request
...
The serverconnect hook script might need to examine the incoming request
in order to set up the server connection.
Example use: bind to a distinct source IPv6 address for each client.
2013-12-12 07:56:40 +01:00
39ffe10334
add content-length 0 if we remove header for chunked encoding, fixes #186
2013-12-12 04:42:29 +01:00
4a32a65e0e
change certificate path for android, fix #171
2013-12-12 03:40:23 +01:00
7db1430ee7
ignore missing CN in certificates. fixes #169
2013-12-12 03:24:17 +01:00
28a234e28b
store resolved ip addresses, fixes #187
2013-12-12 02:11:22 +01:00
5f6eca8856
Merge pull request #190 from BillinghamJ/patch-1
...
Added small note of file format
2013-12-11 05:13:25 -08:00
3481c54d02
Added small note of file format
2013-12-11 13:11:19 +00:00
fb985b8b87
Merge remote-tracking branch 'origin/master'
2013-12-11 14:05:18 +01:00
e99eaa3a19
add documentation on how to use custom certificates
2013-12-11 14:04:45 +01:00
a600441e37
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-12-10 22:24:23 +13:00
1bbeace350
Bump version
2013-12-10 22:23:38 +13:00
f0e96be142
ensure binary read on windows
2013-12-10 03:13:37 +01:00
2be19a5620
Merge remote-tracking branch 'origin/master'
2013-12-09 19:10:40 +01:00
4984bbb83b
remove code duplication in ProxyHandler by unifying read_transparent and read_reverse
2013-12-09 19:10:15 +01:00
1d536f64d5
Small workaround to make mitmproxy work again.
...
Further work is required to make scripts work again, though.
2013-12-09 22:34:47 +13:00
3bd238de37
backport changes to fix tests
2013-12-08 15:46:11 +01:00
a509a9037b
Merge branch 'master' into 0.10
2013-12-08 14:14:57 +01:00
4dcb2435fc
Merge remote-tracking branch 'origin/0.10' into 0.10
2013-12-08 14:14:51 +01:00
e3c69fd105
Merge remote-tracking branch 'origin/master'
2013-12-08 14:14:31 +01:00
3a1d85ab18
Merge pull request #134 from mhils/scripts_improvements
...
Support multiple scripts and script arguments. refs #76
2013-12-08 01:14:12 -08:00
7aeaf9d448
Merge pull request #161 from mitmproxy/external_webapp
...
External webapp
2013-12-08 01:09:46 -08:00
73791f986a
Merge pull request #166 from ghjc/forward-proxy
...
Added -F http[s]://server:port option that allows MITM to forward traffi...
2013-12-08 01:05:33 -08:00
4816cae98c
Merge pull request #170 from jsoriano/master
...
Reverse proxy works with SSL
2013-12-08 01:02:17 -08:00
cb3a4a0f3c
Remove obsolete test.
2013-12-08 21:58:55 +13:00
dfcec4ffba
Merge pull request #180 from mitmproxy/add_serverconnection_scripthook
...
Add serverconnection scripthook
2013-12-08 00:55:55 -08:00
83f061c1a0
Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue
...
Fix divide by zero issue when timestamp start and end are the same
2013-12-08 00:54:11 -08:00
925eaa9343
Add a note to the docs about pf redirection of traffic from the host itself.
2013-12-08 21:38:53 +13:00
1e733f3149
Merge branch 'fix_invalid_tcp_close'
2013-12-08 14:32:40 +13:00
594e61c647
Merge branch 'master' into 0.10
2013-12-08 01:44:09 +01:00
948d4c0445
Merge remote-tracking branch 'origin/master'
2013-12-08 01:42:55 +01:00
9a986e0c1b
Fix divide by zero issue when timestamp start and end are the same
2013-11-26 14:14:51 -08:00
d4c3b1c213
attempt to fix https://github.com/mitmproxy/netlib/issues/24
2013-11-19 04:08:16 +01:00
675518f873
add serverconnect script hook
2013-11-18 17:25:52 +01:00
f63380a04e
Merge pull request #173 from joebowbeer/patch-1
...
Update android.html
2013-10-22 05:23:25 -07:00
00a000091e
Update android.html
...
Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png).
/sdcard/Download (singular) is the correct path.
2013-10-18 22:58:06 -07:00
7140323bdb
New method establish_ssl to avoid duplicated code
2013-09-26 12:38:13 +02:00
f33d128a7f
Reverse proxy works with SSL
2013-09-26 12:23:48 +02:00
2956c144d3
Merge branch 'master' into 0.10
2013-09-14 23:47:04 +02:00
65d1ed1b3c
Added -F http[s]://server:port option that allows MITM to forward traffic to another http server upstream.
2013-08-30 17:19:58 -07:00
38a1135ab8
add status images to README, include TestHTTPS again
2013-08-25 04:31:35 +02:00
404445cbdf
exclude TestHTTPS for testing travis/coverage
2013-08-25 04:19:43 +02:00
62fa2e6c07
fix travis, loose requirements.txt
2013-08-25 04:03:53 +02:00
08a26337a0
re-add requirements.txt
2013-08-25 03:53:19 +02:00
63ece45de5
add coveralls.io
2013-08-25 03:45:32 +02:00
8d954d9965
Version bump.
2013-08-25 10:37:35 +12:00
789700ade2
Prep for release: CHANGELOG and CONTRIBUTORS
2013-08-25 10:28:15 +12:00
6a31d32712
Merge pull request #162 from mhils/add_travis_ci
...
Add travis CI
2013-08-22 15:32:39 -07:00
aaba940dea
Fix pretty_size unit tests.
2013-08-23 10:28:16 +12:00
a2643b52f9
Tweak timing display
...
- 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.
2013-08-23 10:25:44 +12:00
Matthias Urlichs