[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37865 - libmicrohttpd/src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37865 - libmicrohttpd/src/microhttpd |
Date: |
Sun, 4 Sep 2016 13:13:29 +0200 |
Author: grothoff
Date: 2016-09-04 13:13:29 +0200 (Sun, 04 Sep 2016)
New Revision: 37865
Modified:
libmicrohttpd/src/microhttpd/test_upgrade.c
libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
Log:
-run non-TLS test also for poll/epoll
Modified: libmicrohttpd/src/microhttpd/test_upgrade.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 11:11:43 UTC (rev
37864)
+++ libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 11:13:29 UTC (rev
37865)
@@ -279,13 +279,13 @@
static int
-test_upgrade_internal_select ()
+test_upgrade_internal (int flags)
{
struct MHD_Daemon *d;
MHD_socket sock;
struct sockaddr_in sa;
- d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG |
MHD_USE_SUSPEND_RESUME,
+ d = MHD_start_daemon (flags | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
1080,
NULL, NULL,
&ahc_upgrade, NULL,
@@ -321,12 +321,18 @@
main (int argc,
char *const *argv)
{
- int errorCount = 0;
+ int error_count = 0;
- errorCount += test_upgrade_internal_select ();
- if (errorCount != 0)
+ error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY);
+#ifdef HAVE_POLL
+ error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY);
+#endif
+#ifdef EPOLL_SUPPORT
+ error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY);
+#endif
+ if (error_count != 0)
fprintf (stderr,
"Error (code: %u)\n",
- errorCount);
- return errorCount != 0; /* 0 == pass */
+ error_count);
+ return error_count != 0; /* 0 == pass */
}
Modified: libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade_ssl.c 2016-09-04 11:11:43 UTC
(rev 37864)
+++ libmicrohttpd/src/microhttpd/test_upgrade_ssl.c 2016-09-04 11:13:29 UTC
(rev 37865)
@@ -436,21 +436,21 @@
main (int argc,
char *const *argv)
{
- int errorCount = 0;
+ int error_count = 0;
if (0 != system ("openssl version 1> /dev/null"))
return 77; /* openssl not available, can't run the test */
- errorCount += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY);
+ error_count += test_upgrade_internal (MHD_USE_SELECT_INTERNALLY);
#ifdef HAVE_POLL
- errorCount += test_upgrade_internal (MHD_USE_POLL_INTERNALLY);
+ error_count += test_upgrade_internal (MHD_USE_POLL_INTERNALLY);
#endif
#ifdef EPOLL_SUPPORT
- errorCount += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY |
+ error_count += test_upgrade_internal (MHD_USE_EPOLL_INTERNALLY |
MHD_USE_TLS_EPOLL_UPGRADE);
#endif
- if (errorCount != 0)
+ if (error_count != 0)
fprintf (stderr,
"Error (code: %u)\n",
- errorCount);
- return errorCount != 0; /* 0 == pass */
+ error_count);
+ return error_count != 0; /* 0 == pass */
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37865 - libmicrohttpd/src/microhttpd,
gnunet <=