aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/connection.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-03-07 10:41:00 +0000
committerChristian Grothoff <christian@grothoff.org>2011-03-07 10:41:00 +0000
commit4899ea8e77e76368bcd2c22b51f28b6877f6b529 (patch)
tree65d5604386e9f050e8a99a8190bb6d7d1acae9fb /src/daemon/connection.c
parent50514ddec0e31ab88fc8897d4f2a853d1abb97d5 (diff)
downloadlibmicrohttpd-4899ea8e77e76368bcd2c22b51f28b6877f6b529.tar.gz
libmicrohttpd-4899ea8e77e76368bcd2c22b51f28b6877f6b529.zip
undo
Diffstat (limited to 'src/daemon/connection.c')
-rw-r--r--src/daemon/connection.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index 02e127e8..c7e42af6 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -1424,12 +1424,7 @@ do_read (struct MHD_Connection *connection)
1424 int bytes_read; 1424 int bytes_read;
1425 1425
1426 if (connection->read_buffer_size == connection->read_buffer_offset) 1426 if (connection->read_buffer_size == connection->read_buffer_offset)
1427 {
1428 MHD_DLOG (connection->daemon,
1429 "connection->read_buffer_size == connection->read_buffer_offset\n");
1430
1431 return MHD_NO; 1427 return MHD_NO;
1432 }
1433 1428
1434 bytes_read = connection->recv_cls (connection, 1429 bytes_read = connection->recv_cls (connection,
1435 &connection->read_buffer 1430 &connection->read_buffer
@@ -1437,15 +1432,15 @@ do_read (struct MHD_Connection *connection)
1437 connection->read_buffer_size - 1432 connection->read_buffer_size -
1438 connection->read_buffer_offset); 1433 connection->read_buffer_offset);
1439 if (bytes_read < 0) 1434 if (bytes_read < 0)
1440 { 1435 {
1441 if (errno == EINTR) 1436 if (errno == EINTR)
1442 return MHD_NO; 1437 return MHD_NO;
1443#if HAVE_MESSAGES 1438#if HAVE_MESSAGES
1444#if HTTPS_SUPPORT 1439#if HTTPS_SUPPORT
1445 if (0 != (connection->daemon->options & MHD_USE_SSL)) 1440 if (0 != (connection->daemon->options & MHD_USE_SSL))
1446 MHD_DLOG (connection->daemon, 1441 MHD_DLOG (connection->daemon,
1447 "Failed to receive data: %s (%i)\n", 1442 "Failed to receive data: %s\n",
1448 gnutls_strerror (bytes_read), bytes_read); 1443 gnutls_strerror (bytes_read));
1449 else 1444 else
1450#endif 1445#endif
1451 MHD_DLOG (connection->daemon, 1446 MHD_DLOG (connection->daemon,