Merge pull request #1996 from untitaker/propagate-exceptions-werkzeug

Only passthrough_errors if PROPAGATE_EXCEPTIONS

flask/app.py

@@ -838,7 +838,8 @@ class Flask(_PackageBoundObject):
             self.debug = bool(debug)
         options.setdefault('use_reloader', self.debug)
         options.setdefault('use_debugger', self.debug)
-        options.setdefault('passthrough_errors', True)
+        options.setdefault('passthrough_errors',
+                           self.config['PROPAGATE_EXCEPTIONS'])
         try:
             run_simple(host, port, self, **options)
         finally:

flask/cli.py

@@ -430,7 +430,7 @@ def run_command(info, host, port, reload, debugger, eager_loading,
 
     run_simple(host, port, app, use_reloader=reload,
                use_debugger=debugger, threaded=with_threads,
-               passthrough_errors=True)
+               passthrough_errors=app.config['PROPAGATE_EXCEPTIONS'])
 
 
 @click.command('shell', short_help='Runs a shell in the app context.')

tests/test_basic.py

@@ -1268,8 +1268,8 @@ def test_werkzeug_passthrough_errors(monkeypatch, debug, use_debugger,
     monkeypatch.setattr(werkzeug.serving, 'run_simple', run_simple_mock)
     app.config['PROPAGATE_EXCEPTIONS'] = propagate_exceptions
     app.run(debug=debug, use_debugger=use_debugger, use_reloader=use_reloader)
-    # make sure werkzeug always passes errors through
-    assert rv['passthrough_errors']
+    # make sure werkzeug passes errors through if PROPAGATE_EXCEPTIONS
+    assert rv['passthrough_errors'] == propagate_exceptions
 
 
 def test_max_content_length():