merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -17,6 +17,7 @@ Fixed:
 - use supplied content-type on file uploads before trying filename)
 - fixed roundup-reminder script to use default schema (thanks Klamer Schutte)
 - fixed edit action / parsePropsFromForm to handle index-page edits better
+- safer logging from HTTP server (sf bug 896917)
 
 
 2003-12-17 0.6.4

roundup/scripts/roundup_server.py

@@ -16,7 +16,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup_server.py,v 1.26.2.4 2003-12-04 22:53:54 richard Exp $
+$Id: roundup_server.py,v 1.26.2.5 2004-02-15 22:22:20 richard Exp $
 """
 
 # python version check
@@ -215,6 +215,16 @@ def address_string(self):
             host, port = self.client_address
             return socket.getfqdn(host)
 
+    def log_message(self, format, *args):
+        ''' Try to *safely* log to stderr.
+        '''
+        try:
+            BaseHTTPServer.BaseHTTPRequestHandler.log_message(self,
+                format, *args)
+        except IOError:
+            # stderr is no longer viable
+            pass
+
 try:
     import win32serviceutil
 except: