diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-08 13:02:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-08 13:02:40 +0000 |
commit | d460042ef6dd4b77fcba7d2a6ae421b6a8399ea4 (patch) | |
tree | 24f8cd59919a1fb4ab95288a573ab4a46ce19130 | |
parent | 704717f23fed7e4f70f6d5a2f9e1d9c89f6c39d7 (diff) | |
download | libmicrohttpd-d460042ef6dd4b77fcba7d2a6ae421b6a8399ea4.tar.gz libmicrohttpd-d460042ef6dd4b77fcba7d2a6ae421b6a8399ea4.zip |
increase timeouts to escape problems with time_wait
22 files changed, 58 insertions, 58 deletions
diff --git a/src/testcurl/daemontest_digestauth.c b/src/testcurl/daemontest_digestauth.c index 5b4e7a9e..b308a430 100644 --- a/src/testcurl/daemontest_digestauth.c +++ b/src/testcurl/daemontest_digestauth.c | |||
@@ -197,7 +197,7 @@ testDigestAuth () | |||
197 | curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); | 197 | curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); |
198 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 198 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
199 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 199 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
200 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 200 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
202 | /* NOTE: use of CONNECTTIMEOUT without also | 202 | /* NOTE: use of CONNECTTIMEOUT without also |
203 | setting NOSIGNAL results in really weird | 203 | setting NOSIGNAL results in really weird |
diff --git a/src/testcurl/daemontest_digestauth_with_arguments.c b/src/testcurl/daemontest_digestauth_with_arguments.c index 130bfc44..1ff0c4e0 100644 --- a/src/testcurl/daemontest_digestauth_with_arguments.c +++ b/src/testcurl/daemontest_digestauth_with_arguments.c | |||
@@ -197,7 +197,7 @@ testDigestAuth () | |||
197 | curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); | 197 | curl_easy_setopt (c, CURLOPT_USERPWD, "testuser:testpass"); |
198 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 198 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
199 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 199 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
200 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 200 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
202 | /* NOTE: use of CONNECTTIMEOUT without also | 202 | /* NOTE: use of CONNECTTIMEOUT without also |
203 | setting NOSIGNAL results in really weird | 203 | setting NOSIGNAL results in really weird |
diff --git a/src/testcurl/daemontest_get.c b/src/testcurl/daemontest_get.c index 76e07b1b..d780028f 100644 --- a/src/testcurl/daemontest_get.c +++ b/src/testcurl/daemontest_get.c | |||
@@ -118,7 +118,7 @@ testInternalGet (int poll_flag) | |||
118 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 118 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
119 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 119 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
120 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 120 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
121 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 121 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
122 | if (oneone) | 122 | if (oneone) |
123 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 123 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
124 | else | 124 | else |
@@ -171,7 +171,7 @@ testMultithreadedGet (int poll_flag) | |||
171 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 171 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
172 | else | 172 | else |
173 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 173 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
174 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 174 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
175 | /* NOTE: use of CONNECTTIMEOUT without also | 175 | /* NOTE: use of CONNECTTIMEOUT without also |
176 | setting NOSIGNAL results in really weird | 176 | setting NOSIGNAL results in really weird |
177 | crashes on my system! */ | 177 | crashes on my system! */ |
@@ -221,7 +221,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
221 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 221 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
222 | else | 222 | else |
223 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 223 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
224 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 224 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
225 | /* NOTE: use of CONNECTTIMEOUT without also | 225 | /* NOTE: use of CONNECTTIMEOUT without also |
226 | setting NOSIGNAL results in really weird | 226 | setting NOSIGNAL results in really weird |
227 | crashes on my system!*/ | 227 | crashes on my system!*/ |
@@ -280,7 +280,7 @@ testExternalGet () | |||
280 | else | 280 | else |
281 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 281 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
282 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 282 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
283 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 283 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
284 | /* NOTE: use of CONNECTTIMEOUT without also | 284 | /* NOTE: use of CONNECTTIMEOUT without also |
285 | setting NOSIGNAL results in really weird | 285 | setting NOSIGNAL results in really weird |
286 | crashes on my system! */ | 286 | crashes on my system! */ |
@@ -412,7 +412,7 @@ testUnknownPortGet (int poll_flag) | |||
412 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 412 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
413 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 413 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
414 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 414 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
415 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 415 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
416 | if (oneone) | 416 | if (oneone) |
417 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 417 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
418 | else | 418 | else |
diff --git a/src/testcurl/daemontest_get_chunked.c b/src/testcurl/daemontest_get_chunked.c index 9d7f3c88..d80de8de 100644 --- a/src/testcurl/daemontest_get_chunked.c +++ b/src/testcurl/daemontest_get_chunked.c | |||
@@ -167,7 +167,7 @@ testInternalGet () | |||
167 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 167 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
168 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 168 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
169 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 169 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
171 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 171 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
172 | // NOTE: use of CONNECTTIMEOUT without also | 172 | // NOTE: use of CONNECTTIMEOUT without also |
173 | // setting NOSIGNAL results in really weird | 173 | // setting NOSIGNAL results in really weird |
@@ -210,7 +210,7 @@ testMultithreadedGet () | |||
210 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 210 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
211 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 211 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
212 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 212 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
213 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 213 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
214 | // NOTE: use of CONNECTTIMEOUT without also | 214 | // NOTE: use of CONNECTTIMEOUT without also |
215 | // setting NOSIGNAL results in really weird | 215 | // setting NOSIGNAL results in really weird |
216 | // crashes on my system! | 216 | // crashes on my system! |
@@ -253,7 +253,7 @@ testMultithreadedPoolGet () | |||
253 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 253 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
254 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 254 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
255 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 255 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
256 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 256 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
257 | // NOTE: use of CONNECTTIMEOUT without also | 257 | // NOTE: use of CONNECTTIMEOUT without also |
258 | // setting NOSIGNAL results in really weird | 258 | // setting NOSIGNAL results in really weird |
259 | // crashes on my system! | 259 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_get_sendfile.c b/src/testcurl/daemontest_get_sendfile.c index 5afc0a35..7a73f08d 100644 --- a/src/testcurl/daemontest_get_sendfile.c +++ b/src/testcurl/daemontest_get_sendfile.c | |||
@@ -127,7 +127,7 @@ testInternalGet () | |||
127 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 127 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
128 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 128 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
129 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 129 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
130 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 130 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
131 | if (oneone) | 131 | if (oneone) |
132 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 132 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
133 | else | 133 | else |
@@ -180,7 +180,7 @@ testMultithreadedGet () | |||
180 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 180 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
181 | else | 181 | else |
182 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 182 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
183 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 183 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
184 | /* NOTE: use of CONNECTTIMEOUT without also | 184 | /* NOTE: use of CONNECTTIMEOUT without also |
185 | setting NOSIGNAL results in really weird | 185 | setting NOSIGNAL results in really weird |
186 | crashes on my system! */ | 186 | crashes on my system! */ |
@@ -230,7 +230,7 @@ testMultithreadedPoolGet () | |||
230 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 230 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
231 | else | 231 | else |
232 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 232 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
233 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 233 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
234 | /* NOTE: use of CONNECTTIMEOUT without also | 234 | /* NOTE: use of CONNECTTIMEOUT without also |
235 | setting NOSIGNAL results in really weird | 235 | setting NOSIGNAL results in really weird |
236 | crashes on my system!*/ | 236 | crashes on my system!*/ |
@@ -289,7 +289,7 @@ testExternalGet () | |||
289 | else | 289 | else |
290 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 290 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
291 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 291 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
292 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 292 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
293 | /* NOTE: use of CONNECTTIMEOUT without also | 293 | /* NOTE: use of CONNECTTIMEOUT without also |
294 | setting NOSIGNAL results in really weird | 294 | setting NOSIGNAL results in really weird |
295 | crashes on my system! */ | 295 | crashes on my system! */ |
@@ -421,7 +421,7 @@ testUnknownPortGet () | |||
421 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 421 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
422 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 422 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
423 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 423 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
424 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 424 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
425 | if (oneone) | 425 | if (oneone) |
426 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 426 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
427 | else | 427 | else |
diff --git a/src/testcurl/daemontest_iplimit.c b/src/testcurl/daemontest_iplimit.c index 72a46055..0b2b9b6c 100644 --- a/src/testcurl/daemontest_iplimit.c +++ b/src/testcurl/daemontest_iplimit.c | |||
@@ -131,7 +131,7 @@ testMultithreadedGet () | |||
131 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 131 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
132 | curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); | 132 | curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); |
133 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 133 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
134 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 134 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
135 | // NOTE: use of CONNECTTIMEOUT without also | 135 | // NOTE: use of CONNECTTIMEOUT without also |
136 | // setting NOSIGNAL results in really weird | 136 | // setting NOSIGNAL results in really weird |
137 | // crashes on my system! | 137 | // crashes on my system! |
@@ -229,7 +229,7 @@ testMultithreadedPoolGet () | |||
229 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 229 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
230 | curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); | 230 | curl_easy_setopt (c, CURLOPT_FORBID_REUSE, 0L); |
231 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 231 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
232 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 232 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
233 | // NOTE: use of CONNECTTIMEOUT without also | 233 | // NOTE: use of CONNECTTIMEOUT without also |
234 | // setting NOSIGNAL results in really weird | 234 | // setting NOSIGNAL results in really weird |
235 | // crashes on my system! | 235 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_large_put.c b/src/testcurl/daemontest_large_put.c index 048409f9..4b9ae5fc 100644 --- a/src/testcurl/daemontest_large_put.c +++ b/src/testcurl/daemontest_large_put.c | |||
@@ -166,7 +166,7 @@ testInternalPut () | |||
166 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 166 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
167 | else | 167 | else |
168 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 168 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
169 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 169 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
170 | // NOTE: use of CONNECTTIMEOUT without also | 170 | // NOTE: use of CONNECTTIMEOUT without also |
171 | // setting NOSIGNAL results in really weird | 171 | // setting NOSIGNAL results in really weird |
172 | // crashes on my system! | 172 | // crashes on my system! |
@@ -224,7 +224,7 @@ testMultithreadedPut () | |||
224 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 224 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
225 | else | 225 | else |
226 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 226 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
227 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 227 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
228 | // NOTE: use of CONNECTTIMEOUT without also | 228 | // NOTE: use of CONNECTTIMEOUT without also |
229 | // setting NOSIGNAL results in really weird | 229 | // setting NOSIGNAL results in really weird |
230 | // crashes on my system! | 230 | // crashes on my system! |
@@ -286,7 +286,7 @@ testMultithreadedPoolPut () | |||
286 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 286 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
287 | else | 287 | else |
288 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 288 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
289 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 289 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
290 | // NOTE: use of CONNECTTIMEOUT without also | 290 | // NOTE: use of CONNECTTIMEOUT without also |
291 | // setting NOSIGNAL results in really weird | 291 | // setting NOSIGNAL results in really weird |
292 | // crashes on my system! | 292 | // crashes on my system! |
@@ -357,7 +357,7 @@ testExternalPut () | |||
357 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 357 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
358 | else | 358 | else |
359 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 359 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
360 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 360 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
361 | // NOTE: use of CONNECTTIMEOUT without also | 361 | // NOTE: use of CONNECTTIMEOUT without also |
362 | // setting NOSIGNAL results in really weird | 362 | // setting NOSIGNAL results in really weird |
363 | // crashes on my system! | 363 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_long_header.c b/src/testcurl/daemontest_long_header.c index a3db4b7a..4df2c6da 100644 --- a/src/testcurl/daemontest_long_header.c +++ b/src/testcurl/daemontest_long_header.c | |||
@@ -126,7 +126,7 @@ testLongUrlGet () | |||
126 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 126 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
127 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 127 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
128 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 128 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
129 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 129 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
130 | if (oneone) | 130 | if (oneone) |
131 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 131 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
132 | else | 132 | else |
@@ -201,7 +201,7 @@ testLongHeaderGet () | |||
201 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 201 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
202 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 202 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
203 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 203 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
204 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 204 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
205 | if (oneone) | 205 | if (oneone) |
206 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 206 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
207 | else | 207 | else |
diff --git a/src/testcurl/daemontest_parse_cookies.c b/src/testcurl/daemontest_parse_cookies.c index c3f75729..018f4a0f 100644 --- a/src/testcurl/daemontest_parse_cookies.c +++ b/src/testcurl/daemontest_parse_cookies.c | |||
@@ -146,7 +146,7 @@ testExternalGet () | |||
146 | else | 146 | else |
147 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 147 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
148 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 148 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
149 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 149 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
150 | /* NOTE: use of CONNECTTIMEOUT without also | 150 | /* NOTE: use of CONNECTTIMEOUT without also |
151 | setting NOSIGNAL results in really weird | 151 | setting NOSIGNAL results in really weird |
152 | crashes on my system! */ | 152 | crashes on my system! */ |
diff --git a/src/testcurl/daemontest_post.c b/src/testcurl/daemontest_post.c index f6a26b61..f889afd8 100644 --- a/src/testcurl/daemontest_post.c +++ b/src/testcurl/daemontest_post.c | |||
@@ -156,7 +156,7 @@ testInternalPost () | |||
156 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 156 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
157 | else | 157 | else |
158 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 158 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
159 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 159 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
160 | // NOTE: use of CONNECTTIMEOUT without also | 160 | // NOTE: use of CONNECTTIMEOUT without also |
161 | // setting NOSIGNAL results in really weird | 161 | // setting NOSIGNAL results in really weird |
162 | // crashes on my system! | 162 | // crashes on my system! |
@@ -208,7 +208,7 @@ testMultithreadedPost () | |||
208 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 208 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
209 | else | 209 | else |
210 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 210 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
211 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 211 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
212 | // NOTE: use of CONNECTTIMEOUT without also | 212 | // NOTE: use of CONNECTTIMEOUT without also |
213 | // setting NOSIGNAL results in really weird | 213 | // setting NOSIGNAL results in really weird |
214 | // crashes on my system! | 214 | // crashes on my system! |
@@ -261,7 +261,7 @@ testMultithreadedPoolPost () | |||
261 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 261 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
262 | else | 262 | else |
263 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 263 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
264 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 264 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
265 | // NOTE: use of CONNECTTIMEOUT without also | 265 | // NOTE: use of CONNECTTIMEOUT without also |
266 | // setting NOSIGNAL results in really weird | 266 | // setting NOSIGNAL results in really weird |
267 | // crashes on my system! | 267 | // crashes on my system! |
@@ -323,7 +323,7 @@ testExternalPost () | |||
323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
324 | else | 324 | else |
325 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 325 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
326 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 326 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
327 | // NOTE: use of CONNECTTIMEOUT without also | 327 | // NOTE: use of CONNECTTIMEOUT without also |
328 | // setting NOSIGNAL results in really weird | 328 | // setting NOSIGNAL results in really weird |
329 | // crashes on my system! | 329 | // crashes on my system! |
@@ -530,7 +530,7 @@ testMultithreadedPostCancelPart(int flags) | |||
530 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 530 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
531 | else | 531 | else |
532 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 532 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
533 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 533 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
534 | // NOTE: use of CONNECTTIMEOUT without also | 534 | // NOTE: use of CONNECTTIMEOUT without also |
535 | // setting NOSIGNAL results in really weird | 535 | // setting NOSIGNAL results in really weird |
536 | // crashes on my system! | 536 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_post_loop.c b/src/testcurl/daemontest_post_loop.c index 56d2447b..e19941df 100644 --- a/src/testcurl/daemontest_post_loop.c +++ b/src/testcurl/daemontest_post_loop.c | |||
@@ -136,7 +136,7 @@ testInternalPost () | |||
136 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 136 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
137 | else | 137 | else |
138 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 138 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
139 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 139 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
140 | // NOTE: use of CONNECTTIMEOUT without also | 140 | // NOTE: use of CONNECTTIMEOUT without also |
141 | // setting NOSIGNAL results in really weird | 141 | // setting NOSIGNAL results in really weird |
142 | // crashes on my system! | 142 | // crashes on my system! |
@@ -200,7 +200,7 @@ testMultithreadedPost () | |||
200 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 200 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
201 | else | 201 | else |
202 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 202 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
203 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 203 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
204 | // NOTE: use of CONNECTTIMEOUT without also | 204 | // NOTE: use of CONNECTTIMEOUT without also |
205 | // setting NOSIGNAL results in really weird | 205 | // setting NOSIGNAL results in really weird |
206 | // crashes on my system! | 206 | // crashes on my system! |
@@ -265,7 +265,7 @@ testMultithreadedPoolPost () | |||
265 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 265 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
266 | else | 266 | else |
267 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 267 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
268 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 268 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
269 | // NOTE: use of CONNECTTIMEOUT without also | 269 | // NOTE: use of CONNECTTIMEOUT without also |
270 | // setting NOSIGNAL results in really weird | 270 | // setting NOSIGNAL results in really weird |
271 | // crashes on my system! | 271 | // crashes on my system! |
@@ -348,7 +348,7 @@ testExternalPost () | |||
348 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 348 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
349 | else | 349 | else |
350 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 350 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
351 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 351 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
352 | // NOTE: use of CONNECTTIMEOUT without also | 352 | // NOTE: use of CONNECTTIMEOUT without also |
353 | // setting NOSIGNAL results in really weird | 353 | // setting NOSIGNAL results in really weird |
354 | // crashes on my system! | 354 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_postform.c b/src/testcurl/daemontest_postform.c index aa0ff17b..c02cf636 100644 --- a/src/testcurl/daemontest_postform.c +++ b/src/testcurl/daemontest_postform.c | |||
@@ -172,7 +172,7 @@ testInternalPost () | |||
172 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 172 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
173 | else | 173 | else |
174 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 174 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
175 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 175 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
176 | // NOTE: use of CONNECTTIMEOUT without also | 176 | // NOTE: use of CONNECTTIMEOUT without also |
177 | // setting NOSIGNAL results in really weird | 177 | // setting NOSIGNAL results in really weird |
178 | // crashes on my system! | 178 | // crashes on my system! |
@@ -345,7 +345,7 @@ testExternalPost () | |||
345 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 345 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
346 | else | 346 | else |
347 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 347 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
348 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 348 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
349 | // NOTE: use of CONNECTTIMEOUT without also | 349 | // NOTE: use of CONNECTTIMEOUT without also |
350 | // setting NOSIGNAL results in really weird | 350 | // setting NOSIGNAL results in really weird |
351 | // crashes on my system! | 351 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_process_arguments.c b/src/testcurl/daemontest_process_arguments.c index ad836509..cb8a81a2 100644 --- a/src/testcurl/daemontest_process_arguments.c +++ b/src/testcurl/daemontest_process_arguments.c | |||
@@ -135,7 +135,7 @@ testExternalGet () | |||
135 | else | 135 | else |
136 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 136 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
137 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 137 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
138 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 138 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
139 | /* NOTE: use of CONNECTTIMEOUT without also | 139 | /* NOTE: use of CONNECTTIMEOUT without also |
140 | setting NOSIGNAL results in really weird | 140 | setting NOSIGNAL results in really weird |
141 | crashes on my system! */ | 141 | crashes on my system! */ |
diff --git a/src/testcurl/daemontest_process_headers.c b/src/testcurl/daemontest_process_headers.c index f3ef879d..fbe28849 100644 --- a/src/testcurl/daemontest_process_headers.c +++ b/src/testcurl/daemontest_process_headers.c | |||
@@ -160,7 +160,7 @@ testInternalGet () | |||
160 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 160 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
161 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 161 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
162 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 162 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
163 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 163 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
164 | if (oneone) | 164 | if (oneone) |
165 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 165 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
166 | else | 166 | else |
@@ -213,7 +213,7 @@ testMultithreadedGet () | |||
213 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 213 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
214 | else | 214 | else |
215 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 215 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
216 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 216 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
217 | /* NOTE: use of CONNECTTIMEOUT without also | 217 | /* NOTE: use of CONNECTTIMEOUT without also |
218 | setting NOSIGNAL results in really weird | 218 | setting NOSIGNAL results in really weird |
219 | crashes on my system! */ | 219 | crashes on my system! */ |
@@ -263,7 +263,7 @@ testMultithreadedPoolGet () | |||
263 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 263 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
264 | else | 264 | else |
265 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 265 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
266 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 266 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
267 | /* NOTE: use of CONNECTTIMEOUT without also | 267 | /* NOTE: use of CONNECTTIMEOUT without also |
268 | setting NOSIGNAL results in really weird | 268 | setting NOSIGNAL results in really weird |
269 | crashes on my system! */ | 269 | crashes on my system! */ |
@@ -322,7 +322,7 @@ testExternalGet () | |||
322 | else | 322 | else |
323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
324 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 324 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
325 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 325 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
326 | /* NOTE: use of CONNECTTIMEOUT without also | 326 | /* NOTE: use of CONNECTTIMEOUT without also |
327 | setting NOSIGNAL results in really weird | 327 | setting NOSIGNAL results in really weird |
328 | crashes on my system! */ | 328 | crashes on my system! */ |
diff --git a/src/testcurl/daemontest_put.c b/src/testcurl/daemontest_put.c index 672790eb..ce3d8de7 100644 --- a/src/testcurl/daemontest_put.c +++ b/src/testcurl/daemontest_put.c | |||
@@ -143,7 +143,7 @@ testInternalPut () | |||
143 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 143 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
144 | else | 144 | else |
145 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 145 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
146 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 146 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
147 | // NOTE: use of CONNECTTIMEOUT without also | 147 | // NOTE: use of CONNECTTIMEOUT without also |
148 | // setting NOSIGNAL results in really weird | 148 | // setting NOSIGNAL results in really weird |
149 | // crashes on my system! | 149 | // crashes on my system! |
@@ -199,7 +199,7 @@ testMultithreadedPut () | |||
199 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 199 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
200 | else | 200 | else |
201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 201 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
202 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 202 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
203 | // NOTE: use of CONNECTTIMEOUT without also | 203 | // NOTE: use of CONNECTTIMEOUT without also |
204 | // setting NOSIGNAL results in really weird | 204 | // setting NOSIGNAL results in really weird |
205 | // crashes on my system! | 205 | // crashes on my system! |
@@ -257,7 +257,7 @@ testMultithreadedPoolPut () | |||
257 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 257 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
258 | else | 258 | else |
259 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 259 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
260 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 260 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
261 | // NOTE: use of CONNECTTIMEOUT without also | 261 | // NOTE: use of CONNECTTIMEOUT without also |
262 | // setting NOSIGNAL results in really weird | 262 | // setting NOSIGNAL results in really weird |
263 | // crashes on my system! | 263 | // crashes on my system! |
@@ -325,7 +325,7 @@ testExternalPut () | |||
325 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 325 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
326 | else | 326 | else |
327 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 327 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
328 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 328 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
329 | // NOTE: use of CONNECTTIMEOUT without also | 329 | // NOTE: use of CONNECTTIMEOUT without also |
330 | // setting NOSIGNAL results in really weird | 330 | // setting NOSIGNAL results in really weird |
331 | // crashes on my system! | 331 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_put_chunked.c b/src/testcurl/daemontest_put_chunked.c index fdd4cfc7..ced7b29d 100644 --- a/src/testcurl/daemontest_put_chunked.c +++ b/src/testcurl/daemontest_put_chunked.c | |||
@@ -153,7 +153,7 @@ testInternalPut () | |||
153 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 153 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
154 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 154 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
155 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 155 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
156 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 156 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
157 | // NOTE: use of CONNECTTIMEOUT without also | 157 | // NOTE: use of CONNECTTIMEOUT without also |
158 | // setting NOSIGNAL results in really weird | 158 | // setting NOSIGNAL results in really weird |
159 | // crashes on my system! | 159 | // crashes on my system! |
@@ -209,7 +209,7 @@ testMultithreadedPut () | |||
209 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 209 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
210 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 210 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
211 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 211 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
212 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 212 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
213 | // NOTE: use of CONNECTTIMEOUT without also | 213 | // NOTE: use of CONNECTTIMEOUT without also |
214 | // setting NOSIGNAL results in really weird | 214 | // setting NOSIGNAL results in really weird |
215 | // crashes on my system! | 215 | // crashes on my system! |
@@ -267,7 +267,7 @@ testMultithreadedPoolPut () | |||
267 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 267 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
268 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 268 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
269 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 269 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
270 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 270 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
271 | // NOTE: use of CONNECTTIMEOUT without also | 271 | // NOTE: use of CONNECTTIMEOUT without also |
272 | // setting NOSIGNAL results in really weird | 272 | // setting NOSIGNAL results in really weird |
273 | // crashes on my system! | 273 | // crashes on my system! |
@@ -335,7 +335,7 @@ testExternalPut () | |||
335 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 335 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
336 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 336 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
337 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 337 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
338 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 338 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
339 | // NOTE: use of CONNECTTIMEOUT without also | 339 | // NOTE: use of CONNECTTIMEOUT without also |
340 | // setting NOSIGNAL results in really weird | 340 | // setting NOSIGNAL results in really weird |
341 | // crashes on my system! | 341 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_timeout.c b/src/testcurl/daemontest_timeout.c index ff376d39..0596a73a 100644 --- a/src/testcurl/daemontest_timeout.c +++ b/src/testcurl/daemontest_timeout.c | |||
@@ -161,7 +161,7 @@ testWithoutTimeout () | |||
161 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 161 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
162 | else | 162 | else |
163 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 163 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
164 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 164 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
165 | // NOTE: use of CONNECTTIMEOUT without also | 165 | // NOTE: use of CONNECTTIMEOUT without also |
166 | // setting NOSIGNAL results in really weird | 166 | // setting NOSIGNAL results in really weird |
167 | // crashes on my system! | 167 | // crashes on my system! |
@@ -216,7 +216,7 @@ testWithTimeout () | |||
216 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 216 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
217 | else | 217 | else |
218 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 218 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
219 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 219 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
220 | // NOTE: use of CONNECTTIMEOUT without also | 220 | // NOTE: use of CONNECTTIMEOUT without also |
221 | // setting NOSIGNAL results in really weird | 221 | // setting NOSIGNAL results in really weird |
222 | // crashes on my system! | 222 | // crashes on my system! |
diff --git a/src/testcurl/daemontest_urlparse.c b/src/testcurl/daemontest_urlparse.c index 39812324..8a809073 100644 --- a/src/testcurl/daemontest_urlparse.c +++ b/src/testcurl/daemontest_urlparse.c | |||
@@ -141,7 +141,7 @@ testInternalGet (int poll_flag) | |||
141 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 141 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
142 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 142 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
143 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 143 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
144 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 144 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
145 | if (oneone) | 145 | if (oneone) |
146 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 146 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
147 | else | 147 | else |
diff --git a/src/testcurl/https/mhds_get_test_select.c b/src/testcurl/https/mhds_get_test_select.c index 1a524e1f..4e8260c2 100644 --- a/src/testcurl/https/mhds_get_test_select.c +++ b/src/testcurl/https/mhds_get_test_select.c | |||
@@ -122,7 +122,7 @@ testExternalGet () | |||
122 | else | 122 | else |
123 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 123 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
124 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 124 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
125 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 125 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
126 | /* NOTE: use of CONNECTTIMEOUT without also | 126 | /* NOTE: use of CONNECTTIMEOUT without also |
127 | setting NOSIGNAL results in really weird | 127 | setting NOSIGNAL results in really weird |
128 | crashes on my system! */ | 128 | crashes on my system! */ |
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index f6d90bec..eccdef94 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c | |||
@@ -199,7 +199,7 @@ testInternalGet (int port, int poll_flag) | |||
199 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); | 199 | curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); |
200 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 200 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
201 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 201 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
202 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 202 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
203 | if (oneone) | 203 | if (oneone) |
204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
205 | else | 205 | else |
@@ -262,7 +262,7 @@ testMultithreadedGet (int port, int poll_flag) | |||
262 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 262 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
263 | else | 263 | else |
264 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 264 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
265 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 265 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
266 | /* NOTE: use of CONNECTTIMEOUT without also | 266 | /* NOTE: use of CONNECTTIMEOUT without also |
267 | setting NOSIGNAL results in really weird | 267 | setting NOSIGNAL results in really weird |
268 | crashes on my system! */ | 268 | crashes on my system! */ |
@@ -321,7 +321,7 @@ testMultithreadedPoolGet (int port, int poll_flag) | |||
321 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 321 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
322 | else | 322 | else |
323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 323 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
324 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 324 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
325 | /* NOTE: use of CONNECTTIMEOUT without also | 325 | /* NOTE: use of CONNECTTIMEOUT without also |
326 | setting NOSIGNAL results in really weird | 326 | setting NOSIGNAL results in really weird |
327 | crashes on my system!*/ | 327 | crashes on my system!*/ |
@@ -395,7 +395,7 @@ testExternalGet (int port) | |||
395 | else | 395 | else |
396 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 396 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
397 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 397 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
398 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 398 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
399 | /* NOTE: use of CONNECTTIMEOUT without also | 399 | /* NOTE: use of CONNECTTIMEOUT without also |
400 | setting NOSIGNAL results in really weird | 400 | setting NOSIGNAL results in really weird |
401 | crashes on my system! */ | 401 | crashes on my system! */ |
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c index 1c68a657..db8a3d19 100644 --- a/src/testcurl/perf_get_concurrent.c +++ b/src/testcurl/perf_get_concurrent.c | |||
@@ -186,7 +186,7 @@ do_gets (int port) | |||
186 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 186 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
187 | else | 187 | else |
188 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 188 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
189 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 189 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
190 | /* NOTE: use of CONNECTTIMEOUT without also | 190 | /* NOTE: use of CONNECTTIMEOUT without also |
191 | setting NOSIGNAL results in really weird | 191 | setting NOSIGNAL results in really weird |
192 | crashes on my system! */ | 192 | crashes on my system! */ |
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c index 03557ed2..cc553324 100644 --- a/src/testcurl/test_callback.c +++ b/src/testcurl/test_callback.c | |||
@@ -110,7 +110,7 @@ int main(int argc, char **argv) | |||
110 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 110 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
111 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 111 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
112 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 112 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
113 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 113 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 150L); |
114 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 114 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
115 | multi = curl_multi_init (); | 115 | multi = curl_multi_init (); |
116 | if (multi == NULL) | 116 | if (multi == NULL) |