Merge remote-tracking branch 'web2py/master'

2016-10-10 20:49:54 -07:00
parent 24d1eea554 e6a3081b42
commit a28b1e30c9
150 changed files with 42419 additions and 5678 deletions
@@ -180,8 +180,8 @@ def serve_controller(request, response, session):
    if isinstance(page, dict):
        response._vars = page
        response._view_environment.update(page)
-        run_view_in(response._view_environment)
-        page = response.body.getvalue()
+        page = run_view_in(response._view_environment)
+
    # logic to garbage collect after exec, not always, once every 100 requests
    global requests
    requests = ('requests' in globals()) and (requests + 1) % 100 or 0