[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28885 - in libmicrohttpd/src: microhttpd testcurl/https
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28885 - in libmicrohttpd/src: microhttpd testcurl/https |
Date: |
Wed, 28 Aug 2013 11:41:30 +0200 |
Author: grothoff
Date: 2013-08-28 11:41:30 +0200 (Wed, 28 Aug 2013)
New Revision: 28885
Modified:
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/src/testcurl/https/test_https_get_parallel.c
libmicrohttpd/src/testcurl/https/test_https_get_select.c
Log:
-do not run epoll tests if epoll was disabled, even on linux
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2013-08-28 09:32:08 UTC (rev
28884)
+++ libmicrohttpd/src/microhttpd/daemon.c 2013-08-28 09:41:30 UTC (rev
28885)
@@ -1568,6 +1568,8 @@
(struct sockaddr *) pos->addr,
pos->addr_len);
#if EPOLL_SUPPORT
+ if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
+ MHD_PANIC ("Internal error");
if ( (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) &&
(-1 != daemon->epoll_fd) &&
(0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) )
Modified: libmicrohttpd/src/testcurl/https/test_https_get_parallel.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get_parallel.c 2013-08-28
09:32:08 UTC (rev 28884)
+++ libmicrohttpd/src/testcurl/https/test_https_get_parallel.c 2013-08-28
09:41:30 UTC (rev 28885)
@@ -141,7 +141,7 @@
if (curl_uses_nss_ssl() == 0)
aes256_sha = "rsa_aes_256_sha";
-#if LINUX
+#if EPOLL_SUPPORT
errorCount +=
test_wrap ("single threaded daemon, single client, epoll",
&test_single_client,
NULL,
@@ -157,7 +157,7 @@
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
-#if LINUX
+#if EPOLL_SUPPORT
errorCount +=
test_wrap ("single threaded daemon, parallel clients, epoll",
&test_parallel_clients, NULL,
Modified: libmicrohttpd/src/testcurl/https/test_https_get_select.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_get_select.c 2013-08-28
09:32:08 UTC (rev 28884)
+++ libmicrohttpd/src/testcurl/https/test_https_get_select.c 2013-08-28
09:41:30 UTC (rev 28885)
@@ -221,7 +221,7 @@
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
-#if LINUX
+#if EPOLL_SUPPORT
if (0 != (errorCount = testExternalGet (MHD_USE_EPOLL_LINUX_ONLY)))
fprintf (stderr, "Fail: %d\n", errorCount);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28885 - in libmicrohttpd/src: microhttpd testcurl/https,
gnunet <=