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
79 lines
1.6 KiB
Plaintext
79 lines
1.6 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTPS
|
|
HTTP GET
|
|
TLS-SRP
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data nocheck="yes">
|
|
HTTP/1.0 200 OK
|
|
Content-type: text/html
|
|
|
|
|
|
<HTML><BODY>
|
|
<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
|
|
|
|
|
|
<p>Session ID: <i>003030000100000001000000000000000030330001000000B062410001000000</i></p>
|
|
<h5>If your browser supports session resuming, then you should see the same session ID, when you press the <b>reload</b> button.</h5>
|
|
<p>Connected as user 'jsmith'.</p>
|
|
<P>
|
|
<TABLE border=1><TR><TD>Protocol version:</TD><TD>TLS1.2</TD></TR>
|
|
<TR><TD>Key Exchange:</TD><TD>SRP</TD></TR>
|
|
<TR><TD>Compression</TD><TD>NULL</TD></TR>
|
|
<TR><TD>Cipher</TD><TD>AES-NNN-CBC</TD></TR>
|
|
<TR><TD>MAC</TD><TD>SHA1</TD></TR>
|
|
<TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_NNN_CBC_SHA1</TD></TR></p></TABLE>
|
|
<hr><P>Your HTTP header was:<PRE>Host: localhost:9011
|
|
User-Agent: curl-test-suite
|
|
Accept: */*
|
|
|
|
</PRE></P>
|
|
</BODY></HTML>
|
|
|
|
</data>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
httptls+srp
|
|
</server>
|
|
<features>
|
|
TLS-SRP
|
|
</features>
|
|
<name>
|
|
simple TLS-SRP HTTPS GET, check user in response
|
|
</name>
|
|
<command>
|
|
--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc -A curl-test-suite https://%HOSTIP:%HTTPTLSPORT
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<file name="%LOGDIR/curl%TESTNUMBER.out" crlf="headers">
|
|
HTTP/1.0 200 OK
|
|
Content-type: text/html
|
|
|
|
FINE
|
|
User-Agent: curl-test-suite
|
|
Accept: */*
|
|
|
|
</file>
|
|
<stripfile>
|
|
s/^<p>Connected as user 'jsmith'.*/FINE/
|
|
s/Protocol version:.*[0-9]//
|
|
s/GNUTLS/GnuTLS/
|
|
s/(AES[-_])\d\d\d([-_]CBC)/$1NNN$2/
|
|
s/^<.*\n//
|
|
s/^\n//
|
|
</stripfile>
|
|
</verify>
|
|
|
|
</testcase>
|