[gnurl] 40/282: HTTP: increase EXPECT_100_THRESHOLD to 1Mb

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 7ff9222ced8c1630bef87d7d744c286874e659ba
Author: 加藤郁之 <address@hidden>
AuthorDate: Tue Jan 14 23:34:56 2020 +0900

    HTTP: increase EXPECT_100_THRESHOLD to 1Mb
    
    Mentioned: https://curl.haxx.se/mail/lib-2020-01/0050.html
    
    Closes #4814
---
 docs/libcurl/opts/CURLOPT_POSTFIELDS.3 |   4 ++--
 lib/http.h                             |   2 +-
 tests/data/test1070                    |   4 ++--
 tests/data/test1129                    |  13 +++++++------
 tests/data/test1133                    |   1 -
 tests/data/test304                     |   1 -
 tests/data/test39                      |   1 -
 tests/data/test552                     | Bin 142985 -> 142941 bytes
 tests/data/test651                     |   1 -
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/docs/libcurl/opts/CURLOPT_POSTFIELDS.3 
b/docs/libcurl/opts/CURLOPT_POSTFIELDS.3
index 857e1d987..900d5388b 100644
--- a/docs/libcurl/opts/CURLOPT_POSTFIELDS.3
+++ b/docs/libcurl/opts/CURLOPT_POSTFIELDS.3
@@ -54,8 +54,8 @@ the POST data from the read callback. If you want to send a 
zero-byte POST set
 
 Using POST with HTTP 1.1 implies the use of a "Expect: 100-continue" header,
 and libcurl will add that header automatically if the POST is either known to
-be larger than 1024 bytes or if the expected size is unknown. You can disable
-this header with \fICURLOPT_HTTPHEADER(3)\fP as usual.
+be larger than 1MB or if the expected size is unknown. You can disable this
+header with \fICURLOPT_HTTPHEADER(3)\fP as usual.
 
 To make multipart/formdata posts (aka RFC2388-posts), check out the
 \fICURLOPT_HTTPPOST(3)\fP option combined with \fIcurl_formadd(3)\fP.
diff --git a/lib/http.h b/lib/http.h
index 70d5dccec..e6a9a27e4 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -116,7 +116,7 @@ CURLcode Curl_http_auth_act(struct connectdata *conn);
  *
  */
 #ifndef EXPECT_100_THRESHOLD
-#define EXPECT_100_THRESHOLD 1024
+#define EXPECT_100_THRESHOLD (1024*1024)
 #endif
 
 #endif /* CURL_DISABLE_HTTP */
diff --git a/tests/data/test1070 b/tests/data/test1070
index d202a9c07..81b473de4 100644
--- a/tests/data/test1070
+++ b/tests/data/test1070
@@ -32,7 +32,7 @@ http
 HTTP POST with server closing connection before (all) data is received
  </name>
  <command>
- -d @log/input1070 http://%HOSTIP:%HTTPPORT/1070
+ -d @log/input1070 http://%HOSTIP:%HTTPPORT/1070 -H "Expect: 100-continue"
 </command>
 <file name="log/input1070">
 This creates the named file with this content before the test case is run,
@@ -55,9 +55,9 @@ 
OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 POST /1070 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Expect: 100-continue
 Content-Length: 2313
 Content-Type: application/x-www-form-urlencoded
-Expect: 100-continue
 
 This creates 
 </protocol>
diff --git a/tests/data/test1129 b/tests/data/test1129
index f47141cd3..2ab3dea6a 100644
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -33,17 +33,18 @@ Content-Type: text/html
 # we use skip to make the test server never read the full payload off
 # the socket and instead return the response at once 
 <servercmd>
-skip: 1025
+skip: 1053896
 </servercmd>
 </reply>
 
 #
 # Client-side
 <client>
-# 1025 x 'x'
+# 1053896 x 'x'
 <file name="log/file1129">
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [...]
-</file>
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [...]
+
+</File>
 <server>
 http
 </server>
@@ -81,14 +82,14 @@ Content-Type: text/html
 POST /1129 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
-Content-Length: 1025
+Content-Length: 1053896
 Content-Type: application/x-www-form-urlencoded
 Expect: 100-continue
 
 POST /11290001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
-Content-Length: 1025
+Content-Length: 1053896
 Content-Type: application/x-www-form-urlencoded
 Expect: 100-continue
 
diff --git a/tests/data/test1133 b/tests/data/test1133
index 737f9d9e2..738e80614 100644
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -48,7 +48,6 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 
OpenSSL/0.9.7a ipv6 z
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 1264
-Expect: 100-continue
 Content-Type: multipart/form-data; 
boundary=----------------------------24e78000bd32
 
 ------------------------------24e78000bd32
diff --git a/tests/data/test304 b/tests/data/test304
index fedf18ff5..01d3a2d67 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -49,7 +49,6 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 
OpenSSL/0.9.7a ipv6 z
 Host: %HOSTIP:%HTTPSPORT
 Accept: */*
 Content-Length: 1386
-Expect: 100-continue
 Content-Type: multipart/form-data; 
boundary=----------------------------c3b2ef7f0bb8
 
 ------------------------------c3b2ef7f0bb8
diff --git a/tests/data/test39 b/tests/data/test39
index 1867b6081..3c6c57328 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -48,7 +48,6 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 
OpenSSL/0.9.7a ipv6 z
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 1184
-Expect: 100-continue
 Content-Type: multipart/form-data; 
boundary=----------------------------24e78000bd32
 
 ------------------------------24e78000bd32
diff --git a/tests/data/test552 b/tests/data/test552
index 5d1478bd5..47dd41abb 100644
Binary files a/tests/data/test552 and b/tests/data/test552 differ
diff --git a/tests/data/test651 b/tests/data/test651
index ae6409479..dd5736a70 100644
--- a/tests/data/test651
+++ b/tests/data/test651
@@ -61,7 +61,6 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 17139
 Content-Type: multipart/form-data; boundary=----------------------------
-Expect: 100-continue
 
 ------------------------------
 Content-Disposition: form-data; name="hello"

-- 
To stop receiving notification emails like this one, please contact
address@hidden.