From 2e0569de3dcfea1f3ff9778824f052d47b61d169 Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Tue, 16 Mar 2004 02:49:15 +0000 Subject: [PATCH] Report the NetWare socket error since we are using native socket calls git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102986 13f79535-47bb-0310-9956-ffa450edef68 --- modules/arch/netware/mod_nw_ssl.c | 8 ++++---- server/mpm/netware/mpm_netware.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index 0eb914ad2f..2ddd831278 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -224,7 +224,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve (LPWSAPROTOCOL_INFO)&SecureProtoInfo, 0, 0); if (s == INVALID_SOCKET) { - ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf, + ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf, "make_secure_socket: failed to get a socket for %s", addr); return -1; @@ -235,7 +235,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve if (WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam, sizeof(optParam), NULL, 0, NULL, NULL, NULL)) { - ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf, + ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf, "make_secure_socket: for %s, WSAIoctl: " "(SO_SSL_SET_FLAGS)", addr); return -1; @@ -250,7 +250,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve if (WSAIoctl(s, SO_SSL_SET_SERVER, (char *)&opts, sizeof(opts), NULL, 0, NULL, NULL, NULL) != 0) { - ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf, + ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf, "make_secure_socket: for %s, WSAIoctl: " "(SO_SSL_SET_SERVER)", addr); return -1; @@ -261,7 +261,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam, sizeof(optParam), NULL, 0, NULL, NULL, NULL)) { - ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf, + ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf, "make_secure_socket: for %s, WSAIoctl: " "(SO_SSL_SET_FLAGS)", addr); return -1; diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 3fcdacce7c..0bda336348 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -385,7 +385,7 @@ void worker_main(void *arg) if (srv <= 0) { if (srv < 0) { - ap_log_error(APLOG_MARK, APLOG_NOTICE, apr_get_netos_error(), ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_NOTICE, WSAGetLastError(), ap_server_conf, "select() failed on listen socket"); apr_thread_yield(); } -- 2.50.1