Commit 9a1697da authored by Jim Fulton's avatar Jim Fulton

Fixed a bug in computing the base path that caused REQUEST['URLx'] to

fail in some cases when it shouldn't in ZServer.
parent d5c2cc41
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
# attributions are listed in the accompanying credits file. # attributions are listed in the accompanying credits file.
# #
############################################################################## ##############################################################################
__version__='$Revision: 1.5 $'[11:-2] __version__='$Revision: 1.6 $'[11:-2]
import regex, sys, os import regex, sys, os
from string import lower, atoi, rfind, split, strip, join, upper, find from string import lower, atoi, rfind, split, strip, join, upper, find
...@@ -318,7 +318,8 @@ class HTTPRequest(BaseRequest): ...@@ -318,7 +318,8 @@ class HTTPRequest(BaseRequest):
if server_url[-1:]=='/': server_url=server_url[:-1] if server_url[-1:]=='/': server_url=server_url[:-1]
self.base="%s/%s" % (server_url,b) if b: self.base="%s/%s" % (server_url,b)
else: self.base=server_url
while script[:1]=='/': script=script[1:] while script[:1]=='/': script=script[1:]
if script: script="%s/%s" % (server_url,script) if script: script="%s/%s" % (server_url,script)
else: script=server_url else: script=server_url
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment