[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29481 - libmicrohttpd/src/testcurl
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29481 - libmicrohttpd/src/testcurl |
Date: |
Mon, 23 Sep 2013 13:41:26 +0200 |
Author: grothoff
Date: 2013-09-23 13:41:26 +0200 (Mon, 23 Sep 2013)
New Revision: 29481
Modified:
libmicrohttpd/src/testcurl/test_postform.c
libmicrohttpd/src/testcurl/test_timeout.c
Log:
-fixes
Modified: libmicrohttpd/src/testcurl/test_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/test_postform.c 2013-09-23 11:39:05 UTC (rev
29480)
+++ libmicrohttpd/src/testcurl/test_postform.c 2013-09-23 11:41:26 UTC (rev
29481)
@@ -463,7 +463,9 @@
}
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+
int
main (int argc, char *const *argv)
{
Modified: libmicrohttpd/src/testcurl/test_timeout.c
===================================================================
--- libmicrohttpd/src/testcurl/test_timeout.c 2013-09-23 11:39:05 UTC (rev
29480)
+++ libmicrohttpd/src/testcurl/test_timeout.c 2013-09-23 11:41:26 UTC (rev
29481)
@@ -39,6 +39,7 @@
static int oneone;
static int withTimeout = 1;
+
static int withoutTimeout = 1;
struct CBC
@@ -49,10 +50,39 @@
};
-static void
-termination_cb (void *cls, struct MHD_Connection *connection, void **con_cls,
enum MHD_RequestTerminationCode toe);
+static void
+termination_cb (void *cls,
+ struct MHD_Connection *connection,
+ void **con_cls,
+ enum MHD_RequestTerminationCode toe)
+{
+ int *test = cls;
+ switch (toe)
+ {
+ case MHD_REQUEST_TERMINATED_COMPLETED_OK :
+ if (test == &withoutTimeout)
+ {
+ withoutTimeout = 0;
+ }
+ break;
+ case MHD_REQUEST_TERMINATED_WITH_ERROR :
+ case MHD_REQUEST_TERMINATED_READ_ERROR :
+ break;
+ case MHD_REQUEST_TERMINATED_TIMEOUT_REACHED :
+ if (test == &withTimeout)
+ {
+ withTimeout = 0;
+ }
+ break;
+ case MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN:
+ break;
+ case MHD_REQUEST_TERMINATED_CLIENT_ABORT:
+ break;
+ }
+}
+
static size_t
putBuffer (void *stream, size_t size, size_t nmemb, void *ptr)
{
@@ -74,6 +104,7 @@
return 0;
}
+
static size_t
copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
{
@@ -86,6 +117,7 @@
return size * nmemb;
}
+
static int
ahc_echo (void *cls,
struct MHD_Connection *connection,
@@ -125,6 +157,7 @@
return ret;
}
+
static int
testWithoutTimeout ()
{
@@ -238,33 +271,7 @@
}
-static void
-termination_cb (void *cls, struct MHD_Connection *connection, void **con_cls,
enum MHD_RequestTerminationCode toe)
-{
- int * test = cls;
- switch (toe)
- {
- case MHD_REQUEST_TERMINATED_COMPLETED_OK :
- if (test==&withoutTimeout)
- {
- withoutTimeout = 0;
- }
- break;
- case MHD_REQUEST_TERMINATED_WITH_ERROR :
- case MHD_REQUEST_TERMINATED_READ_ERROR :
- break;
- case MHD_REQUEST_TERMINATED_TIMEOUT_REACHED :
- if (test==&withTimeout)
- {
- withTimeout = 0;
- }
- break;
- case MHD_REQUEST_TERMINATED_DAEMON_SHUTDOWN :
- break;
- }
-}
-
int
main (int argc, char *const *argv)
{
@@ -276,10 +283,12 @@
errorCount += testWithoutTimeout ();
errorCount += testWithTimeout ();
if (errorCount != 0)
- fprintf (stderr, "Error during test execution (code: %u)\n", errorCount);
+ fprintf (stderr,
+ "Error during test execution (code: %u)\n",
+ errorCount);
curl_global_cleanup ();
if ((withTimeout == 0) && (withoutTimeout == 0))
- return 0;
+ return 0;
else
- return errorCount; /* 0 == pass */
+ return errorCount; /* 0 == pass */
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29481 - libmicrohttpd/src/testcurl,
gnunet <=