git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the authentication system extensible.
[plcapi.git]
/
ModPython.py
diff --git
a/ModPython.py
b/ModPython.py
index
79d8fde
..
0d630d7
100644
(file)
--- a/
ModPython.py
+++ b/
ModPython.py
@@
-5,7
+5,8
@@
# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id: ModPython.py,v 1.1 2006/09/06 15:33:59 mlhuang Exp $
+# $Id$
+# $URL$
#
import sys
#
import sys
@@
-45,16
+46,18
@@
def handler(req):
# Handle request
response = api.handle(remote_addr, request)
# Handle request
response = api.handle(remote_addr, request)
+ # Shut down database connection, otherwise up to MaxClients DB
+ # connections will remain open.
+ api.db.close()
+
# Write response
# Write response
- req.content_type = "text/xml"
- req.headers_out.add("Content-type", "text/xml")
- req.headers_out.add("Content-length", str(len(response)))
+ req.content_type = "text/xml; charset=" + api.encoding
req.send_http_header()
req.write(response)
return apache.OK
req.send_http_header()
req.write(response)
return apache.OK
- except:
+ except
Exception, err
:
# Log error in /var/log/httpd/(ssl_)?error_log
# Log error in /var/log/httpd/(ssl_)?error_log
- print >> log, traceback.format_exc()
+ print >> log,
err,
traceback.format_exc()
return apache.HTTP_INTERNAL_SERVER_ERROR
return apache.HTTP_INTERNAL_SERVER_ERROR