commit 2f282f18d14f7d8709aabb0ba55b5414f3c45336
parent a623db03b883812c6087130de8b314d0f80287b0
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Mon, 10 Jan 2022 19:10:49 +0300
tests: fixed libcurl HTTP/1.0 / HTTP/1.1 setting
Diffstat:
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git 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) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0)))
+ ((oneone) ?
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ CURL_HTTP_VERSION_1_1)) :
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ 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
@@ -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) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0)))
+ ((oneone) ?
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ CURL_HTTP_VERSION_1_1)) :
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ 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
@@ -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) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0)))
+ ((oneone) ?
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ CURL_HTTP_VERSION_1_1)) :
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ 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
@@ -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) ?
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_1)) :
- (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
- CURL_HTTP_VERSION_1_0)))
+ ((oneone) ?
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ CURL_HTTP_VERSION_1_1)) :
+ (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+ CURL_HTTP_VERSION_1_0))))
libcurlErrorExitDesc ("curl_easy_setopt() failed");
if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method))