diff --git a/Makefile b/Makefile index 80d9a467..23f241d8 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ update: wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py echo "remember that pymysql was tweaked" src: - echo 'Version 2.3.2 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION + echo 'Version 2.3.2 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index 65f563f1..fb91d50d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.2 (2012-12-17 08:59:58) stable +Version 2.3.2 (2012-12-17 17:13:45) dev diff --git a/gluon/streamer.py b/gluon/streamer.py index 4dd5d318..635deecd 100644 --- a/gluon/streamer.py +++ b/gluon/streamer.py @@ -100,7 +100,7 @@ def stream_file_or_304_or_206( enc = request.env.http_accept_encoding if enc and 'gzip' in enc and not 'Content-Encoding' in headers: gzipped = static_file + '.gz' - if os.path.isfile(gzipped) and os.path.getmtime(gzipped) > modified: + if os.path.isfile(gzipped) and os.path.getmtime(gzipped) >= modified: static_file = gzipped fsize = os.path.getsize(gzipped) headers['Content-Encoding'] = 'gzip'