tests: fixed libcurl HTTP/1.0 / HTTP/1.1 setting

author: Evgeny Grin (Karlson2k) <k2k@narod.ru> 2022-01-10 19:10:49 +0300
committer: Evgeny Grin (Karlson2k) <k2k@narod.ru> 2022-01-10 19:10:49 +0300
commit: 2f282f18d14f7d8709aabb0ba55b5414f3c45336 (patch)
tree: 735ac0dbaad60540b3ef68218970ab09d841d344
parent: a623db03b883812c6087130de8b314d0f80287b0 (diff)
download: libmicrohttpd-2f282f18d14f7d8709aabb0ba55b5414f3c45336.tar.gz
libmicrohttpd-2f282f18d14f7d8709aabb0ba55b5414f3c45336.zip
4 files changed, 20 insertions, 20 deletions
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index 76671cec..8f3916ab 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -445,11 +445,11 @@ curlEasyInitForTest (const char *queryPath, int port, struct CBC *pcbc)
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
                                     (long) response_timeout_val)) ||
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
-      (oneone) ?
+      ((oneone) ?
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_1)) :
+                                      CURL_HTTP_VERSION_1_1)) :
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_0)))
+                                      CURL_HTTP_VERSION_1_0))))
  {
    fprintf (stderr, "curl_easy_setopt() failed.\n");
    _exit (99);
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c
index ea74ab24..db8a0284 100644
--- a/src/testcurl/test_get_close_keep_alive.c
+++ b/src/testcurl/test_get_close_keep_alive.c
@@ -421,11 +421,11 @@ curlEasyInitForTest (const char *queryPath, int port, struct CBC *pcbc,
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
                                     hdr_chk_result)) ||
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
-      (oneone) ?
+      ((oneone) ?
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_1)) :
+                                      CURL_HTTP_VERSION_1_1)) :
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_0)))
+                                      CURL_HTTP_VERSION_1_0))))
  {
    fprintf (stderr, "curl_easy_setopt() failed.\n");
    externalErrorExit ();
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index 3078689b..4f33da2a 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -576,11 +576,11 @@ curlEasyInitForTest (const char *queryPath, const char *method,
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
                                     hdr_chk_result)) ||
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
-      (oneone) ?
+      ((oneone) ?
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_1)) :
+                                      CURL_HTTP_VERSION_1_1)) :
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_0)))
+                                      CURL_HTTP_VERSION_1_0))))
    libcurlErrorExitDesc ("curl_easy_setopt() failed");
  if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, method))
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index 51f87598..fb881fd6 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -499,11 +499,11 @@ curlEasyInitForTest (struct curlQueryParams *p,
                                     (long) 1)) ||
 #endif /* CURL_AT_LEAST_VERSION(7, 42, 0) */
      (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) ||
-      (oneone) ?
+      ((oneone) ?
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_1)) :
+                                      CURL_HTTP_VERSION_1_1)) :
-      (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+       (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                     CURL_HTTP_VERSION_1_0)))
+                                      CURL_HTTP_VERSION_1_0))))
    libcurlErrorExitDesc ("curl_easy_setopt() failed");
  if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method))
author	Evgeny Grin (Karlson2k) <k2k@narod.ru>	2022-01-10 19:10:49 +0300
committer	Evgeny Grin (Karlson2k) <k2k@narod.ru>	2022-01-10 19:10:49 +0300
commit	2f282f18d14f7d8709aabb0ba55b5414f3c45336 (patch)
tree	735ac0dbaad60540b3ef68218970ab09d841d344
parent	a623db03b883812c6087130de8b314d0f80287b0 (diff)
download	libmicrohttpd-2f282f18d14f7d8709aabb0ba55b5414f3c45336.tar.gz libmicrohttpd-2f282f18d14f7d8709aabb0ba55b5414f3c45336.zip

diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c index 76671cec..8f3916ab 100644 --- a/src/testcurl/test_add_conn.c +++ b/src/testcurl/test_add_conn.c
@@ -445,11 +445,11 @@ curlEasyInitForTest (const char queryPath, int port, struct CBC pcbc)
445	(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,	445	(CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT,
446	(long) response_timeout_val)) \|\|	446	(long) response_timeout_val)) \|\|
447	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|	447	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|
448	(oneone) ?	448	((oneone) ?
449	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	449	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
450	CURL_HTTP_VERSION_1_1)) :	450	CURL_HTTP_VERSION_1_1)) :
451	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	451	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
452	CURL_HTTP_VERSION_1_0)))	452	CURL_HTTP_VERSION_1_0))))
453	{	453	{
454	fprintf (stderr, "curl_easy_setopt() failed.\n");	454	fprintf (stderr, "curl_easy_setopt() failed.\n");
455	_exit (99);	455	_exit (99);


diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c index ea74ab24..db8a0284 100644 --- a/src/testcurl/test_get_close_keep_alive.c +++ b/src/testcurl/test_get_close_keep_alive.c
@@ -421,11 +421,11 @@ curlEasyInitForTest (const char queryPath, int port, struct CBC pcbc,
421	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,	421	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
422	hdr_chk_result)) \|\|	422	hdr_chk_result)) \|\|
423	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|	423	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|
424	(oneone) ?	424	((oneone) ?
425	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	425	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
426	CURL_HTTP_VERSION_1_1)) :	426	CURL_HTTP_VERSION_1_1)) :
427	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	427	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
428	CURL_HTTP_VERSION_1_0)))	428	CURL_HTTP_VERSION_1_0))))
429	{	429	{
430	fprintf (stderr, "curl_easy_setopt() failed.\n");	430	fprintf (stderr, "curl_easy_setopt() failed.\n");
431	externalErrorExit ();	431	externalErrorExit ();


diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c index 3078689b..4f33da2a 100644 --- a/src/testcurl/test_toolarge.c +++ b/src/testcurl/test_toolarge.c
@@ -576,11 +576,11 @@ curlEasyInitForTest (const char queryPath, const char method,
576	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,	576	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA,
577	hdr_chk_result)) \|\|	577	hdr_chk_result)) \|\|
578	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|	578	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|
579	(oneone) ?	579	((oneone) ?
580	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	580	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
581	CURL_HTTP_VERSION_1_1)) :	581	CURL_HTTP_VERSION_1_1)) :
582	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	582	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
583	CURL_HTTP_VERSION_1_0)))	583	CURL_HTTP_VERSION_1_0))))
584	libcurlErrorExitDesc ("curl_easy_setopt() failed");	584	libcurlErrorExitDesc ("curl_easy_setopt() failed");
585		585
586	if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, method))	586	if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, method))


diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c index 51f87598..fb881fd6 100644 --- a/src/testcurl/test_tricky.c +++ b/src/testcurl/test_tricky.c
@@ -499,11 +499,11 @@ curlEasyInitForTest (struct curlQueryParams *p,
499	(long) 1)) \|\|	499	(long) 1)) \|\|
500	#endif /* CURL_AT_LEAST_VERSION(7, 42, 0) */	500	#endif /* CURL_AT_LEAST_VERSION(7, 42, 0) */
501	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|	501	(CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) \|\|
502	(oneone) ?	502	((oneone) ?
503	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	503	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
504	CURL_HTTP_VERSION_1_1)) :	504	CURL_HTTP_VERSION_1_1)) :
505	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,	505	(CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
506	CURL_HTTP_VERSION_1_0)))	506	CURL_HTTP_VERSION_1_0))))
507	libcurlErrorExitDesc ("curl_easy_setopt() failed");	507	libcurlErrorExitDesc ("curl_easy_setopt() failed");
508		508
509	if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method))	509	if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method))