From d467aabd4c293a85ec288d56978348e40d3b1f60 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Thu, 11 May 2017 18:18:12 +0200 Subject: [PATCH] Rev2067, Fix inner_path stripping --- plugins/Mute/MutePlugin.py | 2 +- src/Config.py | 2 +- src/Ui/UiRequest.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/Mute/MutePlugin.py b/plugins/Mute/MutePlugin.py index fe5968f8..e1d6fb05 100644 --- a/plugins/Mute/MutePlugin.py +++ b/plugins/Mute/MutePlugin.py @@ -146,7 +146,7 @@ class UiRequestPlugin(object): extra_headers = [] self.sendHeader(extra_headers=extra_headers[:]) return iter([super(UiRequestPlugin, self).renderWrapper( - site, path, site.address + "//uimedia/plugins/mute/blacklisted.html?address=" + address, + site, path, "uimedia/plugins/mute/blacklisted.html?address=" + address, "Blacklisted site", extra_headers, show_loadingscreen=False )]) else: diff --git a/src/Config.py b/src/Config.py index ec5367e4..7caa7e31 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.5.4" - self.rev = 2066 + self.rev = 2067 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index 1c0351eb..61a09e56 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -248,10 +248,11 @@ class UiRequest(object): address = re.sub("/.*", "", path.lstrip("/")) if self.isProxyRequest() and (not path or "/" in path[1:]): - file_url = re.sub("^.*?/", "", inner_path) if self.env["HTTP_HOST"] == "zero": root_url = "/" + address + "/" + file_url = "/" + address + "/" + inner_path else: + file_url = "/" + inner_path root_url = "/" else: