From 29aafb9cea842321e7379685e33194a1b34bb0dc Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 3 Jun 2005 14:06:03 +0000 Subject: [PATCH] Andres Garcia's text mode fix for the 'data' part --- CHANGES | 9 +++++++++ RELEASE-NOTES | 4 +++- tests/data/test500 | 2 +- tests/data/test502 | 2 +- tests/data/test506 | 6 +++--- tests/data/test508 | 2 +- tests/data/test510 | 2 +- tests/data/test512 | 2 +- tests/data/test514 | 2 +- tests/data/test515 | 2 +- tests/data/test516 | 2 +- tests/data/test519 | 2 +- tests/data/test522 | 2 +- tests/runtests.pl | 8 ++++++++ 14 files changed, 33 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index ac77572..dfd9f44 100644 --- a/CHANGES +++ b/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 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e9aaf2f..2b37144 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -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) diff --git a/tests/data/test500 b/tests/data/test500 index 95e2b26..eafd138 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test502 b/tests/data/test502 index bd8607f..4ef6e5d 100644 --- a/tests/data/test502 +++ b/tests/data/test502 @@ -1,7 +1,7 @@ # # Server-side - + foo bar swsclose bar diff --git a/tests/data/test506 b/tests/data/test506 index c89bbed..3c02702 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -35,7 +35,7 @@ Content-Type: text/html Content-Length: 32 run 3: overwrite cookie 1 and 4 - + # Client-side @@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/506 # Verify data after the test has been "shot" - + GLOBAL_INIT SHARE_INIT CURL_LOCK_DATA_COOKIE @@ -145,7 +145,7 @@ GLOBAL_CLEANUP http://%HOSTIP:%HTTPPORT/506 - + # Netscape HTTP Cookie File # http://www.netscape.com/newsref/std/cookie_spec.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test508 b/tests/data/test508 index 7940b12..3d3c6c9 100644 --- a/tests/data/test508 +++ b/tests/data/test508 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose diff --git a/tests/data/test510 b/tests/data/test510 index 22b0aad..79c2d11 100644 --- a/tests/data/test510 +++ b/tests/data/test510 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose diff --git a/tests/data/test512 b/tests/data/test512 index c6e3dba..1df968b 100644 --- a/tests/data/test512 +++ b/tests/data/test512 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: yes diff --git a/tests/data/test514 b/tests/data/test514 index eed0da5..5db18b3 100644 --- a/tests/data/test514 +++ b/tests/data/test514 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test515 b/tests/data/test515 index 65d0f96..f6be8c4 100644 --- a/tests/data/test515 +++ b/tests/data/test515 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test516 b/tests/data/test516 index e1c890a..cd45b31 100644 --- a/tests/data/test516 +++ b/tests/data/test516 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test519 b/tests/data/test519 index d9adfdd..e86acab 100644 --- a/tests/data/test519 +++ b/tests/data/test519 @@ -1,7 +1,7 @@ # # Server-side - + HTTP/1.1 200 OK swsbounce Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test522 b/tests/data/test522 index 6578e33..753526c 100644 --- a/tests/data/test522 +++ b/tests/data/test522 @@ -52,7 +52,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */* - + hello diff --git a/tests/runtests.pl b/tests/runtests.pl index b0b3e24..572e06c 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -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; -- 2.7.4