[Secure-testing-commits] r30431 - lib/python

[Florian Weimer]

Author: fw
Date: 2014-11-29 10:36:07 +0000 (Sat, 29 Nov 2014)
New Revision: 30431

Modified:
   lib/python/web_support.py
Log:
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.


Modified: lib/python/web_support.py
===================================================================
--- lib/python/web_support.py	2014-11-29 09:51:01 UTC (rev 30430)
+++ lib/python/web_support.py	2014-11-29 10:36:07 UTC (rev 30431)
@@ -771,8 +771,8 @@
         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?)://([^/]+)(.*)')