mirror of https://github.com/moparisthebest/curl
Andres Garcia's text mode fix for the 'data' part
This commit is contained in:
Daniel Stenberg
parent
40eb7d0d48
commit
29aafb9cea
9
CHANGES
9
CHANGES
|
|
@ -7,6 +7,15 @@
|
|||
Changelog
|
||||
|
||||
|
||||
Daniel (3 June 2005)
|
||||
- Andres Garcia provided yet another text mode patch for several test cases so
|
||||
that they do text comparisions better on Windows (newline-wise).
|
||||
|
||||
Daniel (1 June 2005)
|
||||
- The configure check for c-ares now adds the cares lib before the other libs,
|
||||
to make it build fine with mingw. Inspired by Tupone Alfredo's bug report
|
||||
(and patch) #1212940
|
||||
|
||||
Daniel (31 May 2005)
|
||||
- Todd Kulesza reported a flaw in the proxy option, since a numerical IPv6
|
||||
address was not possible to use. It is now, but requires it written
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ This release includes the following changes:
|
|||
|
||||
This release includes the following bugfixes:
|
||||
|
||||
o c-ares enabled build with mingw
|
||||
o proxy host set with numerical IPv6 address
|
||||
o better treatment of binary zeroes in HTTP response headers
|
||||
o fixed the notorius FTP server failure in the test suite
|
||||
|
|
@ -31,6 +32,7 @@ Other curl-related news since the previous public release:
|
|||
This release would not have looked like this without help, code, reports and
|
||||
advice from friends like these:
|
||||
|
||||
John McGowan, Georg Wicherski, Andres Garcia, Eric Cooper, Todd Kulesza
|
||||
John McGowan, Georg Wicherski, Andres Garcia, Eric Cooper, Todd Kulesza,
|
||||
Tupone Alfredo
|
||||
|
||||
Thanks! (and sorry if I forgot to mention someone)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply name="1">
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
foo
|
||||
bar swsclose
|
||||
bar
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Content-Type: text/html
|
|||
Content-Length: 32
|
||||
|
||||
run 3: overwrite cookie 1 and 4
|
||||
</data5>
|
||||
</data3>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
|
|
@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/506
|
|||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<stdout>
|
||||
<stdout mode="text">
|
||||
GLOBAL_INIT
|
||||
SHARE_INIT
|
||||
CURL_LOCK_DATA_COOKIE
|
||||
|
|
@ -145,7 +145,7 @@ GLOBAL_CLEANUP
|
|||
<stderr>
|
||||
http://%HOSTIP:%HTTPPORT/506
|
||||
</stderr>
|
||||
<file name="log/jar506">
|
||||
<file name="log/jar506" mode="text">
|
||||
# Netscape HTTP Cookie File
|
||||
# http://www.netscape.com/newsref/std/cookie_spec.html
|
||||
# This file was generated by libcurl! Edit at your own risk.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode=text>
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: yes
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK swsclose
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
<data mode="text">
|
||||
HTTP/1.1 200 OK swsbounce
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ Host: 127.0.0.1:%HTTPPORT
|
|||
Accept: */*
|
||||
|
||||
</protocol>
|
||||
<stdout>
|
||||
<stdout mode="text">
|
||||
hello
|
||||
</stdout>
|
||||
</verify>
|
||||
|
|
|
|||
|
|
@ -1366,6 +1366,14 @@ sub singletest {
|
|||
if(!$replyattr{'nocheck'} && (@reply || $replyattr{'sendzero'})) {
|
||||
# verify the received data
|
||||
my @out = loadarray($CURLOUT);
|
||||
my %hash = getpartattr("reply", "data");
|
||||
# get the mode attribute
|
||||
my $filemode=$hash{'mode'};
|
||||
if(($filemode eq "text") && $has_textaware) {
|
||||
# text mode when running on windows: fix line endings
|
||||
map s/\r\n/\n/g, @out;
|
||||
}
|
||||
|
||||
$res = compare("data", \@out, \@reply);
|
||||
if ($res) {
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue