[cpp-sp] branch main updated: SSPCPP-962 - SSPCPP 956 inadvertently included an old patch revision

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=2741b9ce29ab3f4c4b5efe851531ff9a2636d156

The following commit(s) were added to refs/heads/main by this push:
     new 2741b9ce SSPCPP-962 - SSPCPP 956 inadvertently included an old patch revision
2741b9ce is described below

commit 2741b9ce29ab3f4c4b5efe851531ff9a2636d156
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 9 16:57:32 2023 -0500

    SSPCPP-962 - SSPCPP 956 inadvertently included an old patch revision
    
    https://shibboleth.atlassian.net/browse/SSPCPP-962
---
 shibsp/remoting/impl/SocketListener.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/shibsp/remoting/impl/SocketListener.cpp b/shibsp/remoting/impl/SocketListener.cpp
index 55c5c38a..ae45732d 100644
--- a/shibsp/remoting/impl/SocketListener.cpp
+++ b/shibsp/remoting/impl/SocketListener.cpp
@@ -451,15 +451,21 @@ bool SocketListener::log_error(const char* fn, int* native_error) const
         fn = "unknown";
 #ifdef WIN32
     int rc=WSAGetLastError();
-    if (rc == WSAECONNRESET) {
-        log->debug("socket connection reset");
-        return false;
-    }
 #else
     int rc=errno;
 #endif
     if (native_error != nullptr)
         *native_error = rc;
+
+#ifdef WIN32
+    if (rc == WSAECONNRESET) {
+#else
+    if (rc == ECONNRESET) {
+#endif
+        log->debug("socket connection reset");
+        return false;
+    }
+
     const char *msg;
 #ifdef HAVE_STRERROR_R
     char buf[256];

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.