| OLD | NEW | 
|---|
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, | 
| 2 # Copyright (C) 2006-2016 Eyeo GmbH | 2 # Copyright (C) 2006-2016 Eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 153         from SocketServer import ThreadingMixIn | 153         from SocketServer import ThreadingMixIn | 
| 154         from wsgiref.simple_server import WSGIServer, make_server | 154         from wsgiref.simple_server import WSGIServer, make_server | 
| 155 | 155 | 
| 156         class ThreadedWSGIServer(ThreadingMixIn, WSGIServer): | 156         class ThreadedWSGIServer(ThreadingMixIn, WSGIServer): | 
| 157             daemon_threads = True | 157             daemon_threads = True | 
| 158 | 158 | 
| 159         def run(host, port, app, **kwargs): | 159         def run(host, port, app, **kwargs): | 
| 160             def wrapper(environ, start_response): | 160             def wrapper(environ, start_response): | 
| 161                 try: | 161                 try: | 
| 162                     return app(environ, start_response) | 162                     return app(environ, start_response) | 
| 163                 except Exception, e: | 163                 except Exception as e: | 
| 164                     return show_error(start_response, '500 Internal Server Error
     ', | 164                     return show_error(start_response, '500 Internal Server Error
     ', | 
| 165                                       uri=environ.get('PATH_INFO'), error=e) | 165                                       uri=environ.get('PATH_INFO'), error=e) | 
| 166 | 166 | 
| 167             server = make_server(host, port, wrapper, ThreadedWSGIServer) | 167             server = make_server(host, port, wrapper, ThreadedWSGIServer) | 
| 168             print ' * Running on http://%s:%i/' % server.server_address | 168             print ' * Running on http://%s:%i/' % server.server_address | 
| 169             server.serve_forever() | 169             server.serve_forever() | 
| 170 | 170 | 
| 171     run(address, port, handler, use_reloader=True, use_debugger=True) | 171     run(address, port, handler, use_reloader=True, use_debugger=True) | 
| OLD | NEW | 
|---|