aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-04-20 22:18:35 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-04-21 13:40:09 +0300
commit166b572354c843c0efa84b9f0c866abf0d34497e (patch)
tree619c097e9d33bc8e0c7b0944fece83a1e3680046 /src
parent671ad58593e9a18155d5f9a4729001722908c297 (diff)
downloadlibmicrohttpd-166b572354c843c0efa84b9f0c866abf0d34497e.tar.gz
libmicrohttpd-166b572354c843c0efa84b9f0c866abf0d34497e.zip
Use HTTP/1.1 for all TLS tests
Nobody is using HTTP/1.0 with TLS
Diffstat (limited to 'src')
-rw-r--r--src/testcurl/https/test_empty_response.c1
-rw-r--r--src/testcurl/https/test_https_get_select.c2
-rw-r--r--src/testcurl/https/test_https_sni.c2
-rw-r--r--src/testcurl/https/tls_test_common.c4
4 files changed, 5 insertions, 4 deletions
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index c2dcf300..f4cce216 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -241,6 +241,7 @@ main (int argc, char *const *argv)
241 unsigned int errorCount = 0; 241 unsigned int errorCount = 0;
242 (void) argc; /* Unused. Silent compiler warning. */ 242 (void) argc; /* Unused. Silent compiler warning. */
243 243
244 oneone = 1;
244 if (! testsuite_curl_global_init ()) 245 if (! testsuite_curl_global_init ())
245 return 99; 246 return 99;
246 if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) 247 if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version)
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 65570aab..217c6bfa 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -268,7 +268,7 @@ main (int argc, char *const *argv)
268 unsigned int errorCount = 0; 268 unsigned int errorCount = 0;
269 (void) argc; /* Unused. Silent compiler warning. */ 269 (void) argc; /* Unused. Silent compiler warning. */
270 270
271 oneone = 0; 271 oneone = 1;
272 if (! testsuite_curl_global_init ()) 272 if (! testsuite_curl_global_init ())
273 return 99; 273 return 99;
274 if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version) 274 if (NULL == curl_version_info (CURLVERSION_NOW)->ssl_version)
diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c
index 4e7c1677..1c813c22 100644
--- a/src/testcurl/https/test_https_sni.c
+++ b/src/testcurl/https/test_https_sni.c
@@ -204,7 +204,7 @@ do_get (const char *url, int port)
204#endif 204#endif
205 curl_easy_setopt (c, CURLOPT_URL, url); 205 curl_easy_setopt (c, CURLOPT_URL, url);
206 curl_easy_setopt (c, CURLOPT_PORT, (long) port); 206 curl_easy_setopt (c, CURLOPT_PORT, (long) port);
207 curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); 207 curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
208 curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L); 208 curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L);
209 curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L); 209 curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L);
210 curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer); 210 curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
index 606ac7a3..36134ecc 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -95,7 +95,7 @@ test_daemon_get (void *cls,
95#endif 95#endif
96 if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) || 96 if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) ||
97 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION, 97 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
98 CURL_HTTP_VERSION_1_0))) || 98 CURL_HTTP_VERSION_1_1))) ||
99 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L))) || 99 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_TIMEOUT, 10L))) ||
100 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L))) || 100 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 10L))) ||
101 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, 101 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_WRITEFUNCTION,
@@ -280,7 +280,7 @@ send_curl_req (char *url,
280#endif 280#endif
281 if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) || 281 if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) ||
282 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION, 282 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
283 CURL_HTTP_VERSION_1_0))) || 283 CURL_HTTP_VERSION_1_1))) ||
284 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_TIMEOUT, 60L))) || 284 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_TIMEOUT, 60L))) ||
285 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 60L))) || 285 (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 60L))) ||
286 286