Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into issue-4178-passphrase

Browse Source
This commit is contained in:
mirosyn 2020-08-31 09:10:38 +03:00 committed by GitHub
commit 99dc31a73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -12,6 +12,7 @@ Unreleased: mitmproxy next
* Revamp onboarding app (@mhils) * Revamp onboarding app (@mhils)
* Add ASGI support for embedded apps (@mhils) * Add ASGI support for embedded apps (@mhils)
* Updated raw exports to not remove headers (@wchasekelley) * Updated raw exports to not remove headers (@wchasekelley)
* Fix file unlinking before external viewer finishes loading (@wchasekelley)
* Add --cert-passphrase command line argument (@mirosyn) * Add --cert-passphrase command line argument (@mirosyn)
* --- TODO: add new PRs above this line --- * --- TODO: add new PRs above this line ---

5
mitmproxy/tools/console/master.py
View File

@ -11,6 +11,7 @@ import sys
import tempfile import tempfile
import typing # noqa import typing # noqa
import contextlib import contextlib
import threading
import urwid import urwid
@ -171,7 +172,9 @@ class ConsoleMaster(master.Master):
signals.status_message.send( signals.status_message.send(
message="Can't start external viewer: %s" % " ".join(c) message="Can't start external viewer: %s" % " ".join(c)
) )
os.unlink(name) # add a small delay before deletion so that the file is not removed before being loaded by the viewer
t = threading.Timer(1.0, os.unlink, args=[name])
t.start()
def set_palette(self, opts, updated): def set_palette(self, opts, updated):
self.ui.register_palette( self.ui.register_palette(