From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 16 May 2013 22:02:54 +0000 (+0100)
Subject: Closes #17981: Merged fix from 3.3.
X-Git-Tag: v3.4.0a1~713
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8f510b52b5287b2cba2b720f657073b8ffc719;p=python

Closes #17981: Merged fix from 3.3.
---

3a8f510b52b5287b2cba2b720f657073b8ffc719
diff --cc Lib/logging/handlers.py
index bed09f05d0,93aa50ea83..f1ddbb5eda
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@@ -875,7 -881,8 +875,8 @@@ class SysLogHandler(logging.Handler)
              if self.unixsocket:
                  try:
                      self.socket.send(msg)
 -                except socket.error:
 +                except OSError:
+                     self.socket.close()
                      self._connect_unixsocket(self.address)
                      self.socket.send(msg)
              elif self.socktype == socket.SOCK_DGRAM:
diff --cc Misc/NEWS
index ceab576aa3,251804dd52..953d57e079
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -91,15 -81,6 +91,17 @@@ Core and Builtin
  Library
  -------
  
++- Issue #17981: Closed socket on error in SysLogHandler.
++
 +- Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function
 +  is long, not int.
 +
 +- Fix typos in the multiprocessing module.
 +
 +- Issue #17754: Make ctypes.util.find_library() independent of the locale.
 +
 +- Issue #17968: Fix memory leak in os.listxattr().
 +
  - Issue #17606: Fixed support of encoded byte strings in the XMLGenerator
    characters() and ignorableWhitespace() methods.  Original patch by Sebastian
    Ortiz Vasquez.