From 36ba9a9b9612040791633b10a3e8bf05dc9554bb Mon Sep 17 00:00:00 2001
From: Matthew Seal <mseal007@gmail.com>
Date: Sun, 28 Mar 2021 18:33:47 -0700
Subject: [PATCH] Changed default timeout to 0.0 seconds for
 stop_on_error_timeout

---
 CHANGELOG.md            | 2 ++
 ipykernel/kernelbase.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89f323292..79e48f395 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changes in IPython kernel
 
+* Set `stop_on_error_timeout` default to 0.0 matching pre 5.5.0 default behavior with correctly working flag from 5.5.0.
+
 ## 5.5
 
 ### 5.5.0
diff --git a/ipykernel/kernelbase.py b/ipykernel/kernelbase.py
index 3409ba8f8..3e99a36a5 100644
--- a/ipykernel/kernelbase.py
+++ b/ipykernel/kernelbase.py
@@ -120,7 +120,7 @@ def _default_ident(self):
     _poll_interval = Float(0.01).tag(config=True)
 
     stop_on_error_timeout = Float(
-        0.1,
+        0.0,
         config=True,
         help="""time (in seconds) to wait for messages to arrive
         when aborting queued requests after an error.