Index: runtests.pl
===================================================================
RCS file: /cvsroot/curl/curl/tests/runtests.pl,v
retrieving revision 1.173
diff -u -r1.173 runtests.pl
--- runtests.pl	27 Apr 2005 09:59:29 -0000	1.173
+++ runtests.pl	27 Apr 2005 21:11:31 -0000
@@ -1434,10 +1434,19 @@
             print "ERROR: section verify=>file has no name attribute!\n";
             exit;
         }
+        my $filemode=$hash{'mode'};
+        
         my @generated=loadarray($filename);
 
         # what parts to cut off from the file
         my @stripfile = getpart("verify", "stripfile");
+        
+        if(($filemode eq "text") && ($^O eq 'MSWin32')) {
+            # text mode when running on windows means adding an extra
+            # strip expression
+            push @stripfile, "s/\r\n/\n/";
+        }
+
         my $strip;
         for $strip (@stripfile) {
             chomp $strip;
Index: data/test31
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test31,v
retrieving revision 1.12
diff -u -r1.12 test31
--- data/test31	16 Apr 2005 23:15:19 -0000	1.12
+++ data/test31	27 Apr 2005 21:11:31 -0000
@@ -55,7 +55,7 @@
 Accept: */*

 

 </protocol>
-<file name="log/jar31.txt">
+<file name="log/jar31.txt" 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.