dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved deafult headers logic, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2012-09-11 17:32:46 -05:00
parent 6a170f3b7b
commit 91c0b6c76a
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.8 (2012-09-11 16:49:24) stable
Version 2.0.8 (2012-09-11 17:32:41) stable
gluon/main.py
+17 -23
View File
@@ -226,6 +226,20 @@ def serve_controller(request, response, session):
requests = ('requests' in globals()) and (requests+1) % 100 or 0
if not requests: gc.collect()
# end garbage collection logic
# ##################################################
# set default headers it not set
# ##################################################
default_headers = [
('Content-Type', contenttype('.'+request.extension)),
('Cache-Control','no-store, no-cache, must-revalidate, post-check=0, pre-check=0'),
('Expires', time.strftime('%a, %d %b %Y %H:%M:%S GMT',
time.gmtime())),
('Pragma', 'no-cache')]
for key,value in default_headers:
response.headers.setdefault(key,value)
raise HTTP(response.status, page, **response.headers)
@@ -496,7 +510,7 @@ def wsgibase(environ, responder):
import gluon.debug
# activate the debugger
gluon.debug.dbg.do_debug(mainpyfile=request.folder)
serve_controller(request, response, session)
except HTTP, http_response:
@@ -531,32 +545,12 @@ def wsgibase(environ, responder):
# ##################################################
session._try_store_on_disk(request, response)
# ##################################################
# set default headers it not set
# ##################################################
rheaders = http_response.headers
default_headers = [
('Content-Type', contenttype('.'+request.extension)),
('Cache-Control','no-store, no-cache, must-revalidate, post-check=0, pre-check=0'),
('Expires', time.strftime('%a, %d %b %Y %H:%M:%S GMT',
time.gmtime())),
('Pragma', 'no-cache')]
if request.cid:
if response.flash:
default_headers.append(
('web2py-component-flash',
urllib2.quote(xmlescape(response.flash).replace('\n',''))))
http_response.headers['web2py-component-flash'] = urllib2.quote(xmlescape(response.flash).replace('\n',''))
if response.js:
default_headers.append(
('web2py-component-command',
response.js.replace('\n','')))
for key,value in default_headers:
rheaders.setdefault(key,value)
http_response.headers['web2py-component-command'] = response.js.replace('\n','')
# ##################################################
# store cookies in headers