Bug 805633 - update mozhttpd on m-c;r=wlach ; DONTBUILD because NPOTB
authorJeff Hammel <jhammel@mozilla.com>
Tue, 13 Nov 2012 16:10:25 -0800
changeset 113173 f69e36294ed762b00c019741467044cfd2ff740f
parent 113172 f0ac91e2b9247ec305b4f0a2bccea0165b12c05c
child 113174 b04cea4ab159c4743f3af55a3d906c099e580228
push id23859
push useremorley@mozilla.com
push dateWed, 14 Nov 2012 14:36:31 +0000
treeherdermozilla-central@87928cd21b40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlach
bugs805633
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 805633 - update mozhttpd on m-c;r=wlach ; DONTBUILD because NPOTB
testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
testing/mozbase/mozhttpd/setup.py
--- a/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
+++ b/testing/mozbase/mozhttpd/mozhttpd/mozhttpd.py
@@ -63,16 +63,20 @@ class Request(object):
 class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 
     docroot = os.getcwd() # current working directory at time of import
     proxy_host_dirs = False
     request_log = []
     log_requests = False
     request = None
 
+    def __init__(self, *args, **kwargs):
+        SimpleHTTPServer.SimpleHTTPRequestHandler.__init__(self, *args, **kwargs)
+        self.extensions_map['.svg'] = 'image/svg+xml'
+
     def _try_handler(self, method):
         if self.log_requests:
             self.request_log.append({ 'method': method,
                                       'path': self.request.path,
                                       'time': time.time() })
 
         handlers = [handler for handler in self.urlhandlers
                     if handler['method'] == method]
--- a/testing/mozbase/mozhttpd/setup.py
+++ b/testing/mozbase/mozhttpd/setup.py
@@ -6,17 +6,17 @@ import os
 from setuptools import setup
 
 try:
     here = os.path.dirname(os.path.abspath(__file__))
     description = file(os.path.join(here, 'README.md')).read()
 except IOError:
     description = None
 
-PACKAGE_VERSION = '0.4'
+PACKAGE_VERSION = '0.5'
 
 deps = []
 
 setup(name='mozhttpd',
       version=PACKAGE_VERSION,
       description="basic python webserver, tested with talos",
       long_description=description,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers