Index: net/tools/testserver/testserver.py |
=================================================================== |
--- net/tools/testserver/testserver.py (revision 13436) |
+++ net/tools/testserver/testserver.py (working copy) |
@@ -565,13 +565,15 @@ |
"""This handler sends the contents of the requested file. Wow, it's like |
a real webserver!""" |
- prefix='/files/' |
+ prefix = self.server.file_root_url |
if not self.path.startswith(prefix): |
return False |
file = self.path[len(prefix):] |
entries = file.split('/'); |
path = os.path.join(self.server.data_dir, *entries) |
+ if os.path.isdir(path): |
+ path = os.path.join(path, 'index.html') |
if not os.path.isfile(path): |
print "File not found " + file + " full path:" + path |
@@ -1047,6 +1049,7 @@ |
print 'HTTP server started on port %d...' % port |
server.data_dir = MakeDataDir() |
+ server.file_root_url = options.file_root_url |
MakeDumpDir(server.data_dir) |
# means FTP Server |
@@ -1102,6 +1105,8 @@ |
help='Specify that https should be used, specify ' |
'the path to the cert containing the private key ' |
'the server should use') |
+ option_parser.add_option('', '--file-root-url', default='/files/', |
+ help='Specify a root URL for files served.') |
options, args = option_parser.parse_args() |
sys.exit(main(options, args)) |