diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-10-31 15:20:39 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-10-31 15:20:39 +0300 |
commit | d1d4e15a97932b0122eb0c4a6d54453269c85792 (patch) | |
tree | 2608f823b884915f9900e499b627dfd329ea38c3 /src/testzzuf | |
parent | 424abcd21daf7000fa826a03de6188ea608a50ec (diff) | |
download | libmicrohttpd-d1d4e15a97932b0122eb0c4a6d54453269c85792.tar.gz libmicrohttpd-d1d4e15a97932b0122eb0c4a6d54453269c85792.zip |
Stick to C89 standard for a while
Diffstat (limited to 'src/testzzuf')
-rw-r--r-- | src/testzzuf/test_get.c | 18 | ||||
-rw-r--r-- | src/testzzuf/test_get_chunked.c | 18 | ||||
-rw-r--r-- | src/testzzuf/test_long_header.c | 12 | ||||
-rw-r--r-- | src/testzzuf/test_post.c | 18 | ||||
-rw-r--r-- | src/testzzuf/test_post_form.c | 18 | ||||
-rw-r--r-- | src/testzzuf/test_put.c | 18 | ||||
-rw-r--r-- | src/testzzuf/test_put_chunked.c | 24 | ||||
-rw-r--r-- | src/testzzuf/test_put_large.c | 18 |
8 files changed, 72 insertions, 72 deletions
diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c index 503aee44..7e116d09 100644 --- a/src/testzzuf/test_get.c +++ b/src/testzzuf/test_get.c | |||
@@ -124,9 +124,9 @@ testInternalGet () | |||
124 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 124 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
125 | else | 125 | else |
126 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 126 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
127 | // NOTE: use of CONNECTTIMEOUT without also | 127 | /* NOTE: use of CONNECTTIMEOUT without also |
128 | // setting NOSIGNAL results in really weird | 128 | * setting NOSIGNAL results in really weird |
129 | // crashes on my system! | 129 | * crashes on my system! */ |
130 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 130 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
131 | curl_easy_perform (c); | 131 | curl_easy_perform (c); |
132 | curl_easy_cleanup (c); | 132 | curl_easy_cleanup (c); |
@@ -168,9 +168,9 @@ testMultithreadedGet () | |||
168 | else | 168 | else |
169 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 169 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
171 | // NOTE: use of CONNECTTIMEOUT without also | 171 | /* NOTE: use of CONNECTTIMEOUT without also |
172 | // setting NOSIGNAL results in really weird | 172 | * setting NOSIGNAL results in really weird |
173 | // crashes on my system! | 173 | * crashes on my system! */ |
174 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 174 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
175 | curl_easy_perform (c); | 175 | curl_easy_perform (c); |
176 | curl_easy_cleanup (c); | 176 | curl_easy_cleanup (c); |
@@ -229,9 +229,9 @@ testExternalGet () | |||
229 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 229 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
230 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 230 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
231 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 231 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
232 | // NOTE: use of CONNECTTIMEOUT without also | 232 | /* NOTE: use of CONNECTTIMEOUT without also |
233 | // setting NOSIGNAL results in really weird | 233 | * setting NOSIGNAL results in really weird |
234 | // crashes on my system! | 234 | * crashes on my system! */ |
235 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 235 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
236 | mret = curl_multi_add_handle (multi, c); | 236 | mret = curl_multi_add_handle (multi, c); |
237 | if (mret != CURLM_OK) | 237 | if (mret != CURLM_OK) |
diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c index 3e274e7f..e36145ea 100644 --- a/src/testzzuf/test_get_chunked.c +++ b/src/testzzuf/test_get_chunked.c | |||
@@ -148,9 +148,9 @@ testInternalGet () | |||
148 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 148 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
149 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 149 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
150 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 150 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
151 | // NOTE: use of CONNECTTIMEOUT without also | 151 | /* NOTE: use of CONNECTTIMEOUT without also |
152 | // setting NOSIGNAL results in really weird | 152 | * setting NOSIGNAL results in really weird |
153 | // crashes on my system! | 153 | * crashes on my system! */ |
154 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 154 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
155 | curl_easy_perform (c); | 155 | curl_easy_perform (c); |
156 | curl_easy_cleanup (c); | 156 | curl_easy_cleanup (c); |
@@ -189,9 +189,9 @@ testMultithreadedGet () | |||
189 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 189 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
190 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 190 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
191 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 191 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
192 | // NOTE: use of CONNECTTIMEOUT without also | 192 | /* NOTE: use of CONNECTTIMEOUT without also |
193 | // setting NOSIGNAL results in really weird | 193 | * setting NOSIGNAL results in really weird |
194 | // crashes on my system! | 194 | * crashes on my system! */ |
195 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 195 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
196 | curl_easy_perform (c); | 196 | curl_easy_perform (c); |
197 | curl_easy_cleanup (c); | 197 | curl_easy_cleanup (c); |
@@ -247,9 +247,9 @@ testExternalGet () | |||
247 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 247 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
248 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 248 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
249 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 249 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
250 | // NOTE: use of CONNECTTIMEOUT without also | 250 | /* NOTE: use of CONNECTTIMEOUT without also |
251 | // setting NOSIGNAL results in really weird | 251 | * setting NOSIGNAL results in really weird |
252 | // crashes on my system! | 252 | * crashes on my system! */ |
253 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 253 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
254 | mret = curl_multi_add_handle (multi, c); | 254 | mret = curl_multi_add_handle (multi, c); |
255 | if (mret != CURLM_OK) | 255 | if (mret != CURLM_OK) |
diff --git a/src/testzzuf/test_long_header.c b/src/testzzuf/test_long_header.c index 26932ea0..c4e5cf81 100644 --- a/src/testzzuf/test_long_header.c +++ b/src/testzzuf/test_long_header.c | |||
@@ -139,9 +139,9 @@ testLongUrlGet () | |||
139 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 139 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
140 | else | 140 | else |
141 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 141 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
142 | // NOTE: use of CONNECTTIMEOUT without also | 142 | /* NOTE: use of CONNECTTIMEOUT without also |
143 | // setting NOSIGNAL results in really weird | 143 | * setting NOSIGNAL results in really weird |
144 | // crashes on my system! | 144 | * crashes on my system! */ |
145 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 145 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
146 | curl_easy_perform (c); | 146 | curl_easy_perform (c); |
147 | curl_easy_cleanup (c); | 147 | curl_easy_cleanup (c); |
@@ -202,9 +202,9 @@ testLongHeaderGet () | |||
202 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 202 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
203 | else | 203 | else |
204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
205 | // NOTE: use of CONNECTTIMEOUT without also | 205 | /* NOTE: use of CONNECTTIMEOUT without also |
206 | // setting NOSIGNAL results in really weird | 206 | * setting NOSIGNAL results in really weird |
207 | // crashes on my system! | 207 | * crashes on my system! */ |
208 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 208 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
209 | curl_easy_perform (c); | 209 | curl_easy_perform (c); |
210 | curl_slist_free_all (header); | 210 | curl_slist_free_all (header); |
diff --git a/src/testzzuf/test_post.c b/src/testzzuf/test_post.c index 51e67593..9a4a8e9c 100644 --- a/src/testzzuf/test_post.c +++ b/src/testzzuf/test_post.c | |||
@@ -186,9 +186,9 @@ testInternalPost () | |||
186 | else | 186 | else |
187 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 187 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
188 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 188 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
189 | // NOTE: use of CONNECTTIMEOUT without also | 189 | /* NOTE: use of CONNECTTIMEOUT without also |
190 | // setting NOSIGNAL results in really weird | 190 | * setting NOSIGNAL results in really weird |
191 | // crashes on my system! | 191 | * crashes on my system! */ |
192 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 192 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
193 | curl_easy_perform (c); | 193 | curl_easy_perform (c); |
194 | curl_easy_cleanup (c); | 194 | curl_easy_cleanup (c); |
@@ -238,9 +238,9 @@ testMultithreadedPost () | |||
238 | else | 238 | else |
239 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 239 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
240 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 240 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
241 | // NOTE: use of CONNECTTIMEOUT without also | 241 | /* NOTE: use of CONNECTTIMEOUT without also |
242 | // setting NOSIGNAL results in really weird | 242 | * setting NOSIGNAL results in really weird |
243 | // crashes on my system! | 243 | * crashes on my system! */ |
244 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 244 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
245 | curl_easy_perform (c); | 245 | curl_easy_perform (c); |
246 | curl_easy_cleanup (c); | 246 | curl_easy_cleanup (c); |
@@ -308,9 +308,9 @@ testExternalPost () | |||
308 | else | 308 | else |
309 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 309 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
310 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 310 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
311 | // NOTE: use of CONNECTTIMEOUT without also | 311 | /* NOTE: use of CONNECTTIMEOUT without also |
312 | // setting NOSIGNAL results in really weird | 312 | * setting NOSIGNAL results in really weird |
313 | // crashes on my system! | 313 | * crashes on my system! */ |
314 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 314 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
315 | 315 | ||
316 | 316 | ||
diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c index 60b0fe35..fe248d47 100644 --- a/src/testzzuf/test_post_form.c +++ b/src/testzzuf/test_post_form.c | |||
@@ -203,9 +203,9 @@ testInternalPost () | |||
203 | else | 203 | else |
204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 204 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
205 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 205 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
206 | // NOTE: use of CONNECTTIMEOUT without also | 206 | /* NOTE: use of CONNECTTIMEOUT without also |
207 | // setting NOSIGNAL results in really weird | 207 | * setting NOSIGNAL results in really weird |
208 | // crashes on my system! | 208 | * crashes on my system! */ |
209 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 209 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
210 | curl_easy_perform (c); | 210 | curl_easy_perform (c); |
211 | curl_easy_cleanup (c); | 211 | curl_easy_cleanup (c); |
@@ -254,9 +254,9 @@ testMultithreadedPost () | |||
254 | else | 254 | else |
255 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 255 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
256 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 256 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
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! */ |
260 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 260 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
261 | curl_easy_perform (c); | 261 | curl_easy_perform (c); |
262 | curl_easy_cleanup (c); | 262 | curl_easy_cleanup (c); |
@@ -322,9 +322,9 @@ testExternalPost () | |||
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, 15L); |
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! */ |
328 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 328 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
329 | 329 | ||
330 | 330 | ||
diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c index cc02b5c1..cfe12dee 100644 --- a/src/testzzuf/test_put.c +++ b/src/testzzuf/test_put.c | |||
@@ -153,9 +153,9 @@ testInternalPut () | |||
153 | else | 153 | else |
154 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 154 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
155 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 155 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
156 | // NOTE: use of CONNECTTIMEOUT without also | 156 | /* NOTE: use of CONNECTTIMEOUT without also |
157 | // setting NOSIGNAL results in really weird | 157 | * setting NOSIGNAL results in really weird |
158 | // crashes on my system! | 158 | * crashes on my system! */ |
159 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 159 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
160 | curl_easy_perform (c); | 160 | curl_easy_perform (c); |
161 | curl_easy_cleanup (c); | 161 | curl_easy_cleanup (c); |
@@ -204,9 +204,9 @@ testMultithreadedPut () | |||
204 | else | 204 | else |
205 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 205 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
206 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 206 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
207 | // NOTE: use of CONNECTTIMEOUT without also | 207 | /* NOTE: use of CONNECTTIMEOUT without also |
208 | // setting NOSIGNAL results in really weird | 208 | * setting NOSIGNAL results in really weird |
209 | // crashes on my system! | 209 | * crashes on my system! */ |
210 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 210 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
211 | curl_easy_perform (c); | 211 | curl_easy_perform (c); |
212 | curl_easy_cleanup (c); | 212 | curl_easy_cleanup (c); |
@@ -273,9 +273,9 @@ testExternalPut () | |||
273 | else | 273 | else |
274 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 274 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
275 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 275 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
276 | // NOTE: use of CONNECTTIMEOUT without also | 276 | /* NOTE: use of CONNECTTIMEOUT without also |
277 | // setting NOSIGNAL results in really weird | 277 | * setting NOSIGNAL results in really weird |
278 | // crashes on my system! | 278 | * crashes on my system! */ |
279 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 279 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
280 | 280 | ||
281 | 281 | ||
diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c index 87d7f7e8..72a9f316 100644 --- a/src/testzzuf/test_put_chunked.c +++ b/src/testzzuf/test_put_chunked.c | |||
@@ -151,17 +151,17 @@ testInternalPut () | |||
151 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); | 151 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); |
152 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); | 152 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); |
153 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); | 153 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); |
154 | /* by not giving the file size, we force chunking! */ | ||
154 | /* | 155 | /* |
155 | // by not giving the file size, we force chunking! | ||
156 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); | 156 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); |
157 | */ | 157 | */ |
158 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 158 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
159 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 159 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
160 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 160 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
161 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 161 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
162 | // NOTE: use of CONNECTTIMEOUT without also | 162 | /* NOTE: use of CONNECTTIMEOUT without also |
163 | // setting NOSIGNAL results in really weird | 163 | * setting NOSIGNAL results in really weird |
164 | // crashes on my system! | 164 | * crashes on my system! */ |
165 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 165 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
166 | curl_easy_perform (c); | 166 | curl_easy_perform (c); |
167 | curl_easy_cleanup (c); | 167 | curl_easy_cleanup (c); |
@@ -198,17 +198,17 @@ testMultithreadedPut () | |||
198 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); | 198 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); |
199 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); | 199 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); |
200 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); | 200 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); |
201 | /* by not giving the file size, we force chunking! */ | ||
201 | /* | 202 | /* |
202 | // by not giving the file size, we force chunking! | ||
203 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); | 203 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); |
204 | */ | 204 | */ |
205 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 205 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
206 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); | 206 | curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L); |
207 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); | 207 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); |
208 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); | 208 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L); |
209 | // NOTE: use of CONNECTTIMEOUT without also | 209 | /* NOTE: use of CONNECTTIMEOUT without also |
210 | // setting NOSIGNAL results in really weird | 210 | * setting NOSIGNAL results in really weird |
211 | // crashes on my system! | 211 | * crashes on my system! */ |
212 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 212 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
213 | if (CURLE_OK != (errornum = curl_easy_perform (c))) | 213 | if (CURLE_OK != (errornum = curl_easy_perform (c))) |
214 | { | 214 | { |
@@ -277,17 +277,17 @@ testExternalPut () | |||
277 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); | 277 | curl_easy_setopt (c, CURLOPT_READFUNCTION, &putBuffer); |
278 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); | 278 | curl_easy_setopt (c, CURLOPT_READDATA, &pos); |
279 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); | 279 | curl_easy_setopt (c, CURLOPT_UPLOAD, 1L); |
280 | /* by not giving the file size, we force chunking! */ | ||
280 | /* | 281 | /* |
281 | // by not giving the file size, we force chunking! | ||
282 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); | 282 | curl_easy_setopt (c, CURLOPT_INFILESIZE_LARGE, (curl_off_t) 8L); |
283 | */ | 283 | */ |
284 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 284 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
285 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); | 285 | curl_easy_setopt (c, CURLOPT_TIMEOUT_MS, CURL_TIMEOUT); |
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 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 287 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
288 | // NOTE: use of CONNECTTIMEOUT without also | 288 | /* NOTE: use of CONNECTTIMEOUT without also |
289 | // setting NOSIGNAL results in really weird | 289 | * setting NOSIGNAL results in really weird |
290 | // crashes on my system! | 290 | * crashes on my system! */ |
291 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 291 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
292 | 292 | ||
293 | 293 | ||
diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c index d52e7b91..540c37f9 100644 --- a/src/testzzuf/test_put_large.c +++ b/src/testzzuf/test_put_large.c | |||
@@ -168,9 +168,9 @@ testInternalPut () | |||
168 | else | 168 | else |
169 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 169 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 170 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
171 | // NOTE: use of CONNECTTIMEOUT without also | 171 | /* NOTE: use of CONNECTTIMEOUT without also |
172 | // setting NOSIGNAL results in really weird | 172 | * setting NOSIGNAL results in really weird |
173 | // crashes on my system! | 173 | * crashes on my system! */ |
174 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 174 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
175 | curl_easy_perform (c); | 175 | curl_easy_perform (c); |
176 | curl_easy_cleanup (c); | 176 | curl_easy_cleanup (c); |
@@ -220,9 +220,9 @@ testMultithreadedPut () | |||
220 | else | 220 | else |
221 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 221 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
222 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 222 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
223 | // NOTE: use of CONNECTTIMEOUT without also | 223 | /* NOTE: use of CONNECTTIMEOUT without also |
224 | // setting NOSIGNAL results in really weird | 224 | * setting NOSIGNAL results in really weird |
225 | // crashes on my system! | 225 | * crashes on my system! */ |
226 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 226 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
227 | curl_easy_perform (c); | 227 | curl_easy_perform (c); |
228 | curl_easy_cleanup (c); | 228 | curl_easy_cleanup (c); |
@@ -291,9 +291,9 @@ testExternalPut () | |||
291 | else | 291 | else |
292 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 292 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |
293 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); | 293 | curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT_MS, CURL_TIMEOUT); |
294 | // NOTE: use of CONNECTTIMEOUT without also | 294 | /* NOTE: use of CONNECTTIMEOUT without also |
295 | // setting NOSIGNAL results in really weird | 295 | * setting NOSIGNAL results in really weird |
296 | // crashes on my system! | 296 | * crashes on my system! */ |
297 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); | 297 | curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1); |
298 | 298 | ||
299 | 299 | ||