mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11:42 +08:00
63e9721b63
- `reply/data*`, `verify/stdout`, `verify/stderr`, `verify/file*`,
`verify/proxy`:
- make `crlf="yes"` force CRLF to all lines, instead of just applying
to HTTP protocol headers.
- add support for `crlf="headers"` that only converts HTTP protocol
header lines to CRLF. (previously done via `crlf="yes"`.)
- use `crlf="headers"` where possible.
- `reply/connect*`:
- add support for `crlf="yes"` and `crlf="headers"`.
- use them where possible.
- `client/file*`, `client/stdin`:
- add support for `crlf="yes"`.
- use it where possible.
- `reply/data*`, `verify/protocol`:
- replace existing uses of `crlf="yes"` with `crlf="headers`" where it
does not change the result.
Reducing the number of `tests/data/test*`:
- CRLF newlines from 10295 to 1985. (119985 lines total)
- files with mixed newlines from 656 to 113. (1890 files total)
After this patch there remain 141 sections with mixed newlines, where
the mixing is not split between headers/non-headers. There is no obvious
pattern here. Some of the CRLF uses might be accidental, or
non-significant. They will be tackled in a future patch.
Follow-up to 6cf3d7b1b1 #19318
Follow-up to 4d2a05d3fe #19284
Closes #19313
117 lines
2.1 KiB
Plaintext
117 lines
2.1 KiB
Plaintext
<testcase>
|
|
|
|
#Informational
|
|
<info>
|
|
<keywords>
|
|
RTSP
|
|
ANNOUNCE
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data1 crlf="headers">
|
|
RTSP/1.0 200 OK
|
|
Server: RTSPD/libcurl-test
|
|
Cseq: 1
|
|
|
|
</data1>
|
|
|
|
<data2>
|
|
RTSP/1.0 200 OK
|
|
Server: RTSPD/libcurl-test
|
|
Cseq: 2
|
|
Content-Length: 70
|
|
Content-Type: application/sdp
|
|
|
|
v=0
|
|
s=rtspd SDP
|
|
i=A fake SDP reply
|
|
u=http://www.curl.example.com/fakesdp.ps
|
|
</data2>
|
|
<data3 crlf="headers">
|
|
RTSP/1.0 200 Okie Dokie
|
|
Server: RTSPD/libcurl-test
|
|
Cseq: 3
|
|
|
|
</data3>
|
|
<data4 crlf="headers">
|
|
RTSP/1.0 200 OK
|
|
Server: RTSPD/libcurl-test
|
|
CSeq: 4
|
|
Curl-private: swsclose
|
|
Informational: Empty Options Response
|
|
|
|
</data4>
|
|
</reply>
|
|
|
|
# Client-Side
|
|
<client>
|
|
<server>
|
|
rtsp
|
|
</server>
|
|
<tool>
|
|
lib%TESTNUMBER
|
|
</tool>
|
|
|
|
<name>
|
|
RTSP Announce (PUT and POST style) test
|
|
</name>
|
|
<command>
|
|
rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt
|
|
</command>
|
|
# file written before test command runs
|
|
<file name="%LOGDIR/file%TESTNUMBER.txt">
|
|
v=0
|
|
o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4
|
|
s=SDP Seminar
|
|
i=A Seminar on the session description protocol
|
|
u=http://www.cs.ucl.ac.uk/staff/M.Handley/sdp.03.ps
|
|
e=mjh@isi.edu (Mark Handley)
|
|
c=IN IP4 224.2.17.12/127
|
|
t=2873397496 2873404696
|
|
a=recvonly
|
|
m=audio 3456 RTP/AVP 0
|
|
m=video 2232 RTP/AVP 31
|
|
</file>
|
|
</client>
|
|
|
|
<verify>
|
|
<strip>
|
|
^If-Modified-Since:.*
|
|
</strip>
|
|
<protocol crlf="headers">
|
|
ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
|
|
CSeq: 1
|
|
Content-Length: 306
|
|
Content-Type: application/sdp
|
|
|
|
v=0
|
|
o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4
|
|
s=SDP Seminar
|
|
i=A Seminar on the session description protocol
|
|
u=http://www.cs.ucl.ac.uk/staff/M.Handley/sdp.03.ps
|
|
e=mjh@isi.edu (Mark Handley)
|
|
c=IN IP4 224.2.17.12/127
|
|
t=2873397496 2873404696
|
|
a=recvonly
|
|
m=audio 3456 RTP/AVP 0
|
|
m=video 2232 RTP/AVP 31
|
|
DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
|
|
CSeq: 2
|
|
Accept: application/sdp
|
|
|
|
ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
|
|
CSeq: 3
|
|
Content-Type: posty goodness
|
|
Content-Length: 35
|
|
|
|
postyfield=postystuff&project=curl
|
|
OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
|
|
CSeq: 4
|
|
|
|
</protocol>
|
|
</verify>
|
|
|
|
</testcase>
|