Maximilian Hils
07b60acb7f
try to fix appveyor race conditions in tests
2015-11-01 18:44:50 +01:00
Maximilian Hils
1bf34e6f45
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-11-01 18:39:55 +01:00
Maximilian Hils
978eb17d66
fix #811
2015-11-01 18:37:20 +01:00
Maximilian Hils
5e90459569
Merge pull request #810 from gecko655/ctrl_fb
...
Use ctrl+f and ctrl+b to scroll a page
2015-10-31 18:00:14 +01:00
gecko655
6aa7454f92
Use ctrl+f and ctrl+b to scroll a page
2015-10-30 12:48:38 +09:00
Chris Czub
88451ef245
Declare & define insufficient_priv
2015-10-29 16:01:24 -04:00
Chris Czub
70c28f5d34
Better error handling/reporting for pfctl failures on OS X
2015-10-29 15:56:43 -04:00
Maximilian Hils
65c08ec899
Merge pull request #791 from tunz/master
...
Prevent flowview from creating duplicated windows
2015-10-28 13:10:38 +01:00
Maximilian Hils
8e9cd77b55
Merge pull request #805 from Badg/patch-1
...
Update ubuntu installation to includ libjpeg
2015-10-23 03:25:23 +02:00
Nick Badger
4537d561c6
Ubuntu install missing libjpeg8-dev, zlib1g-dev
...
As per https://pillow.readthedocs.org/en/3.0.0/installation.html#linux-installation , to avoid missing install dependencies.
2015-10-22 18:11:06 -07:00
Nick Badger
a6fee43384
Update ubuntu installation to includ libjpeg
...
Otherwise install fails with error "--enable-jpeg requested but jpeg not found"
2015-10-22 17:38:55 -07:00
Maximilian Hils
ed56eadd28
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-10-22 02:38:14 +02:00
Maximilian Hils
726b70ccdc
fix #800
2015-10-22 02:38:00 +02:00
Maximilian Hils
4d772d7ce0
Merge pull request #801 from ben-lerner/doc_fix
...
doc typo fix
2015-10-14 09:37:24 +02:00
Ben Lerner
22191d63ab
doc typo fix
2015-10-13 21:09:56 -04:00
Maximilian Hils
7d8191ee37
update web builds, use watchify
2015-10-08 12:43:55 +02:00
Maximilian Hils
442f079e0b
Merge pull request #797 from colinbendell/colinbendell-patch-1
...
server_conn.address might not yet be established
2015-10-08 12:37:43 +02:00
Choongwoo Han
9c0efdf2ec
Refresh flowview instead of reopen the same flowview
2015-10-08 11:31:33 +09:00
Colin Bendell
a85e4bc75c
default should not be None
...
Fixed default value when self.address has not been set
2015-10-07 21:46:08 -04:00
Colin Bendell
77aeac11a9
Check if server connection hasn't yet been initiated
...
This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated.
2015-10-07 20:30:31 -04:00
Maximilian Hils
09e36fae4e
Merge pull request #792 from tunz/patch-1
...
Correct a wrong link in CONTRIBUTING.md
2015-10-04 10:36:52 +02:00
Choongwoo Han
3ffc3404b0
Update CONTRIBUTING.md
...
Wrong link
2015-10-04 14:49:41 +09:00
Choongwoo Han
45494d1c79
Prevent flowview from creating duplicated windows
2015-10-04 14:21:51 +09:00
Maximilian Hils
ce38a05a20
Merge remote-tracking branch 'origin/master'
2015-10-03 23:59:13 +02:00
Maximilian Hils
26631621ee
fix #786
2015-10-03 14:48:51 +02:00
Maximilian Hils
d67f4fa3cc
Merge pull request #788 from sethp-jive/patch-1
...
Allow reading scripts from an anonymous pipe
2015-10-01 00:59:25 +02:00
sethp-jive
fd8c921a2f
Allow reading scripts from an anonymous pipe
...
Bash (and many other shells) provide a nifty feature in "anonymous pipe" or "anonymous fifo" whereby the output of a subshell may be treated as a simple file by the parent shell: http://unix.stackexchange.com/a/156088
Unfortunately, libmproxy complains because that "file" is not a regular file, as os.path.isfile checks, e.g. giving the error "Not a file: /dev/fd/11". This patch is intended to provide for the following use-case:
```
mitmdump -s <(echo "def response(context, flow):\n flow.response.headers['newheader'] = [`hostname`]")
```
where `hostname` may be replaced with a more complicated lookup.
2015-09-30 15:55:43 -07:00
Maximilian Hils
c6811bd0e8
fix #773
2015-09-28 14:55:13 +02:00
Maximilian Hils
86ef19b450
fix tests
2015-09-28 14:04:41 +02:00
Maximilian Hils
c11ab3676d
Merge branch 'http-models'
2015-09-28 13:54:53 +02:00
Maximilian Hils
6661770d4e
handle Expect: 100-continue header, fix #770
2015-09-28 10:59:10 +02:00
Maximilian Hils
6075957a97
move tests to netlib
2015-09-27 00:50:14 +02:00
Maximilian Hils
1b6ea5caf3
adjust to netlib response changes + docs
2015-09-26 17:41:14 +02:00
Maximilian Hils
b13acd7956
adjust to netlib request changes + docs
2015-09-26 01:23:59 +02:00
Maximilian Hils
a978c6b9ce
fix tests
2015-09-21 23:39:22 +02:00
Maximilian Hils
2536e1d3e7
appveyor: use py.test
2015-09-21 23:05:12 +02:00
Maximilian Hils
bba5ec7144
experimental: run tests using py.tests
2015-09-21 18:31:30 +02:00
Maximilian Hils
88375ad64a
fix minor bugs, add py.test compatibility
2015-09-21 02:26:47 +02:00
Maximilian Hils
6d27901b6f
fix replay functionality
2015-09-19 11:59:05 +02:00
Maximilian Hils
42bbd3c928
don't cache changed messages, fix #777
2015-09-19 11:50:02 +02:00
Maximilian Hils
fde2420e37
fix #778
2015-09-19 11:18:57 +02:00
Maximilian Hils
2d4a5fb116
experimental: don't interfere with headers, fix #93
2015-09-18 18:07:38 +02:00
Maximilian Hils
66d21fa4ba
trigger inline script hooks for artifical responses, fix #775
2015-09-18 13:51:05 +02:00
Maximilian Hils
5df5ee15f2
remove old server replay workaround, fix #774
2015-09-18 13:27:05 +02:00
Maximilian Hils
906360f63f
code -> status_code, httpversion -> http_version
2015-09-17 15:16:33 +02:00
Maximilian Hils
12984f149c
move body assembly to netlib
2015-09-17 02:40:08 +02:00
Maximilian Hils
14a5f405fd
use new netlib exceptions
2015-09-17 02:13:28 +02:00
Maximilian Hils
8fbed971ae
Merge pull request #768 from mitmproxy/netlib-http1-refactor
...
Adjust to netlib changes
2015-09-16 20:24:48 +02:00
Maximilian Hils
0af0608978
adjust to netlib changes
2015-09-16 18:45:22 +02:00
Maximilian Hils
ee6969c1fa
s/below/above/
2015-09-16 13:40:50 +02:00
