aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-08-24 22:25:08 +0000
committerChristian Grothoff <christian@grothoff.org>2008-08-24 22:25:08 +0000
commit6868a035a94d3839f008422f4d0acd859b03e33c (patch)
treed968c7b4db390ec26fd06f0b9a229633d0b26d74
parent72dcf7876e1711e5885903f3658355e395277bc1 (diff)
downloadlibmicrohttpd-6868a035a94d3839f008422f4d0acd859b03e33c.tar.gz
libmicrohttpd-6868a035a94d3839f008422f4d0acd859b03e33c.zip
cleanup
-rw-r--r--src/daemon/connection_https.c3
-rw-r--r--src/daemon/https/tls/gnutls_buffers.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
index d193fef6..78797aa4 100644
--- a/src/daemon/connection_https.c
+++ b/src/daemon/connection_https.c
@@ -204,7 +204,8 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection)
204 return MHD_YES; 204 return MHD_YES;
205 /* close connection if necessary */ 205 /* close connection if necessary */
206 case MHD_CONNECTION_CLOSED: 206 case MHD_CONNECTION_CLOSED:
207 MHD_tls_connection_close (connection); 207 if (connection->socket_fd != -1)
208 MHD_tls_connection_close (connection);
208 return MHD_NO; 209 return MHD_NO;
209 case MHD_TLS_HANDSHAKE_FAILED: 210 case MHD_TLS_HANDSHAKE_FAILED:
210 MHD_tls_connection_close_err (connection, 211 MHD_tls_connection_close_err (connection,
diff --git a/src/daemon/https/tls/gnutls_buffers.c b/src/daemon/https/tls/gnutls_buffers.c
index cb2b9e08..67bf5c9b 100644
--- a/src/daemon/https/tls/gnutls_buffers.c
+++ b/src/daemon/https/tls/gnutls_buffers.c
@@ -1223,7 +1223,8 @@ mhd_gtls_handshake_buffer_get_ptr (mhd_gtls_session_t session,
1223 if (length != NULL) 1223 if (length != NULL)
1224 *length = session->internals.handshake_hash_buffer.length; 1224 *length = session->internals.handshake_hash_buffer.length;
1225 1225
1226 _gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n", *length); 1226 _gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n",
1227 session->internals.handshake_hash_buffer.length)
1227 1228
1228 if (data_ptr != NULL) 1229 if (data_ptr != NULL)
1229 *data_ptr = session->internals.handshake_hash_buffer.data; 1230 *data_ptr = session->internals.handshake_hash_buffer.data;