Merged fix for bug #1896 from 2.3 branch

ZServer/medusa/http_server.py

@@ -6,7 +6,7 @@
 #                        All Rights Reserved.
 #
 
-RCS_ID =  '$Id: http_server.py,v 1.19 2000/08/23 20:39:26 brian Exp $'
+RCS_ID =  '$Id: http_server.py,v 1.20 2001/02/13 21:18:54 brian Exp $'
 
 # python modules
 import os
@@ -258,10 +258,11 @@ class http_request:
             self.channel.close_when_done()
 
     def log_date_string (self, when):
-		return time.strftime (
-			'%d/%b/%Y:%H:%M:%S ',
-			time.localtime(when)
-			) + tz_for_log
+        logtime=time.localtime(when)
+        return time.strftime('%d/', logtime) + \
+               http_date.monthname[logtime[1]] + \
+               time.strftime('/%Y:%H:%M:%S ', logtime) + \
+               tz_for_log
 
     def log (self, bytes):
         user_agent=self.get_header('user-agent')

lib/python/ZServer/medusa/http_server.py

@@ -6,7 +6,7 @@
 #                        All Rights Reserved.
 #
 
-RCS_ID =  '$Id: http_server.py,v 1.19 2000/08/23 20:39:26 brian Exp $'
+RCS_ID =  '$Id: http_server.py,v 1.20 2001/02/13 21:18:54 brian Exp $'
 
 # python modules
 import os
@@ -258,10 +258,11 @@ class http_request:
             self.channel.close_when_done()
 
     def log_date_string (self, when):
-		return time.strftime (
-			'%d/%b/%Y:%H:%M:%S ',
-			time.localtime(when)
-			) + tz_for_log
+        logtime=time.localtime(when)
+        return time.strftime('%d/', logtime) + \
+               http_date.monthname[logtime[1]] + \
+               time.strftime('/%Y:%H:%M:%S ', logtime) + \
+               tz_for_log
 
     def log (self, bytes):
         user_agent=self.get_header('user-agent')