Update of /cvsroot/webware/Webware/WebKit/Adapters
In directory sc8-pr-cvs1:/tmp/cvs-serv4471/Adapters
Modified Files:
HTTPAdapter.py
Log Message:
Fixed HTTPAdapter
Index: HTTPAdapter.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Adapters/HTTPAdapter.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HTTPAdapter.py 27 Jan 2003 16:06:09 -0000 1.2
--- HTTPAdapter.py 23 Aug 2003 23:15:40 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
pass
+ import BaseHTTPServer, threading, socket
***************
*** 43,47 ****
############################################################
! from WebKit.HTTPServer import HTTPHandler, run
class HTTPAdapter(HTTPHandler, Adapter):
--- 44,48 ----
############################################################
! from WebKit.HTTPServer import HTTPHandler
class HTTPAdapter(HTTPHandler, Adapter):
***************
*** 102,106 ****
! def run(serverAddress, klass=HTTPHandler):
httpd = ThreadedHTTPServer(serverAddress, klass)
httpd.serve_forever()
--- 103,107 ----
! def run(serverAddress, klass=HTTPAdapter):
httpd = ThreadedHTTPServer(serverAddress, klass)
httpd.serve_forever()
***************
*** 126,132 ****
opts, args = getopt.getopt(sys.argv[1:], 'p:h:d',
['port=', 'host=', 'daemon'])
! except getopt.GetoptErrro:
print usage
sys.exit(2)
for o, a in opts:
if o in ('-p', '--port'):
--- 127,136 ----
opts, args = getopt.getopt(sys.argv[1:], 'p:h:d',
['port=', 'host=', 'daemon'])
! except getopt.GetoptError:
print usage
sys.exit(2)
+ daemon = 0
+ host = 'localhost'
+ port = 8080
for o, a in opts:
if o in ('-p', '--port'):
***************
*** 140,144 ****
sys.exit(0)
print "PS: This adapter is experimental and should not be used in\na production environment"
! run()
if __name__ == '__main__':
--- 144,161 ----
sys.exit(0)
print "PS: This adapter is experimental and should not be used in\na production environment"
! run((host, port))
!
! def shutDown(arg1, arg2):
! """
! We have to have a shutdown handler, because ThreadedAppServer
! installs one that we have to overwrite.
! """
! import sys
! print 'Shutting down.'
! sys.exit()
!
! import signal
! signal.signal(signal.SIGINT, shutDown)
! signal.signal(signal.SIGTERM, shutDown)
if __name__ == '__main__':
|