This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 4bf9669dae5b3e0e6a047afc93e0cdfd20a33ffd (commit)
from 2f234a060bbdae2fe9d12770018f113ef5b1466d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4bf9669dae5b3e0e6a047afc93e0cdfd20a33ffd
Author: Dave Heller <hel...@us...>
Date: Wed Aug 7 00:49:24 2013 -0400
[sfcb-tix:#68] reinitialize select timeout in SSL handshake
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index 950905e..66b84d7 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1523,6 +1523,8 @@ handleHttpRequest(int connFd, int __attribute__ ((unused)) sslMode)
intSSLerror("Error creating SSL object");
SSL_set_bio(conn_fd.ssl, sb, sb);
char *error_string;
+ httpSelectTimeout.tv_sec = selectTimeout;
+ httpSelectTimeout.tv_usec = 0;
while (1) {
int sslacc,
sslerr;
@@ -1544,15 +1546,15 @@ handleHttpRequest(int connFd, int __attribute__ ((unused)) sslMode)
FD_SET(connFd, &httpfds);
if (sslerr == SSL_ERROR_WANT_WRITE) {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_WRITE): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_WRITE): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady =
select(connFd + 1, NULL, &httpfds, NULL,
&httpSelectTimeout);
} else {
_SFCB_TRACE(2, (
- "--- Waiting for SSL handshake (WANT_READ): timeout=%ld",
- httpSelectTimeout.tv_sec));
+ "--- Waiting for SSL handshake (WANT_READ): timeout=%lums",
+ TV_TO_MS(httpSelectTimeout)));
isReady =
select(connFd + 1, &httpfds, NULL, NULL,
&httpSelectTimeout);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
