From: Viktor Szakats Date: Wed, 10 Dec 2025 21:42:35 +0000 (+0100) Subject: tests/data: replace `&` with `%AMP` X-Git-Tag: rc-8_18_0-2~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73b732e3e8d3b23bc8b11ee8024448f9e61ced7d;p=thirdparty%2Fcurl.git tests/data: replace `&` with `%AMP` For XML-compliance. Closes #19923 --- diff --git a/tests/data/test1011 b/tests/data/test1011 index 4f5111dea2..c15fab06dc 100644 --- a/tests/data/test1011 +++ b/tests/data/test1011 @@ -4,7 +4,6 @@ HTTP HTTP POST followlocation -notxml # @@ -12,7 +11,7 @@ notxml HTTP/1.1 301 OK -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Content-Length: 0 @@ -27,7 +26,7 @@ body HTTP/1.1 301 OK -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Content-Length: 0 @@ -65,7 +64,7 @@ Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded -mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1 +mooGET /blah/moo.html%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1012 b/tests/data/test1012 index ef2d679bfc..fe678aa006 100644 --- a/tests/data/test1012 +++ b/tests/data/test1012 @@ -4,7 +4,6 @@ HTTP HTTP POST followlocation -notxml # @@ -12,7 +11,7 @@ notxml HTTP/1.1 301 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -27,7 +26,7 @@ body HTTP/1.1 301 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -65,7 +64,7 @@ Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded -mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1 +mooPOST /blah/moo.html%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1015 b/tests/data/test1015 index 2cd9378060..0f5ec3f632 100644 --- a/tests/data/test1015 +++ b/tests/data/test1015 @@ -4,7 +4,6 @@ HTTP HTTP POST --data-urlencode -notxml @@ -51,7 +50,7 @@ Accept: */* Content-Length: 119 Content-Type: application/x-www-form-urlencoded -my+name+is+moo%5B%5D&y e s=s_i_r&v_alue=content+to+_%3F%21%23%24%27%7C%3C%3E%0A&content+to+_%3F%21%23%24%27%7C%3C%3E%0A +my+name+is+moo%5B%5D%AMPy e s=s_i_r%AMPv_alue=content+to+_%3F%21%23%24%27%7C%3C%3E%0A%AMPcontent+to+_%3F%21%23%24%27%7C%3C%3E%0A diff --git a/tests/data/test1076 b/tests/data/test1076 index 08eba396c5..8d9f0f1a32 100644 --- a/tests/data/test1076 +++ b/tests/data/test1076 @@ -4,7 +4,6 @@ HTTP HTTP POST followlocation -notxml # @@ -12,7 +11,7 @@ notxml HTTP/1.1 302 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -27,7 +26,7 @@ body HTTP/1.1 302 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -65,7 +64,7 @@ Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded -mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1 +mooPOST /blah/moo.html%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1105 b/tests/data/test1105 index e076681729..5c850cd6d4 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -5,7 +5,6 @@ HTTP HTTP POST cookies cookiejar -notxml @@ -36,7 +35,7 @@ http HTTP with cookie parser and header recording -"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword" +"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing%AMPparm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname%AMPpassword=mypassword" cookies @@ -47,14 +46,14 @@ local-http # Verify data after the test has been "shot" -POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1 +POST /we/want/%TESTNUMBER?parm1=this*that/other/thing%AMPparm2=foobar/%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* Content-Length: 33 Content-Type: application/x-www-form-urlencoded -userid=myname&password=mypassword +userid=myname%AMPpassword=mypassword # Netscape HTTP Cookie File diff --git a/tests/data/test1138 b/tests/data/test1138 index a3e65d0e0f..71a44a5a42 100644 --- a/tests/data/test1138 +++ b/tests/data/test1138 @@ -4,7 +4,6 @@ HTTP HTTP GET followlocation -notxml # @@ -12,7 +11,7 @@ notxml HTTP/1.1 302 OK swsclose -Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%&testcase=/%TESTNUMBER0002 +Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -27,7 +26,7 @@ body HTTP/1.1 302 OK swsclose -Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%&testcase=/%TESTNUMBER0002 +Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -63,7 +62,7 @@ Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* -GET /we/are/all/moo.html/?name=%D8%A2%D8%BA%D8%A7%D8%B2-%D8%B3%D9%85-%D8%B2%D8%AF%D8%A7%DB%8C%DB%8C-%D8%A7%D8%B2-%D8%A8%D8%A7%D8%B2%D8%A7%D8%B1-%D9%BE%D9%88%D9%84&testcase=/%TESTNUMBER0002 HTTP/1.1 +GET /we/are/all/moo.html/?name=%D8%A2%D8%BA%D8%A7%D8%B2-%D8%B3%D9%85-%D8%B2%D8%AF%D8%A7%DB%8C%DB%8C-%D8%A7%D8%B2-%D8%A8%D8%A7%D8%B2%D8%A7%D8%B1-%D9%BE%D9%88%D9%84%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1221 b/tests/data/test1221 index 5f200c17ab..2f1df8d2aa 100644 --- a/tests/data/test1221 +++ b/tests/data/test1221 @@ -5,7 +5,6 @@ HTTP HTTP POST --data-urlencode --url-query -notxml @@ -47,7 +46,7 @@ content to _?!#$'|%LT%GT # Verify data after the test has been "shot" -POST /%TESTNUMBER?my+name+is+moo%5b%5d&yes=s+i+r&v_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a&content+to+_%3f%21%23%24%27%7c%3c%3e%0a&%3d%3d HTTP/1.1 +POST /%TESTNUMBER?my+name+is+moo%5b%5d%AMPyes=s+i+r%AMPv_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a%AMPcontent+to+_%3f%21%23%24%27%7c%3c%3e%0a%AMP%3d%3d HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1332 b/tests/data/test1332 index f1b596e310..032cca7b53 100644 --- a/tests/data/test1332 +++ b/tests/data/test1332 @@ -5,7 +5,6 @@ HTTP HTTP POST followlocation -notxml # @@ -13,7 +12,7 @@ notxml HTTP/1.1 303 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -28,7 +27,7 @@ body HTTP/1.1 303 OK swsclose -Location: moo.html&testcase=/%TESTNUMBER0002 +Location: moo.html%AMPtestcase=/%TESTNUMBER0002 Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -66,7 +65,7 @@ Accept: */* Content-Length: 3 Content-Type: application/x-www-form-urlencoded -mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1 +mooPOST /blah/moo.html%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1402 b/tests/data/test1402 index 401daa3ba5..66d3c9dc3d 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -4,7 +4,6 @@ HTTP HTTP POST --libcurl -notxml @@ -50,7 +49,7 @@ Accept: */* Content-Length: 16 Content-Type: application/x-www-form-urlencoded -foo=bar&baz=quux +foo=bar%AMPbaz=quux # CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with diff --git a/tests/data/test1403 b/tests/data/test1403 index 2a9cba0bed..1055d29a83 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -4,7 +4,6 @@ HTTP HTTP GET --libcurl -notxml @@ -43,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c # Verify data after the test has been "shot" -GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1 +GET /we/want/%TESTNUMBER?foo=bar%AMPbaz=quux HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test1598 b/tests/data/test1598 index f3143432ed..f7c935a190 100644 --- a/tests/data/test1598 +++ b/tests/data/test1598 @@ -5,7 +5,6 @@ HTTP HTTP POST CURLOPT_HTTPTRAILER_FUNCTION CURLOPT_HTTPTRAILER_DATA -notxml @@ -50,7 +49,7 @@ Transfer-Encoding: chunked Content-Type: application/x-www-form-urlencoded 11 -xxx=yyy&aaa=bbbbb +xxx=yyy%AMPaaa=bbbbb 0 my-super-awesome-trailer: trail1 my-other-awesome-trailer: trail2 diff --git a/tests/data/test1977 b/tests/data/test1977 index d62ed337e6..dba5504e10 100644 --- a/tests/data/test1977 +++ b/tests/data/test1977 @@ -3,7 +3,6 @@ CURLOPT_CURLU CURLINFO_EFFECTIVE_URL -notxml @@ -43,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo -effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo&bar +effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo%AMPbar GET /%TESTNUMBER HTTP/1.1 @@ -54,7 +53,7 @@ GET /%TESTNUMBER?foo HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -GET /%TESTNUMBER?foo&bar HTTP/1.1 +GET /%TESTNUMBER?foo%AMPbar HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* diff --git a/tests/data/test199 b/tests/data/test199 index fc8a8e96a0..996abb089e 100644 --- a/tests/data/test199 +++ b/tests/data/test199 @@ -4,7 +4,6 @@ HTTP HTTP GET globbing -notxml # @@ -36,7 +35,7 @@ http HTTP with -d, -G and {} --d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G +-d "foo=moo%AMPmoo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G @@ -44,12 +43,12 @@ HTTP with -d, -G and {} # Verify data after the test has been "shot" -GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1 +GET /%TESTNUMBER?foo=moo%AMPmoo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* -GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1 +GET /%TESTNUMBER?foo=moo%AMPmoo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test3 b/tests/data/test3 index 50fdfeea48..c2f8e11a9c 100644 --- a/tests/data/test3 +++ b/tests/data/test3 @@ -4,7 +4,6 @@ HTTP HTTP POST HTTP Basic auth -notxml # @@ -37,7 +36,7 @@ http HTTP POST with auth and contents but with content-length set to 0 - -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/%TESTNUMBER + -d "fooo=mooo%AMPpooo=clue%AMPdoo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/%TESTNUMBER @@ -53,7 +52,7 @@ Accept: */* Content-Length: 37 Content-Type: application/x-www-form-urlencoded -fooo=mooo&pooo=clue&doo=%20%20%20++++ +fooo=mooo%AMPpooo=clue%AMPdoo=%20%20%20++++ diff --git a/tests/data/test32 b/tests/data/test32 index 94b9531ca5..e96389f989 100644 --- a/tests/data/test32 +++ b/tests/data/test32 @@ -4,7 +4,6 @@ HTTP HTTP GET -G -notxml # @@ -36,7 +35,7 @@ http HTTP with -d and -G --d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G +-d "foo=moo%AMPmoo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G @@ -44,7 +43,7 @@ HTTP with -d and -G # Verify data after the test has been "shot" -GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1 +GET /%TESTNUMBER?foo=moo%AMPmoo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test40 b/tests/data/test40 index 04efdbbc70..4f728fe862 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -4,7 +4,6 @@ HTTP HTTP GET followlocation -notxml # @@ -12,7 +11,7 @@ notxml HTTP/1.1 302 OK swsclose -Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002%repeat[4 x ]% +Location: ../moo.html/?name=d a niel%AMPtestcase=/%TESTNUMBER0002%repeat[4 x ]% Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -27,7 +26,7 @@ body HTTP/1.1 302 OK swsclose -Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002%repeat[4 x ]% +Location: ../moo.html/?name=d a niel%AMPtestcase=/%TESTNUMBER0002%repeat[4 x ]% Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close @@ -63,7 +62,7 @@ Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* -GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1 +GET /we/are/all/moo.html/?name=d+a+niel%AMPtestcase=/%TESTNUMBER0002 HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test439 b/tests/data/test439 index 8529797242..949f887ef9 100644 --- a/tests/data/test439 +++ b/tests/data/test439 @@ -3,7 +3,6 @@ HTTP aws-sigv4 -notxml @@ -40,7 +39,7 @@ aws aws-sigv4 with query -"http://fake.fake.fake:8000/%TESTNUMBER/?name=me&noval&aim=b%aad&&&weirdo=*.//-" -u user:secret --aws-sigv4 "aws:amz:us-east-2:es" --connect-to fake.fake.fake:8000:%HOSTIP:%HTTPPORT +"http://fake.fake.fake:8000/%TESTNUMBER/?name=me%AMPnoval%AMPaim=b%aad%AMP%AMP%AMPweirdo=*.//-" -u user:secret --aws-sigv4 "aws:amz:us-east-2:es" --connect-to fake.fake.fake:8000:%HOSTIP:%HTTPPORT @@ -48,7 +47,7 @@ aws-sigv4 with query # Verify data after the test has been "shot" -GET /%TESTNUMBER/?name=me&noval&aim=b%aad&&&weirdo=*.//- HTTP/1.1 +GET /%TESTNUMBER/?name=me%AMPnoval%AMPaim=b%aad%AMP%AMP%AMPweirdo=*.//- HTTP/1.1 Host: fake.fake.fake:8000 Authorization: AWS4-HMAC-SHA256 Credential=user/19700101/us-east-2/es/aws4_request, SignedHeaders=host;x-amz-date, Signature=9dd8592929306832a6673d10063491391e486e5f50de4647ea7c2c797277e0a6 X-Amz-Date: 19700101T000000Z diff --git a/tests/data/test48 b/tests/data/test48 index c161ba5dca..21cdbd368f 100644 --- a/tests/data/test48 +++ b/tests/data/test48 @@ -4,7 +4,6 @@ HTTP HTTP HEAD -G -notxml # @@ -30,7 +29,7 @@ http HTTP with -d and -G and -I --d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER +-d "foo=moo%AMPmoo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER @@ -38,12 +37,12 @@ HTTP with -d and -G and -I # Verify data after the test has been "shot" -HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1 +HEAD /%TESTNUMBER?foo=moo%AMPmoo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* -HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1 +HEAD /%TESTNUMBER?foo=moo%AMPmoo=poo HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test568 b/tests/data/test568 index a2438916d4..6c8eaade73 100644 --- a/tests/data/test568 +++ b/tests/data/test568 @@ -5,7 +5,6 @@ RTSP ANNOUNCE -notxml @@ -107,7 +106,7 @@ CSeq: 3 Content-Type: posty goodness Content-Length: 35 -postyfield=postystuff&project=curl +postyfield=postystuff%AMPproject=curl OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0 CSeq: 4 diff --git a/tests/data/test733 b/tests/data/test733 index 0bf953cca2..8235e71999 100644 --- a/tests/data/test733 +++ b/tests/data/test733 @@ -2,7 +2,6 @@ IPFS -notxml @@ -38,7 +37,7 @@ http IPFS with path and query args ---ipfs-gateway http://%HOSTIP:%HTTPPORT "ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb" +--ipfs-gateway http://%HOSTIP:%HTTPPORT "ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar%AMPaaa=bbb" @@ -46,7 +45,7 @@ IPFS with path and query args # Verify data after the test has been "shot" -GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb HTTP/1.1 +GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar%AMPaaa=bbb HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test734 b/tests/data/test734 index 01107fbf6b..6c87bd1eb4 100644 --- a/tests/data/test734 +++ b/tests/data/test734 @@ -2,7 +2,6 @@ IPFS -notxml @@ -38,7 +37,7 @@ http IPFS with path, query args and gateway with path ---ipfs-gateway http://%HOSTIP:%HTTPPORT/some/path "ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb" +--ipfs-gateway http://%HOSTIP:%HTTPPORT/some/path "ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar%AMPaaa=bbb" @@ -46,7 +45,7 @@ IPFS with path, query args and gateway with path # Verify data after the test has been "shot" -GET /some/path/ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb HTTP/1.1 +GET /some/path/ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar%AMPaaa=bbb HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test735 b/tests/data/test735 index 574d8bd492..d23a0fe6d9 100644 --- a/tests/data/test735 +++ b/tests/data/test735 @@ -2,7 +2,6 @@ IPFS -notxml @@ -38,7 +37,7 @@ http IPNS with path, query args and gateway with path ---ipfs-gateway http://%HOSTIP:%HTTPPORT/some/path "ipns://fancy.tld/a/b?foo=bar&aaa=bbb" +--ipfs-gateway http://%HOSTIP:%HTTPPORT/some/path "ipns://fancy.tld/a/b?foo=bar%AMPaaa=bbb" @@ -46,7 +45,7 @@ IPNS with path, query args and gateway with path # Verify data after the test has been "shot" -GET /some/path/ipns/fancy.tld/a/b?foo=bar&aaa=bbb HTTP/1.1 +GET /some/path/ipns/fancy.tld/a/b?foo=bar%AMPaaa=bbb HTTP/1.1 Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* diff --git a/tests/data/test739 b/tests/data/test739 index 3e712f513e..b51afb5a41 100644 --- a/tests/data/test739 +++ b/tests/data/test739 @@ -2,7 +2,6 @@ IPFS -notxml @@ -24,7 +23,7 @@ http IPNS path and query args for gateway and IPFS URL (malformed gateway URL) ---ipfs-gateway "http://%HOSTIP:%HTTPPORT/some/path?biz=baz" "ipns://fancy.tld/a/b?foo=bar&aaa=bbb" +--ipfs-gateway "http://%HOSTIP:%HTTPPORT/some/path?biz=baz" "ipns://fancy.tld/a/b?foo=bar%AMPaaa=bbb"