From: Viktor Szakats Date: Wed, 12 Nov 2025 14:40:44 +0000 (+0100) Subject: tests/data: avoid tag markup in comments X-Git-Tag: rc-8_18_0-1~333 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9ec2a676c4257cf522a4349fb24fa547ed48aad;p=thirdparty%2Fcurl.git tests/data: avoid tag markup in comments To avoid confusing `xmllint`, and reducing the number of files failing `xmllint --format` from 169 to 144. Closes #19491 --- diff --git a/tests/data/test2700 b/tests/data/test2700 index e9c5863bee..cdf9c42a8d 100644 --- a/tests/data/test2700 +++ b/tests/data/test2700 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A TEXT/BINARY/PING/PONG/CLOSE message with payload HTTP/1.1 101 Switching to WebSockets @@ -66,7 +66,7 @@ close [7] %hex[%03%e8]hex%close 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2701 b/tests/data/test2701 index 3f810a6a0c..f2f72e1d46 100644 --- a/tests/data/test2701 +++ b/tests/data/test2701 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with the reserved opcode 0x3 HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2702 b/tests/data/test2702 index 1c309a01b3..7393a598f3 100644 --- a/tests/data/test2702 +++ b/tests/data/test2702 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with the reserved opcode 0xB HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2703 b/tests/data/test2703 index 627c2bce80..e331ac2095 100644 --- a/tests/data/test2703 +++ b/tests/data/test2703 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with the RSV1 bit set HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2704 b/tests/data/test2704 index d00983a246..08bfc9b7d9 100644 --- a/tests/data/test2704 +++ b/tests/data/test2704 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with the RSV2 bit set HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2705 b/tests/data/test2705 index e94b9c4a7e..81a486bceb 100644 --- a/tests/data/test2705 +++ b/tests/data/test2705 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with the RSV3 bit set HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2706 b/tests/data/test2706 index 174dc44404..0308886e8f 100644 --- a/tests/data/test2706 +++ b/tests/data/test2706 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An empty frame with masking HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2707 b/tests/data/test2707 index c87a73f5bb..844f600483 100644 --- a/tests/data/test2707 +++ b/tests/data/test2707 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # Frames with sizes around special cases of the frame encoding # see https://datatracker.ietf.org/doc/html/rfc6455#section-5.2 # - 0: empty frame @@ -74,7 +74,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2708 b/tests/data/test2708 index 0dbd873520..09d7670ba7 100644 --- a/tests/data/test2708 +++ b/tests/data/test2708 @@ -64,7 +64,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2709 b/tests/data/test2709 index 654f4bf62c..da60292b7c 100644 --- a/tests/data/test2709 +++ b/tests/data/test2709 @@ -63,7 +63,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2710 b/tests/data/test2710 index 5501104e99..7d20a1e004 100644 --- a/tests/data/test2710 +++ b/tests/data/test2710 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # An unsolicited PONG with and without payload HTTP/1.1 101 Switching to WebSockets @@ -63,7 +63,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2711 b/tests/data/test2711 index 31b40b596e..a8bd7d6552 100644 --- a/tests/data/test2711 +++ b/tests/data/test2711 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A PING/PONG/CLOSE message without payload HTTP/1.1 101 Switching to WebSockets @@ -64,7 +64,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2712 b/tests/data/test2712 index d1182c37a0..9e512770ad 100644 --- a/tests/data/test2712 +++ b/tests/data/test2712 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A PING/PONG/CLOSE with 125 bytes payload each HTTP/1.1 101 Switching to WebSockets @@ -64,7 +64,7 @@ close [125] %hex[%03%e8]hex%%repeat[123 x _]% 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2713 b/tests/data/test2713 index 55188e8514..da54ce65d7 100644 --- a/tests/data/test2713 +++ b/tests/data/test2713 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A 126 byte long PING HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2714 b/tests/data/test2714 index f47c96bda7..8063bbf2f7 100644 --- a/tests/data/test2714 +++ b/tests/data/test2714 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A 126 byte long PONG HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2715 b/tests/data/test2715 index a83e3cc188..a0369b4dc1 100644 --- a/tests/data/test2715 +++ b/tests/data/test2715 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A 126 byte long CLOSE HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2716 b/tests/data/test2716 index 9c0183ce5c..412e6b67f1 100644 --- a/tests/data/test2716 +++ b/tests/data/test2716 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A fragmented PING HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2717 b/tests/data/test2717 index faa9a83ae0..31219e69a1 100644 --- a/tests/data/test2717 +++ b/tests/data/test2717 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A fragmented PONG HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2718 b/tests/data/test2718 index 5a9c773d09..ba17cca873 100644 --- a/tests/data/test2718 +++ b/tests/data/test2718 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A fragmented CLOSE HTTP/1.1 101 Switching to WebSockets @@ -62,7 +62,7 @@ Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs= 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2719 b/tests/data/test2719 index 15f9ecc9d9..12a34bb698 100644 --- a/tests/data/test2719 +++ b/tests/data/test2719 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # Fragmented TEXT/BINARY messages, each with 2/3 fragments HTTP/1.1 101 Switching to WebSockets @@ -71,7 +71,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2720 b/tests/data/test2720 index e70ecd324b..5e52172fc5 100644 --- a/tests/data/test2720 +++ b/tests/data/test2720 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # 1st a message with an empty fragment at the beginning # 2nd a message with an empty fragment in the middle # 3rd a message with an empty fragment at the end @@ -76,7 +76,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2721 b/tests/data/test2721 index 2c3fcd855e..844e407c1f 100644 --- a/tests/data/test2721 +++ b/tests/data/test2721 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # A TEXT/BINARY message fragmented into two frames each, with pongs in the middle HTTP/1.1 101 Switching to WebSockets @@ -67,7 +67,7 @@ close [0] 0 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2722 b/tests/data/test2722 index 0dd1bbb59f..68c6e7786a 100644 --- a/tests/data/test2722 +++ b/tests/data/test2722 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # First a valid BINARY frame # Second a fragmented message with the first frame missing @@ -63,7 +63,7 @@ bin fin [1] b 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .* diff --git a/tests/data/test2723 b/tests/data/test2723 index 7dd2609fcf..945573f048 100644 --- a/tests/data/test2723 +++ b/tests/data/test2723 @@ -32,7 +32,7 @@ CURL_WS_FORCE_ZERO_MASK=1 upgrade -# Full list of frames: see below +# Full list of frames: see 'verify.stdout' below # First a fragmented TEXT message with the last frame missing # Second a valid BINARY frame @@ -64,7 +64,7 @@ txt --- [2] t2 56 -# Strip HTTP header from +# Strip HTTP header from 'protocol' ^GET /.* ^(Host|User-Agent|Accept|Upgrade|Connection|Sec-WebSocket-(Version|Key)): .*