From e75f43c53efa85dc24924184f687ddc4752e2286 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 26 Mar 2015 09:27:46 +0100
Subject: [PATCH] =act #17255 Temporary disable
 windows-connection-abort-workaround

(cherry picked from commit 5d557261082421dda234ad37656d6940252158af)
---
 akka-actor-tests/src/test/resources/reference.conf | 4 ++++
 akka-actor/src/main/resources/reference.conf       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/resources/reference.conf b/akka-actor-tests/src/test/resources/reference.conf
index a5b04a466c..fb73c9c8d3 100644
--- a/akka-actor-tests/src/test/resources/reference.conf
+++ b/akka-actor-tests/src/test/resources/reference.conf
@@ -3,3 +3,7 @@ akka {
     serialize-messages = on    
   }
 }
+
+# FIXME Some test depend on this setting when running on windows.
+#       It should be removed when #17122 is solved. 
+akka.io.tcp.windows-connection-abort-workaround-enabled = auto
diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf
index 8fcf18cd06..f242dd8ab4 100644
--- a/akka-actor/src/main/resources/reference.conf
+++ b/akka-actor/src/main/resources/reference.conf
@@ -649,7 +649,7 @@ akka {
       # and undefined behavior.
       # Possible values of this key are on, off and auto where auto will enable the
       # workaround if Windows is detected automatically.
-      windows-connection-abort-workaround-enabled = auto
+      windows-connection-abort-workaround-enabled = off
     }
 
     udp {