From 3da19953cbd73f5ca376f92921f63ca643f8137d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Fri, 9 Feb 2024 13:03:02 -0500
Subject: [PATCH] With TLS, errno isn't set, so logging it is just confusing.
---
3rdp/build/GNUmakefile | 1 +
src/sbbs3/websrvr.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile
index 255f32ed04..17cbc7d230 100644
--- a/3rdp/build/GNUmakefile
+++ b/3rdp/build/GNUmakefile
@@ -155,6 +155,7 @@ $(CRYPTLIB_BUILD): $(3RDP_ROOT)/dist/cryptlib.zip $(3RDP_ROOT)/build/cl-fix-test
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-add-patches-info.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-netbsd-hmac-symbol.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-netbsd-no-getfsstat.patch
+ $(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-do-debug.patch
$(QUIET)perl -pi.bak -e 's/^(#define CRYPTLIB_VERSION.*)$$/"$$1\n#define CRYPTLIB_PATCHES \"" . (chomp($$val = `cat cl-*.patch | if (which md5sum > \/dev\/null 2>&1); then md5sum; else md5; fi`), $$val) . "\""/e' $(CRYPT_SRC)/cryptlib.h
ifeq ($(os),win32)
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index dac03e3bca..5362651ee4 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -2201,8 +2201,10 @@ static int sockreadline(http_session_t * session, char *buf, size_t length)
switch(sess_recv(session, &ch, 1, 0)) {
case -1:
if(session->is_tls || ERROR_VALUE!=EAGAIN) {
- if(startup->options&WEB_OPT_DEBUG_RX)
- lprintf(LOG_DEBUG,"%04d !ERROR %d receiving on socket",session->socket,ERROR_VALUE);
+ if (!session->is_tls) {
+ if(startup->options&WEB_OPT_DEBUG_RX)
+ lprintf(LOG_DEBUG,"%04d !ERROR %d receiving on socket",session->socket,ERROR_VALUE);
+ }
close_session_socket(session);
return(-1);
}
--
GitLab