From 12cfa54915d405bc7c14535a5e72f79f8200523d Mon Sep 17 00:00:00 2001
From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 18 Dec 2007 17:19:46 +0000
Subject: [PATCH] r2285 and r2286 have been merged.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2306 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/doc/changes-1.1.1-1.1.2.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/varnish-cache/doc/changes-1.1.1-1.1.2.xml b/varnish-cache/doc/changes-1.1.1-1.1.2.xml
index fc19f70a..5f59902d 100644
--- a/varnish-cache/doc/changes-1.1.1-1.1.2.xml
+++ b/varnish-cache/doc/changes-1.1.1-1.1.2.xml
@@ -91,6 +91,14 @@
       by Varnish when a problem arises while retrieving an object from
       the backend.</para>
     </change>
+
+    <change type="bug" ref="2285,2286">
+      <para>Some socket-related system calls may return unexpected
+      error codes when operating on a TCP connection that has been
+      shut down at the other end.  These error codes would previously
+      cause assertion failures, but are now recognized as harmless
+      conditions.</para>
+    </change>
   </subsystem>
 
   <subsystem>
-- 
2.39.5