Maximilian Hils
ca9740df20
skip tests on windows that don't make sense
2013-06-18 00:53:38 +02:00
Maximilian Hils
d462b444b7
update tests to reflect changes to options.scripts
2013-06-17 16:48:06 +02:00
Maximilian Hils
84248d431b
fix send_error behavior if there are no headers
2013-06-17 10:52:19 +02:00
Maximilian Hils
fd36142018
Merge remote-tracking branch 'origin/scripts_improvements' into 0.10
2013-06-16 00:41:43 +02:00
Aldo Cortesi
34f286df51
Merge pull request #136 from mhils/fix_binary_rw
...
always read files in binary mode
2013-06-15 15:31:36 -07:00
Maximilian Hils
ba47690a03
always read files in binary mode
2013-06-16 00:23:44 +02:00
Maximilian Hils
b4f6f09c83
update test script
2013-06-16 00:10:53 +02:00
Maximilian Hils
2b4af8d475
add support for multiple scripts and script arguments. refs #76
2013-06-13 16:09:38 +02:00
Aldo Cortesi
d3beaa7382
Merge pull request #132 from ipopov/master
...
A humble pull request
2013-06-08 16:28:47 -07:00
Aldo Cortesi
1a5c27aa7d
Massage content-type before sending it to mime detection
...
Fixes #67
2013-06-09 11:26:44 +12:00
Aldo Cortesi
9f6657727b
Make UTF environment detection more robust.
...
Fixes #125
2013-06-09 11:20:02 +12:00
Aldo Cortesi
7ef68b5a13
Fix creation of new response when none existed before.
...
Fixes #133
2013-06-09 11:14:34 +12:00
Aldo Cortesi
19279033b3
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-06-09 10:47:39 +12:00
Aldo Cortesi
0b5423f6a1
Merge pull request #129 from LordMike/master
...
Quick fix for issue #128
2013-06-08 15:46:24 -07:00
Aldo Cortesi
ebf0aaa3db
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-05-30 09:22:16 +12:00
Aldo Cortesi
df7c7796b2
Update license trove classifier.
2013-05-30 09:22:00 +12:00
Ivaylo Popov
ffeede9b39
Use lsof instead of pfctl to find target host on OSX in transparent mode.
2013-05-27 23:09:42 -04:00
Aldo Cortesi
82cb1dae41
Merge pull request #131 from squidsoup/master
...
Easy dep install with pip
2013-05-27 03:11:05 -07:00
Kit Randel
aaba1bd7d1
Added requirements.txt to ease installation of deps for hacking on mitmproxy.
2013-05-24 15:23:47 +12:00
Michael Bisbjerg
125b3e5e5b
- Quick-fix for issue #128
...
New bug: It correct-cases Content-Length for any webserver sending other casings, like CONTENT-LENGTH.
2013-05-21 15:57:14 +02:00
Aldo Cortesi
8608cdf177
Update PyOpenSSL version requirement.
2013-05-20 12:44:07 +12:00
Aldo Cortesi
3460d56fcc
Merge pull request #124 from liyanage/master
...
Add mitmproxywrapper.py script for OS X users
2013-05-15 16:11:40 -07:00
Marc Liyanage
50ac988363
Add mitmproxywrapper.py
2013-05-15 15:24:34 -07:00
Aldo Cortesi
9e94fdc6db
Make ready for pyinstaller.
2013-05-15 11:25:25 +12:00
Aldo Cortesi
52b56e23b2
Contributor sync.
2013-05-15 09:56:14 +12:00
Aldo Cortesi
2dfff2a75f
Styling.
2013-05-15 09:23:25 +12:00
Aldo Cortesi
36b07264f0
Mods to "How mitmproxy works"
2013-05-14 22:44:11 +12:00
Aldo Cortesi
b5cf3b4f74
README, Linux transparent mode docs, requirements additions.
2013-05-14 09:12:26 +12:00
Aldo Cortesi
d86b7c7f77
Prin an error when mitmproxy runs in a non-UTF environment.
2013-05-13 21:41:16 +12:00
Aldo Cortesi
11cc48ca25
Adapt for new request_client_cert option in netlib.
2013-05-13 09:08:24 +12:00
Aldo Cortesi
bc88930fb7
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-05-05 13:19:14 +12:00
Aldo Cortesi
9fa09cc1f9
Fix crash in client playback.
2013-05-05 13:18:52 +12:00
Aldo Cortesi
69a40c8179
Merge pull request #118 from jasonanovak/protobufs
...
Add error checking to ViewProtobuf
2013-05-04 17:37:32 -07:00
Aldo Cortesi
5cd7563d12
Minor coverage.
2013-04-30 09:13:33 +12:00
Aldo Cortesi
98b860b0f7
Adapt docs for website embedding.
2013-04-30 09:12:06 +12:00
Jason A. Novak
f78dada550
Add error checking to ViewProtobuf
...
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.
2013-04-21 12:46:37 -05:00
Aldo Cortesi
61c794e08f
Merge pull request #107 from rouli/master
...
Adding remote TCP and SSL setup timestamps
2013-04-19 17:19:26 -07:00
Aldo Cortesi
793c41a5c4
Merge pull request #112 from hamstah/protobuf-view
...
Adds a new view for protocol buffers
2013-04-19 17:18:44 -07:00
Aldo Cortesi
7c4c6f5912
Merge pull request #113 from mhils/redirect_example
...
Add redirect example
2013-04-19 17:17:59 -07:00
Aldo Cortesi
7bd3e1d2a4
Merge pull request #116 from afh/pull/highlight_key_help
...
Correct display mode highlight keys
2013-04-19 17:17:32 -07:00
Alexis Hildebrandt
3d7f31b23d
Correct display mode highlight keys
...
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.
2013-04-16 23:54:34 +02:00
Maximilian Hils
7a7914463f
Add redirect example
2013-04-07 19:16:01 +02:00
Nicolas Esteves
d4cfbbb822
Adds a new view for protocol buffers
...
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/
2013-04-06 19:21:13 +01:00
Aldo Cortesi
51b775cfd4
Merge pull request #101 from eentzel/keep-blank-params
...
Keep blank URL parameters
2013-04-04 15:55:51 -07:00
Aldo Cortesi
ca9c60d2eb
Docs.
2013-04-05 11:55:28 +13:00
Aldo Cortesi
e3fd0e838d
Add a basic built-in web app.
2013-03-25 09:20:26 +13:00
Aldo Cortesi
98e4421a90
Trim docs.
2013-03-23 15:42:25 +13:00
Aldo Cortesi
800af34763
Fix crash on intercept.
...
Fixes #106
2013-03-23 14:40:03 +13:00
Rouli
c6bf28f3f7
adding tcp and ssl setup timestamps to get better resolution on flows performance
2013-03-19 18:21:52 +02:00
Rouli
c94aadcb0e
Merge remote-tracking branch 'upstream/master'
2013-03-18 14:24:13 +02:00
