[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36895 - libmicrohttpd/src/testcurl
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36895 - libmicrohttpd/src/testcurl |
|
Date: |
Fri, 5 Feb 2016 21:47:54 +0100 |
Author: Karlson2k
Date: 2016-02-05 21:47:54 +0100 (Fri, 05 Feb 2016)
New Revision: 36895
Modified:
libmicrohttpd/src/testcurl/perf_get.c
libmicrohttpd/src/testcurl/test_callback.c
libmicrohttpd/src/testcurl/test_get.c
libmicrohttpd/src/testcurl/test_get_chunked.c
libmicrohttpd/src/testcurl/test_get_sendfile.c
libmicrohttpd/src/testcurl/test_large_put.c
libmicrohttpd/src/testcurl/test_parse_cookies.c
libmicrohttpd/src/testcurl/test_post.c
libmicrohttpd/src/testcurl/test_post_loop.c
libmicrohttpd/src/testcurl/test_postform.c
libmicrohttpd/src/testcurl/test_process_arguments.c
libmicrohttpd/src/testcurl/test_process_headers.c
libmicrohttpd/src/testcurl/test_put.c
libmicrohttpd/src/testcurl/test_put_chunked.c
libmicrohttpd/src/testcurl/test_quiesce.c
Log:
Fixed test compilation warnings for native W32 x64
Modified: libmicrohttpd/src/testcurl/perf_get.c
===================================================================
--- libmicrohttpd/src/testcurl/perf_get.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/perf_get.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -368,7 +368,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -421,12 +426,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (c != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -435,7 +441,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -445,7 +451,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_callback.c
===================================================================
--- libmicrohttpd/src/testcurl/test_callback.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_callback.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -93,7 +93,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
CURL *c;
CURLM *multi;
CURLMcode mret;
@@ -135,7 +140,8 @@
extra = 10;
while ( (c != NULL) || (--extra > 0) )
{
- max = MHD_INVALID_SOCKET;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO(&ws);
FD_ZERO(&rs);
FD_ZERO(&es);
@@ -142,7 +148,7 @@
curl_multi_perform (multi, &running);
if (NULL != multi)
{
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -153,7 +159,7 @@
}
}
if (MHD_YES !=
- MHD_get_fdset(d, &rs, &ws, &es, &max))
+ MHD_get_fdset(d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -163,7 +169,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select(max + 1, &rs, &ws, &es, &tv);
+ select(maxposixs + 1, &rs, &ws, &es, &tv);
if (NULL != multi)
{
curl_multi_perform (multi, &running);
Modified: libmicrohttpd/src/testcurl/test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_get.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -270,7 +270,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -319,12 +324,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -333,7 +339,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -343,7 +349,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_get_chunked.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get_chunked.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_get_chunked.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -291,7 +291,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -337,12 +342,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -351,7 +357,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -361,7 +367,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_get_sendfile.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get_sendfile.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_get_sendfile.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -276,7 +276,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -325,12 +330,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -339,7 +345,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -349,7 +355,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_large_put.c
===================================================================
--- libmicrohttpd/src/testcurl/test_large_put.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_large_put.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -330,7 +330,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -389,12 +394,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -403,7 +409,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -413,7 +419,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_parse_cookies.c
===================================================================
--- libmicrohttpd/src/testcurl/test_parse_cookies.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_parse_cookies.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -117,7 +117,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -171,12 +176,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -185,7 +191,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -195,7 +201,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_post.c
===================================================================
--- libmicrohttpd/src/testcurl/test_post.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_post.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -333,7 +333,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -387,12 +392,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -401,7 +407,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -411,7 +417,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_post_loop.c
===================================================================
--- libmicrohttpd/src/testcurl/test_post_loop.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_post_loop.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -311,7 +311,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -371,13 +376,14 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
while (CURLM_CALL_MULTI_PERFORM ==
curl_multi_perform (multi, &running));
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -386,7 +392,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -403,7 +409,7 @@
timeout = 0; /* terminate quickly... */
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
- if (-1 == select (max + 1, &rs, &ws, &es, &tv))
+ if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
if (EINTR == errno)
continue;
Modified: libmicrohttpd/src/testcurl/test_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/test_postform.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_postform.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -351,7 +351,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -407,12 +412,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -422,7 +428,7 @@
curl_formfree (pd);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -433,7 +439,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_process_arguments.c
===================================================================
--- libmicrohttpd/src/testcurl/test_process_arguments.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_process_arguments.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -120,7 +120,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -170,12 +175,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -184,7 +190,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -194,7 +200,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_process_headers.c
===================================================================
--- libmicrohttpd/src/testcurl/test_process_headers.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_process_headers.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -305,7 +305,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -354,12 +359,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -368,7 +374,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -378,7 +384,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_put.c
===================================================================
--- libmicrohttpd/src/testcurl/test_put.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_put.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -301,7 +301,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -357,12 +362,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -371,7 +377,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -381,7 +387,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_put_chunked.c
===================================================================
--- libmicrohttpd/src/testcurl/test_put_chunked.c 2016-02-05 17:27:39 UTC
(rev 36894)
+++ libmicrohttpd/src/testcurl/test_put_chunked.c 2016-02-05 20:47:54 UTC
(rev 36895)
@@ -311,7 +311,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -367,12 +372,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -381,7 +387,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -391,7 +397,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
Modified: libmicrohttpd/src/testcurl/test_quiesce.c
===================================================================
--- libmicrohttpd/src/testcurl/test_quiesce.c 2016-02-05 17:27:39 UTC (rev
36894)
+++ libmicrohttpd/src/testcurl/test_quiesce.c 2016-02-05 20:47:54 UTC (rev
36895)
@@ -311,7 +311,12 @@
fd_set rs;
fd_set ws;
fd_set es;
- MHD_socket max;
+ MHD_socket maxsock;
+#ifdef MHD_WINSOCK_SOCKETS
+ int maxposixs; /* Max socket number unused on W32 */
+#else /* MHD_POSIX_SOCKETS */
+#define maxposixs maxsock
+#endif /* MHD_POSIX_SOCKETS */
int running;
struct CURLMsg *msg;
time_t start;
@@ -349,12 +354,13 @@
start = time (NULL);
while ((time (NULL) - start < 5) && (multi != NULL))
{
- max = 0;
+ maxsock = MHD_INVALID_SOCKET;
+ maxposixs = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
+ mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
if (mret != CURLM_OK)
{
curl_multi_remove_handle (multi, c);
@@ -363,7 +369,7 @@
MHD_stop_daemon (d);
return 2048;
}
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
+ if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
{
curl_multi_remove_handle (multi, c);
curl_multi_cleanup (multi);
@@ -373,7 +379,7 @@
}
tv.tv_sec = 0;
tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
+ select (maxposixs + 1, &rs, &ws, &es, &tv);
curl_multi_perform (multi, &running);
if (running == 0)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36895 - libmicrohttpd/src/testcurl,
gnunet <=