summaryrefslogtreecommitdiff
path: root/Lib/BaseHTTPServer.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-02-17 13:34:16 +0000
committerGeorg Brandl <georg@python.org>2006-02-17 13:34:16 +0000
commit47474c648d8a863c095683155b5b9f27d0ad8f14 (patch)
tree9d3ef75491315bb2deec126e314c65a7eeab154e /Lib/BaseHTTPServer.py
parentebc1c14d8cd882626c21e86fdeff84cb9428f6f7 (diff)
downloadcpython-47474c648d8a863c095683155b5b9f27d0ad8f14.tar.gz
Patch #1417555: SimpleHTTPServer now returns Last-Modified headers.
Diffstat (limited to 'Lib/BaseHTTPServer.py')
-rw-r--r--Lib/BaseHTTPServer.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index 722b50cea3..1b3d4dbcae 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -436,10 +436,11 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
"""Return the server software version string."""
return self.server_version + ' ' + self.sys_version
- def date_time_string(self):
+ def date_time_string(self, timestamp=None):
"""Return the current date and time formatted for a message header."""
- now = time.time()
- year, month, day, hh, mm, ss, wd, y, z = time.gmtime(now)
+ if timestamp is None:
+ timestamp = time.time()
+ year, month, day, hh, mm, ss, wd, y, z = time.gmtime(timestamp)
s = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (
self.weekdayname[wd],
day, self.monthname[month], year,