修复发送yield出错的问题

git · git · commit 20b936d34394 · 2017-12-22T12:09:11.000+08:00
diff --git a/litefs.py b/litefs.py
@@ -611,12 +611,17 @@ def session_id(self):
     def session(self):
         return self._session
 
+    @property
+    def path_info(self):
+        return self.environ['PATH_INFO']
+
     def start_response(self, status_code=200, headers=None):
         buffers = self._buffers
         if self._headers_responsed:
             raise ValueError('Http headers already responsed.')
         response_headers = {}
         response_headers['Server'] = server_info
+        response_headers['Content-Type'] = 'text/html;charset=utf-8'
         status_code = int(status_code)
         status_text = http_status_codes[status_code]
         buffers.write('HTTP/1.1 %d %s\r\n' % (status_code, status_text))
@@ -656,7 +661,7 @@ def _finish(self, content):
         rw = self._rw
         if not self._headers_responsed:
             self.start_response(200)
-        rw.write(self._buffers.getvalue())
+            rw.write(self._buffers.getvalue())
         if isinstance(content, basestring):
             rw.write(content)
         else:
@@ -699,7 +704,12 @@ def _handler(self):
         path = double_slash_sub('/', path)
         if path != path_info:
             result = self.redirect(path)
-            return self._finish(result)
+            try:
+                return self._finish(result)
+            except:
+                content = exceptions.html_error_template().render()
+                result = self._response(500, content=content)
+                return self._finish(result)
         base, name = path_split(path)
         if not name:
             name = app.config.default_page
@@ -717,7 +727,11 @@ def _handler(self):
                 result = self._response(500)
                 return self._finish(result)
             else:
-                return self._finish(result)
+                try:
+                    return self._finish(result)
+                except:
+                    result = exceptions.html_error_template().render()
+                    return self._finish(result)
         litefile = app.files.get(path)
         if litefile is not None:
             return litefile.handler(self)
@@ -745,7 +759,11 @@ def _handler(self):
                 result = self._response(500)
                 return self._finish(result)
             else:
-                return self._finish(result)
+                try:
+                    return self._finish(result)
+                except:
+                    result = exceptions.html_error_template().render()
+                    return self._finish(result)
         try:
             litefile = self._load_static_file(base, name)
         except IOError:
