summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mrcsys2006-05-15 13:54:25 +0000
committerGravatar mrcsys2006-05-15 13:54:25 +0000
commit9f962c2ff75ed03c3727d808b83f1e89bdbf19a5 (patch)
tree3883ad98e8ca9c31b88f9af7a4e735be1f9a233d
parent68e70db8b8e22afb6cd5be057dedb75a891cad98 (diff)
downloadcsoap-9f962c2ff75ed03c3727d808b83f1e89bdbf19a5.tar.gz
csoap-9f962c2ff75ed03c3727d808b83f1e89bdbf19a5.tar.bz2
Fixed one log message to make fore sense.
Fixed check of SSL_read return code, was not correct.
-rw-r--r--nanohttp/nanohttp-server.c4
-rw-r--r--nanohttp/nanohttp-ssl.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/nanohttp/nanohttp-server.c b/nanohttp/nanohttp-server.c
index 907d80d..32902ee 100644
--- a/nanohttp/nanohttp-server.c
+++ b/nanohttp/nanohttp-server.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: nanohttp-server.c,v 1.58 2006/05/01 17:51:50 mrcsys Exp $
+* $Id: nanohttp-server.c,v 1.59 2006/05/15 13:54:25 mrcsys Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -646,7 +646,7 @@ httpd_session_main(void *data)
done = 0;
while (!done)
{
- log_verbose2("starting HTTP request on socket %d", conn->sock);
+ log_verbose3("starting HTTP request on socket %p (%d)", conn->sock, conn->sock.sock);
/* XXX: only used in WSAreaper */
conn->atime = time(NULL);
diff --git a/nanohttp/nanohttp-ssl.c b/nanohttp/nanohttp-ssl.c
index 34c00c9..5a08486 100644
--- a/nanohttp/nanohttp-ssl.c
+++ b/nanohttp/nanohttp-ssl.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: nanohttp-ssl.c,v 1.26 2006/05/15 06:40:47 m0gg Exp $
+* $Id: nanohttp-ssl.c,v 1.27 2006/05/15 13:54:25 mrcsys Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2001-2005 Rochester Institute of Technology
@@ -524,7 +524,7 @@ hssl_read(hsocket_t * sock, char *buf, size_t len, size_t * received)
if (sock->ssl)
{
- if ((count = SSL_read(sock->ssl, buf, len)) == -1)
+ if ((count = SSL_read(sock->ssl, buf, len)) < 1)
return herror_new("SSL_read", HSOCKET_ERROR_RECEIVE,
"SSL_read failed (%s)", _hssl_get_error(sock->ssl,
count));