[Zope-Checkins] CVS: Zope/ZServer/medusa - ftp_server.py:1.17.16.2 http_server.py:1.26.4.4 logger.py:1.12.16.1

[Steve Alexander]

Update of /cvs-repository/Zope/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv5080

Modified Files:
      Tag: Zope-2_4-branch
	ftp_server.py http_server.py logger.py 
Log Message:
Merged bugfix where mktime was being passed nine args instead of a 
nine-tuple.


=== Zope/ZServer/medusa/ftp_server.py 1.17.16.1 => 1.17.16.2 ===
 #
 
+
 RCS_ID =  '$Id$'
 
 # An extensible, configurable, asynchronous FTP server.


=== Zope/ZServer/medusa/http_server.py 1.26.4.3 => 1.26.4.4 ===
         message = self.responses[code]
         self.reply_code = code
-        return 'HTTP/%s %d %s' % (self.version, code, message)
+        return 'HTTP/%s %d %s' % (self.version or '1.0', code, message)
         
     def error (self, code):
         self.reply_code = code


=== Zope/ZServer/medusa/logger.py 1.12 => 1.12.16.1 ===
         (yr, mo, day, hr, min, sec, wd, jday, dst) = time.localtime(time.time())
         if freq == 'daily':
-            return time.mktime(yr,mo,day+1, 0,0,0, 0,0,-1)
+            return time.mktime((yr,mo,day+1, 0,0,0, 0,0,-1))
         elif freq == 'weekly':
-            return time.mktime(yr,mo,day-wd+7, 0,0,0, 0,0,-1)  # wd(monday)==0
+            return time.mktime((yr,mo,day-wd+7, 0,0,0, 0,0,-1))  # wd(monday)==0
         elif freq == 'monthly':
-            return time.mktime(yr,mo+1,1, 0,0,0, 0,0,-1)
+            return time.mktime((yr,mo+1,1, 0,0,0, 0,0,-1))
         else:
             return None                  # not a date-based backup