diff options
author | Florian Weimer <fw@deneb.enyo.de> | 2014-11-29 10:36:07 +0000 |
---|---|---|
committer | Florian Weimer <fw@deneb.enyo.de> | 2014-11-29 10:36:07 +0000 |
commit | 47b9cef2f2b41d711be8412f77fc53054910094f (patch) | |
tree | 49d26cf1f5ab4e34a29be65c6349f81d4da4012f /lib | |
parent | 6362596bfe6353e2e6a62d31578661bf54a82da4 (diff) |
lib/python/web_support.py (ThreadingHTTPServer): Actually enable threading
The order of inheritance matters. With the previous order, the threading
mix-in was effectively ignored.
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@30431 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'lib')
-rw-r--r-- | lib/python/web_support.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/web_support.py b/lib/python/web_support.py index 3306883841..dc8181f018 100644 --- a/lib/python/web_support.py +++ b/lib/python/web_support.py @@ -771,8 +771,8 @@ class WebService(Service, WebServiceBase): assert isinstance(r, Result), `r` r.flatten(result.write) -class ThreadingHTTPServer(BaseHTTPServer.HTTPServer, - SocketServer.ThreadingMixIn): +class ThreadingHTTPServer(SocketServer.ThreadingMixIn, + BaseHTTPServer.HTTPServer): pass RE_BASE_URL = re.compile(r'^(https?)://([^/]+)(.*)') |