r2285 and r2286 have been merged.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2306 d4fa192b-c00b-0410-8231-f00ffab90ce4

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 fc19f70a4a26dc5c7cb56caa4e49390850c8cbf7..5f59902daaa8c74babdf9376427f9ce30b7440f8 100644 (file)
--- 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>