[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14604 - libmicrohttpd/src/daemon
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14604 - libmicrohttpd/src/daemon |
Date: |
Mon, 7 Mar 2011 11:24:42 +0100 |
Author: wachs
Date: 2011-03-07 11:24:42 +0100 (Mon, 07 Mar 2011)
New Revision: 14604
Modified:
libmicrohttpd/src/daemon/connection.c
libmicrohttpd/src/daemon/daemon.c
Log:
fixifx
Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c 2011-03-06 15:26:16 UTC (rev
14603)
+++ libmicrohttpd/src/daemon/connection.c 2011-03-07 10:24:42 UTC (rev
14604)
@@ -1424,7 +1424,12 @@
int bytes_read;
if (connection->read_buffer_size == connection->read_buffer_offset)
+ {
+ MHD_DLOG (connection->daemon,
+ "connection->read_buffer_size ==
connection->read_buffer_offset\n");
+
return MHD_NO;
+ }
bytes_read = connection->recv_cls (connection,
&connection->read_buffer
@@ -1432,15 +1437,15 @@
connection->read_buffer_size -
connection->read_buffer_offset);
if (bytes_read < 0)
- {
+ {
if (errno == EINTR)
return MHD_NO;
#if HAVE_MESSAGES
#if HTTPS_SUPPORT
if (0 != (connection->daemon->options & MHD_USE_SSL))
MHD_DLOG (connection->daemon,
- "Failed to receive data: %s\n",
- gnutls_strerror (bytes_read));
+ "Failed to receive data: %s (%i)\n",
+ gnutls_strerror (bytes_read), bytes_read);
else
#endif
MHD_DLOG (connection->daemon,
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2011-03-06 15:26:16 UTC (rev 14603)
+++ libmicrohttpd/src/daemon/daemon.c 2011-03-07 10:24:42 UTC (rev 14604)
@@ -1370,7 +1370,7 @@
memset (p, 0, sizeof (p));
p[0].fd = daemon->socket_fd;
- p[0].events = POLLIN | POLLRDHUP;
+ p[0].events = POLLIN;
p[0].revents = 0;
if (may_block == MHD_NO)
timeout = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14604 - libmicrohttpd/src/daemon,
gnunet <=