Re: downrev modules in RC2

Message-ID: <lrptjv1gfg.fsf@caliper.activestate.com>

(upgrade to Digest::MD5 2.26)

p4raw-id: //depot/perl@20248

diff --git a/ext/Digest/MD5/Changes b/ext/Digest/MD5/Changes
index cebcd2f..9b5596a 100644 (file)
--- a/ext/Digest/MD5/Changes
+++ b/ext/Digest/MD5/Changes
@@ -1,3 +1,17 @@
+2003-07-21   Gisle Aas <gisle@ActiveState.com>
+
+   Release 2.26
+
+   Don't assume PerlIO_read() works like fread() even though
+   it was documented like that for perl 5.6.  It returns negative
+   on read failure.
+
+   Kill test #3 in t/badfile.t.  I don't know a reliable way
+   to test read failures on a file handle.  Seems better not to
+   test than to make many worry.
+
+
+
 2003-07-04   Gisle Aas <gisle@ActiveState.com>
 
    Release 2.25

diff --git a/ext/Digest/MD5/MD5.pm b/ext/Digest/MD5/MD5.pm
index cae8f11..4313a33 100644 (file)
--- a/ext/Digest/MD5/MD5.pm
+++ b/ext/Digest/MD5/MD5.pm
@@ -3,7 +3,7 @@ package Digest::MD5;
 use strict;
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '2.25';  # $Date: 2003/07/05 05:25:37 $
+$VERSION = '2.26';  # $Date: 2003/07/22 06:09:50 $
 
 require Exporter;
 *import = \&Exporter::import;

diff --git a/ext/Digest/MD5/MD5.xs b/ext/Digest/MD5/MD5.xs
index 0bf05f0..287550c 100644 (file)
--- a/ext/Digest/MD5/MD5.xs
+++ b/ext/Digest/MD5/MD5.xs
@@ -1,4 +1,4 @@
-/* $Id: MD5.xs,v 1.39 2003/07/05 05:25:37 gisle Exp $ */
+/* $Id: MD5.xs,v 1.40 2003/07/22 05:59:27 gisle Exp $ */
 
 /* 
  * This library is free software; you can redistribute it and/or
@@ -630,14 +630,14 @@ addfile(self, fh)
                 * first.
                 */
                STRLEN missing = 64 - fill;
-               if ( (n = PerlIO_read(fh, buffer, missing)))
+               if ( (n = PerlIO_read(fh, buffer, missing)) > 0)
                    MD5Update(context, buffer, n);
                else
                    XSRETURN(1);  /* self */
            }
 
            /* Process blocks until EOF or error */
-            while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
+            while ( (n = PerlIO_read(fh, buffer, sizeof(buffer))) > 0) {
                MD5Update(context, buffer, n);
            }
 

diff --git a/ext/Digest/MD5/t/files.t b/ext/Digest/MD5/t/files.t
index f28e0df..fe3ee23 100644 (file)
--- a/ext/Digest/MD5/t/files.t
+++ b/ext/Digest/MD5/t/files.t
@@ -20,27 +20,27 @@ use Digest::MD5 qw(md5 md5_hex md5_base64);
 my $EXPECT;
 if (ord "A" == 193) { # EBCDIC
     $EXPECT = <<EOT;
-fcc48d6bb88ca8065bf9ddfcb9e7483e  Changes
+4ae46ec4a90bbba96182d887e803c947  Changes
 0565ec21b15c0f23f4c51fb327c8926d  README
-1965beb0e48253b694220fbb5d6230f5  MD5.pm
-5b3c24da3f70f3c0938cc7c205a28ab7  MD5.xs
+f834d9fb3944664af464815805f67403  MD5.pm
+45e5e6785b47fb922f33b4a74c29a148  MD5.xs
 276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
 EOT
 } elsif ("\n" eq "\015") { # MacOS
     $EXPECT = <<EOT;
-f161f474603c54a0093ad2f6f93be33b  Changes
+dc0af6945b7f3977b8784e19a5b8a1da  Changes
 6c950a0211a5a28f023bb482037698cd  README
-18178c90bc13d6824f6c96973b6e9433  MD5.pm
-2c7fdb2ffa3840dc4f8dcdcf13241015  MD5.xs
+b3a7b7f8f98cf78a14e8f7b3c375a4c2  MD5.pm
+ca3f8cb317c5d088ed9f97204c6b8cda  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 } else {
     # This is the output of: 'md5sum Changes README MD5.pm MD5.xs rfc1321.txt'
     $EXPECT = <<EOT;
-029fa5059ba0b2175cee09ab5d9b7b73  Changes
+042cef6cd9baf3d4606063dff06eee33  Changes
 6c950a0211a5a28f023bb482037698cd  README
-18178c90bc13d6824f6c96973b6e9433  MD5.pm
-2c7fdb2ffa3840dc4f8dcdcf13241015  MD5.xs
+b3a7b7f8f98cf78a14e8f7b3c375a4c2  MD5.pm
+ca3f8cb317c5d088ed9f97204c6b8cda  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 }