From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Mon, 4 May 2009 09:54:22 +0000 (+0200)
Subject: Patch to fix the problem enclosed.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=80b215cbddf12bec34cfa763645a8f8210afd962;p=p5sagit%2Fp5-mst-13.2.git

Patch to fix the problem enclosed.

Subject: [PATCH] compress 2.019 ( was RE: [PATCH] compress 2.018)
From: "Paul Marquess" <Paul.Marquess@ntlworld.com>
Date: Mon, 4 May 2009 10:40:34 +0100
Message-ID: <011f01c9cc9c$610b6130$23222390$@Marquess@ntlworld.com>
---

diff --git a/ext/Compress-Raw-Bzip2/Bzip2.xs b/ext/Compress-Raw-Bzip2/Bzip2.xs
index f66e2ef..36b2dbe 100644
--- a/ext/Compress-Raw-Bzip2/Bzip2.xs
+++ b/ext/Compress-Raw-Bzip2/Bzip2.xs
@@ -757,7 +757,7 @@ bzinflate (s, buf, output)
     if((s->flags & FLAG_APPEND_OUTPUT) != FLAG_APPEND_OUTPUT) {
         SvCUR_set(output, 0);
     }
-#if 1
+
     /* Assume no output buffer - the code below will update if there is any available */
     s->stream.avail_out = 0;
 
@@ -783,19 +783,6 @@ bzinflate (s, buf, output)
     s->bytesInflated = 0;
     
     RETVAL = BZ_OK;
-#else
-
-    if (SvLEN(output)) {
-        prefix_length = cur_length =  SvCUR(output) ;
-        s->stream.next_out = (char*) SvPVbyte_nolen(output) + cur_length;
-        increment = SvLEN(output) -  cur_length - 1;
-        s->stream.avail_out = increment;
-    }
-    else {
-        s->stream.avail_out = 0;
-    }
-    s->bytesInflated = 0;
-#endif
     
     while (1) {
 
@@ -809,10 +796,10 @@ bzinflate (s, buf, output)
             bufinc *= 2 ;
         }
 
-        //DispStream(s, "pre");
+        /*DispStream(s, "pre"); */
         RETVAL = BZ2_bzDecompress (&(s->stream));
 
-        //DispStream(s, "apres");
+        /*DispStream(s, "apres");*/
         if (RETVAL != BZ_OK || s->flags & FLAG_LIMIT_OUTPUT) 
             break ;
 
diff --git a/ext/Compress-Raw-Bzip2/Changes b/ext/Compress-Raw-Bzip2/Changes
index d9ff756..f8c7a64 100644
--- a/ext/Compress-Raw-Bzip2/Changes
+++ b/ext/Compress-Raw-Bzip2/Changes
@@ -1,6 +1,10 @@
 CHANGES
 -------
 
+  2.019 4 May 2009
+
+      * tidied up Bzip2.xs
+
   2.018 3 May 2009
 
       * added linitOutput option
diff --git a/ext/Compress-Raw-Bzip2/README b/ext/Compress-Raw-Bzip2/README
index c80d6da..7f6bcb7 100644
--- a/ext/Compress-Raw-Bzip2/README
+++ b/ext/Compress-Raw-Bzip2/README
@@ -1,9 +1,9 @@
 
-                            Compress-Raw-Bzip2
+                             Compress-Raw-Bzip2
 
-                               Version 2.018
+                             Version 2.019
 
-                               3rd May 2009
+                               4th May 2009
 
        Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
@@ -164,7 +164,7 @@ To help me help you, I need all of the following information:
         If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm
         for a line like this:
 
-          $VERSION = "2.018" ;
+          $VERSION = "2.019" ;
 
      c. The version of bzip2 you have used.
         If you have successfully installed Compress-Raw-Bzip2, this one-liner
diff --git a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index e0eda15..0c5d8bc 100644
--- a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -12,7 +12,7 @@ use Carp ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
diff --git a/ext/Compress-Raw-Bzip2/t/000prereq.t b/ext/Compress-Raw-Bzip2/t/000prereq.t
index 0bbf312..fd131fc 100644
--- a/ext/Compress-Raw-Bzip2/t/000prereq.t
+++ b/ext/Compress-Raw-Bzip2/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
 
-    my $VERSION = '2.018';
+    my $VERSION = '2.019';
     my @NAMES = qw(
 			
 			);
diff --git a/ext/Compress-Raw-Zlib/Changes b/ext/Compress-Raw-Zlib/Changes
index 9d6a3ef..3308181 100644
--- a/ext/Compress-Raw-Zlib/Changes
+++ b/ext/Compress-Raw-Zlib/Changes
@@ -1,6 +1,10 @@
 CHANGES
 -------
 
+  2.019 4 May 2009
+
+      * No Changes
+
   2.018 3 May 2009
 
       * No Changes
diff --git a/ext/Compress-Raw-Zlib/README b/ext/Compress-Raw-Zlib/README
index cf1eb1f..3248f94 100644
--- a/ext/Compress-Raw-Zlib/README
+++ b/ext/Compress-Raw-Zlib/README
@@ -1,9 +1,9 @@
 
                              Compress-Raw-Zlib
 
-                             Version 2.018
+                             Version 2.019
 
-                               3rd May 2009
+                               4th May 2009
 
        Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
@@ -355,7 +355,7 @@ To help me help you, I need all of the following information:
         If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
         for a line like this:
 
-          $VERSION = "2.018" ;
+          $VERSION = "2.019" ;
 
      c. The version of zlib you have used.
         If you have successfully installed Compress-Raw-Zlib, this one-liner
diff --git a/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
index 423837c..f55ad46 100644
--- a/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
+++ b/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
@@ -13,7 +13,7 @@ use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
diff --git a/ext/IO-Compress/Changes b/ext/IO-Compress/Changes
index 5793994..ae9ba36 100644
--- a/ext/IO-Compress/Changes
+++ b/ext/IO-Compress/Changes
@@ -1,6 +1,11 @@
 CHANGES
 -------
 
+  2.019 4 May 2009
+
+      * IO::Uncompress::Adapter::Bunzip2
+        - Fixed problem with EOF check. 
+
   2.018 3 May 2009
 
       * IO::Unompress::Bunzip2
diff --git a/ext/IO-Compress/Makefile.PL b/ext/IO-Compress/Makefile.PL
index d8f691c..801c2a6 100644
--- a/ext/IO-Compress/Makefile.PL
+++ b/ext/IO-Compress/Makefile.PL
@@ -3,7 +3,7 @@
 use strict ;
 require 5.004 ;
 
-$::VERSION = '2.018' ;
+$::VERSION = '2.019' ;
 
 use private::MakeUtil;
 use ExtUtils::MakeMaker 5.16 ;
diff --git a/ext/IO-Compress/README b/ext/IO-Compress/README
index 1de4424..4979787 100644
--- a/ext/IO-Compress/README
+++ b/ext/IO-Compress/README
@@ -1,9 +1,9 @@
 
-                                IO-Compress
+                             IO-Compress
 
-                               Version 2.018
+                             Version 2.019
 
-                               3rd May 2009
+                            4th May 2009
 
        Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
           This program is free software; you can redistribute it
@@ -89,7 +89,7 @@ To help me help you, I need all of the following information:
         If you haven't installed IO-Compress then search IO::Compress::Gzip.pm
         for a line like this:
 
-          $VERSION = "2.018" ;
+          $VERSION = "2.019" ;
 
  2. If you are having problems building IO-Compress, send me a
     complete log of what happened. Start by unpacking the IO-Compress
diff --git a/ext/IO-Compress/lib/Compress/Zlib.pm b/ext/IO-Compress/lib/Compress/Zlib.pm
index 6d002c5..142ff3d 100644
--- a/ext/IO-Compress/lib/Compress/Zlib.pm
+++ b/ext/IO-Compress/lib/Compress/Zlib.pm
@@ -8,17 +8,17 @@ use Carp ;
 use IO::Handle ;
 use Scalar::Util qw(dualvar);
 
-use IO::Compress::Base::Common 2.018 ;
-use Compress::Raw::Zlib 2.018 ;
-use IO::Compress::Gzip 2.018 ;
-use IO::Uncompress::Gunzip 2.018 ;
+use IO::Compress::Base::Common 2.019 ;
+use Compress::Raw::Zlib 2.019 ;
+use IO::Compress::Gzip 2.019 ;
+use IO::Uncompress::Gunzip 2.019 ;
 
 use strict ;
 use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -452,7 +452,7 @@ sub inflate
 
 package Compress::Zlib ;
 
-use IO::Compress::Gzip::Constants 2.018 ;
+use IO::Compress::Gzip::Constants 2.019 ;
 
 sub memGzip($)
 {
diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
index 1a6fef6..ebc2882 100644
--- a/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
@@ -4,13 +4,13 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status);
+use IO::Compress::Base::Common  2.019 qw(:Status);
 
 #use Compress::Bzip2 ;
-use Compress::Raw::Bzip2  2.018 ;
+use Compress::Raw::Bzip2  2.019 ;
 
 our ($VERSION);
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 sub mkCompObject
 {
diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
index cb852bb..aa2975f 100644
--- a/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
@@ -4,12 +4,12 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status);
+use IO::Compress::Base::Common  2.019 qw(:Status);
 
-use Compress::Raw::Zlib  2.018 qw(Z_OK Z_FINISH MAX_WBITS) ;
+use Compress::Raw::Zlib  2.019 qw(Z_OK Z_FINISH MAX_WBITS) ;
 our ($VERSION);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 sub mkCompObject
 {
diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
index f3a34fc..54cc35f 100644
--- a/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
@@ -4,10 +4,10 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status);
+use IO::Compress::Base::Common  2.019 qw(:Status);
 our ($VERSION);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 sub mkCompObject
 {
diff --git a/ext/IO-Compress/lib/IO/Compress/Base.pm b/ext/IO-Compress/lib/IO/Compress/Base.pm
index 77af43a..eb8e7ee 100644
--- a/ext/IO-Compress/lib/IO/Compress/Base.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Base.pm
@@ -6,7 +6,7 @@ require 5.004 ;
 use strict ;
 use warnings;
 
-use IO::Compress::Base::Common 2.018 ;
+use IO::Compress::Base::Common 2.019 ;
 
 use IO::File ;
 use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@ use bytes;
 our (@ISA, $VERSION);
 @ISA    = qw(Exporter IO::File);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
 
diff --git a/ext/IO-Compress/lib/IO/Compress/Base/Common.pm b/ext/IO-Compress/lib/IO/Compress/Base/Common.pm
index 2c19ce5..f7851f2 100644
--- a/ext/IO-Compress/lib/IO/Compress/Base/Common.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Base/Common.pm
@@ -11,7 +11,7 @@ use File::GlobMapper;
 require Exporter;
 our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
 @ISA = qw(Exporter);
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
               isaFileGlobString cleanFileGlobString oneTarget
diff --git a/ext/IO-Compress/lib/IO/Compress/Bzip2.pm b/ext/IO-Compress/lib/IO/Compress/Bzip2.pm
index 9dfed05..9e31e43 100644
--- a/ext/IO-Compress/lib/IO/Compress/Bzip2.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Bzip2.pm
@@ -5,16 +5,16 @@ use warnings;
 use bytes;
 require Exporter ;
 
-use IO::Compress::Base 2.018 ;
+use IO::Compress::Base 2.019 ;
 
-use IO::Compress::Base::Common  2.018 qw(createSelfTiedObject);
-use IO::Compress::Adapter::Bzip2 2.018 ;
+use IO::Compress::Base::Common  2.019 qw(createSelfTiedObject);
+use IO::Compress::Adapter::Bzip2 2.019 ;
 
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $Bzip2Error = '';
 
 @ISA    = qw(Exporter IO::Compress::Base);
@@ -51,7 +51,7 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
     
     return (
             'BlockSize100K' => [0, 1, Parse_unsigned,  1],
diff --git a/ext/IO-Compress/lib/IO/Compress/Deflate.pm b/ext/IO-Compress/lib/IO/Compress/Deflate.pm
index 60a79d9..89740ae 100644
--- a/ext/IO-Compress/lib/IO/Compress/Deflate.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Deflate.pm
@@ -6,16 +6,16 @@ use bytes;
 
 require Exporter ;
 
-use IO::Compress::RawDeflate 2.018 ;
+use IO::Compress::RawDeflate 2.019 ;
 
-use Compress::Raw::Zlib  2.018 ;
-use IO::Compress::Zlib::Constants 2.018 ;
-use IO::Compress::Base::Common  2.018 qw(createSelfTiedObject);
+use Compress::Raw::Zlib  2.019 ;
+use IO::Compress::Zlib::Constants 2.019 ;
+use IO::Compress::Base::Common  2.019 qw(createSelfTiedObject);
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $DeflateError = '';
 
 @ISA    = qw(Exporter IO::Compress::RawDeflate);
diff --git a/ext/IO-Compress/lib/IO/Compress/Gzip.pm b/ext/IO-Compress/lib/IO/Compress/Gzip.pm
index 45e0100..51ba711 100644
--- a/ext/IO-Compress/lib/IO/Compress/Gzip.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Gzip.pm
@@ -8,12 +8,12 @@ use warnings;
 use bytes;
 
 
-use IO::Compress::RawDeflate 2.018 ;
+use IO::Compress::RawDeflate 2.019 ;
 
-use Compress::Raw::Zlib  2.018 ;
-use IO::Compress::Base::Common  2.018 qw(:Status :Parse createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.018 ;
-use IO::Compress::Zlib::Extra 2.018 ;
+use Compress::Raw::Zlib  2.019 ;
+use IO::Compress::Base::Common  2.019 qw(:Status :Parse createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.019 ;
+use IO::Compress::Zlib::Extra 2.019 ;
 
 BEGIN
 {
@@ -27,7 +27,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $GzipError = '' ;
 
 @ISA    = qw(Exporter IO::Compress::RawDeflate);
diff --git a/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
index 5db5323..dfda77d 100644
--- a/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
@@ -9,7 +9,7 @@ require Exporter;
 our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
 our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 @ISA = qw(Exporter);
 
diff --git a/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm b/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm
index 450e96d..76e48dd 100644
--- a/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm
+++ b/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm
@@ -7,16 +7,16 @@ use warnings;
 use bytes;
 
 
-use IO::Compress::Base 2.018 ;
-use IO::Compress::Base::Common  2.018 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate  2.018 ;
+use IO::Compress::Base 2.019 ;
+use IO::Compress::Base::Common  2.019 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate  2.019 ;
 
 require Exporter ;
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $RawDeflateError = '';
 
 @ISA = qw(Exporter IO::Compress::Base);
@@ -142,8 +142,8 @@ sub getZlibParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
-    use Compress::Raw::Zlib  2.018 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
+    use Compress::Raw::Zlib  2.019 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
 
     
     return (
diff --git a/ext/IO-Compress/lib/IO/Compress/Zip.pm b/ext/IO-Compress/lib/IO/Compress/Zip.pm
index 552b26f..07bff4a 100644
--- a/ext/IO-Compress/lib/IO/Compress/Zip.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Zip.pm
@@ -4,21 +4,21 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status createSelfTiedObject);
-use IO::Compress::RawDeflate 2.018 ;
-use IO::Compress::Adapter::Deflate 2.018 ;
-use IO::Compress::Adapter::Identity 2.018 ;
-use IO::Compress::Zlib::Extra 2.018 ;
-use IO::Compress::Zip::Constants 2.018 ;
+use IO::Compress::Base::Common  2.019 qw(:Status createSelfTiedObject);
+use IO::Compress::RawDeflate 2.019 ;
+use IO::Compress::Adapter::Deflate 2.019 ;
+use IO::Compress::Adapter::Identity 2.019 ;
+use IO::Compress::Zlib::Extra 2.019 ;
+use IO::Compress::Zip::Constants 2.019 ;
 
 
-use Compress::Raw::Zlib  2.018 qw(crc32) ;
+use Compress::Raw::Zlib  2.019 qw(crc32) ;
 BEGIN
 {
     eval { require IO::Compress::Adapter::Bzip2 ; 
-           import  IO::Compress::Adapter::Bzip2 2.018 ; 
+           import  IO::Compress::Adapter::Bzip2 2.019 ; 
            require IO::Compress::Bzip2 ; 
-           import  IO::Compress::Bzip2 2.018 ; 
+           import  IO::Compress::Bzip2 2.019 ; 
          } ;
 #    eval { require IO::Compress::Adapter::Lzma ; 
 #           import  IO::Compress::Adapter::Lzma 2.018 ; 
@@ -32,7 +32,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $ZipError = '';
 
 @ISA = qw(Exporter IO::Compress::RawDeflate);
@@ -467,8 +467,8 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
-    use Compress::Raw::Zlib  2.018 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
+    use Compress::Raw::Zlib  2.019 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
 
     my @Bzip2 = ();
     
diff --git a/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm
index 2581a66..f5f5880 100644
--- a/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm
@@ -7,7 +7,7 @@ require Exporter;
 
 our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 @ISA = qw(Exporter);
 
diff --git a/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
index 41902f5..4d942e0 100644
--- a/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
@@ -9,7 +9,7 @@ require Exporter;
 
 our ($VERSION, @ISA, @EXPORT);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 @ISA = qw(Exporter);
 
diff --git a/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
index 2772176..287d0d1 100644
--- a/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
+++ b/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
@@ -8,9 +8,9 @@ use bytes;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
-use IO::Compress::Gzip::Constants 2.018 ;
+use IO::Compress::Gzip::Constants 2.019 ;
 
 sub ExtraFieldError
 {
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
index e01c9af..4d5df44 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
@@ -4,24 +4,18 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.018 qw(:Status);
+use IO::Compress::Base::Common 2.019 qw(:Status);
 
-#use Compress::Bzip2 ;
-use Compress::Raw::Bzip2 2.018 ;
+use Compress::Raw::Bzip2 2.019 ;
 
 our ($VERSION, @ISA);
-$VERSION = '2.018';
-
-#@ISA = qw( Compress::Raw::Bunzip2 );
-
+$VERSION = '2.019';
 
 sub mkUncompObject
 {
     my $small     = shift || 0;
     my $verbosity = shift || 0;
 
-    #my ($inflate, $status) = bzinflateInit;
-                                #Small        => $params->value('Small');
     my ($inflate, $status) = new Compress::Raw::Bunzip2(1, 1, $small, $verbosity, 1);
 
     return (undef, "Could not create Inflation object: $status", $status)
@@ -47,12 +41,6 @@ sub uncompr
     my $status = $inf->bzinflate($from, $to);
     $self->{ErrorNo} = $status;
 
-    if ($status != BZ_STREAM_END && $eof)
-    {
-        $self->{Error} = "unexpected end of file";
-        return STATUS_ERROR;
-    }
-
     if ($status != BZ_OK && $status != BZ_STREAM_END )
     {
         $self->{Error} = "Inflation Error: $status";
@@ -66,76 +54,6 @@ sub uncompr
 }
 
 
-#sub uncompr
-#{
-#    my $self = shift ;
-#
-#    my $inf = $self->{Inf};
-#    my $eof = $_[2];
-#
-#    #my ($out, $status) = $inf->bzinflate(${ $_[0] });
-#    my $status = $inf->bzinflate($_[0], $_[1]);
-#    $self->{ErrorNo} = $status;
-#
-#    if (! defined $out)
-#    {
-#        my $err = $inf->error();
-#        $self->{Error} = "Inflation Error: $err";
-#        return STATUS_ERROR;
-#    }
-#
-#    #${ $_[1] } .= $out if defined $out;
-#    
-#    if ($eof)
-#    {
-#        #my ($out, $status) = $inf->bzclose();
-#        $status = $inf->bzclose($_[1]);
-#        $self->{ErrorNo} = $status;
-#
-#        if (! defined $out)
-#        {
-#            my $err = $inf->error();
-#            $self->{Error} = "Inflation Error: $err";
-#            return STATUS_ERROR;
-#        }
-#
-#        #${ $_[1] } .= $out if defined $out;
-#        return STATUS_ENDSTREAM ;
-#    }
-#
-#    return STATUS_OK ;
-#}
-
-#sub uncompr
-#{
-#    my $self = shift ;
-#
-#    my $inf   = $self->{Inf};
-#    my $eof = $_[2];
-#
-#    my ($out, $status) = $inf->bzinflate(${ $_[0] });
-#    $self->{ErrorNo} = $status;
-#
-#    if ($status != BZ_STREAM_END && $eof)
-#    {
-#        $self->{Error} = "unexpected end of file";
-#        return STATUS_ERROR;
-#    }
-#
-#    if ($status != BZ_OK && $status != BZ_STREAM_END )
-#    {
-#        my $err = $inf->error();
-#        $self->{Error} = "Inflation Error: $err";
-#        return STATUS_ERROR;
-#    }
-#
-#    ${ $_[1] } .= $out ;
-#    
-#    return STATUS_OK        if $status == BZ_OK ;
-#    return STATUS_ENDSTREAM if $status == BZ_STREAM_END ;
-#    return STATUS_ERROR ;
-#}
-
 sub reset
 {
     my $self = shift ;
@@ -154,12 +72,6 @@ sub reset
     return STATUS_OK ;
 }
 
-#sub count
-#{
-#    my $self = shift ;
-#    $self->{Inf}->inflateCount();
-#}
-
 sub compressedBytes
 {
     my $self = shift ;
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
index 2d979ff..df71eab 100755
--- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
@@ -4,13 +4,13 @@ use warnings;
 use strict;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status);
+use IO::Compress::Base::Common  2.019 qw(:Status);
 
 our ($VERSION);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
-use Compress::Raw::Zlib  2.018 ();
+use Compress::Raw::Zlib  2.019 ();
 
 sub mkUncompObject
 {
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
index 5ffeab3..6ff1fb6 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status);
-use Compress::Raw::Zlib  2.018 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common  2.019 qw(:Status);
+use Compress::Raw::Zlib  2.019 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
 
 our ($VERSION);
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 
 
diff --git a/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index c00f508..d0cfb11 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
@@ -6,22 +6,22 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(createSelfTiedObject);
+use IO::Compress::Base::Common  2.019 qw(createSelfTiedObject);
 
-use IO::Uncompress::Adapter::Inflate  2.018 ();
+use IO::Uncompress::Adapter::Inflate  2.019 ();
 
 
-use IO::Uncompress::Base  2.018 ;
-use IO::Uncompress::Gunzip  2.018 ;
-use IO::Uncompress::Inflate  2.018 ;
-use IO::Uncompress::RawInflate  2.018 ;
-use IO::Uncompress::Unzip  2.018 ;
+use IO::Uncompress::Base  2.019 ;
+use IO::Uncompress::Gunzip  2.019 ;
+use IO::Uncompress::Inflate  2.019 ;
+use IO::Uncompress::RawInflate  2.019 ;
+use IO::Uncompress::Unzip  2.019 ;
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $AnyInflateError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@ sub anyinflate
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
 }
 
diff --git a/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
index 85fffea..86971f1 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
@@ -4,16 +4,16 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.018 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.019 qw(createSelfTiedObject);
 
-use IO::Uncompress::Base 2.018 ;
+use IO::Uncompress::Base 2.019 ;
 
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,19 +27,19 @@ Exporter::export_ok_tags('all');
 
 BEGIN
 {
-   eval ' use IO::Uncompress::Adapter::Inflate 2.018 ;';
-   eval ' use IO::Uncompress::Adapter::Bunzip2 2.018 ;';
-   eval ' use IO::Uncompress::Adapter::LZO 2.018 ;';
-   eval ' use IO::Uncompress::Adapter::Lzf 2.018 ;';
+   eval ' use IO::Uncompress::Adapter::Inflate 2.019 ;';
+   eval ' use IO::Uncompress::Adapter::Bunzip2 2.019 ;';
+   eval ' use IO::Uncompress::Adapter::LZO 2.019 ;';
+   eval ' use IO::Uncompress::Adapter::Lzf 2.019 ;';
    #eval ' use IO::Uncompress::Adapter::UnLzma 2.018 ;';
 
-   eval ' use IO::Uncompress::Bunzip2 2.018 ;';
-   eval ' use IO::Uncompress::UnLzop 2.018 ;';
-   eval ' use IO::Uncompress::Gunzip 2.018 ;';
-   eval ' use IO::Uncompress::Inflate 2.018 ;';
-   eval ' use IO::Uncompress::RawInflate 2.018 ;';
-   eval ' use IO::Uncompress::Unzip 2.018 ;';
-   eval ' use IO::Uncompress::UnLzf 2.018 ;';
+   eval ' use IO::Uncompress::Bunzip2 2.019 ;';
+   eval ' use IO::Uncompress::UnLzop 2.019 ;';
+   eval ' use IO::Uncompress::Gunzip 2.019 ;';
+   eval ' use IO::Uncompress::Inflate 2.019 ;';
+   eval ' use IO::Uncompress::RawInflate 2.019 ;';
+   eval ' use IO::Uncompress::Unzip 2.019 ;';
+   eval ' use IO::Uncompress::UnLzf 2.019 ;';
    #eval ' use IO::Uncompress::UnLzma 2.018 ;';
 }
 
@@ -58,7 +58,7 @@ sub anyuncompress
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common 2.018 qw(:Parse);
+    use IO::Compress::Base::Common 2.019 qw(:Parse);
     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
 }
 
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Base.pm b/ext/IO-Compress/lib/IO/Uncompress/Base.pm
index 2cef240..54d0798 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Base.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Base.pm
@@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
 
-use IO::Compress::Base::Common 2.018 ;
+use IO::Compress::Base::Common 2.019 ;
 #use Parse::Parameters ;
 
 use IO::File ;
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
index 81c2319..3b16c9f 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
@@ -4,15 +4,15 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.018 qw(:Status createSelfTiedObject);
+use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject);
 
-use IO::Uncompress::Base 2.018 ;
-use IO::Uncompress::Adapter::Bunzip2 2.018 ;
+use IO::Uncompress::Base 2.019 ;
+use IO::Uncompress::Adapter::Bunzip2 2.019 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $Bunzip2Error = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
@@ -40,7 +40,7 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common 2.018 qw(:Parse);
+    use IO::Compress::Base::Common 2.019 qw(:Parse);
     
     return (
             'Verbosity'     => [1, 1, Parse_boolean,   0],
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm
index d98a216..9f289cb 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm
@@ -9,12 +9,12 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Uncompress::RawInflate 2.018 ;
+use IO::Uncompress::RawInflate 2.019 ;
 
-use Compress::Raw::Zlib 2.018 qw( crc32 ) ;
-use IO::Compress::Base::Common 2.018 qw(:Status createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.018 ;
-use IO::Compress::Zlib::Extra 2.018 ;
+use Compress::Raw::Zlib 2.019 qw( crc32 ) ;
+use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.019 ;
+use IO::Compress::Zlib::Extra 2.019 ;
 
 require Exporter ;
 
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
 
 $GunzipError = '';
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 
 sub new
 {
@@ -47,7 +47,7 @@ sub gunzip
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
     return ( 'ParseExtra' => [1, 1, Parse_boolean,  0] ) ;
 }
 
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm b/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm
index 65842f9..e58146a 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm
@@ -5,15 +5,15 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.018 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.018 ;
+use IO::Compress::Base::Common  2.019 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.019 ;
 
-use IO::Uncompress::RawInflate  2.018 ;
+use IO::Uncompress::RawInflate  2.019 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $InflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::RawInflate );
diff --git a/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm
index 1115724..08815cb 100755
--- a/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm
@@ -5,16 +5,16 @@ use strict ;
 use warnings;
 use bytes;
 
-use Compress::Raw::Zlib  2.018 ;
-use IO::Compress::Base::Common  2.018 qw(:Status createSelfTiedObject);
+use Compress::Raw::Zlib  2.019 ;
+use IO::Compress::Base::Common  2.019 qw(:Status createSelfTiedObject);
 
-use IO::Uncompress::Base  2.018 ;
-use IO::Uncompress::Adapter::Inflate  2.018 ;
+use IO::Uncompress::Base  2.019 ;
+use IO::Uncompress::Adapter::Inflate  2.019 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $RawInflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
diff --git a/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm b/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm
index b74a32a..6d30d28 100644
--- a/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm
+++ b/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm
@@ -8,14 +8,14 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Uncompress::RawInflate  2.018 ;
-use IO::Compress::Base::Common  2.018 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate  2.018 ;
-use IO::Uncompress::Adapter::Identity 2.018 ;
-use IO::Compress::Zlib::Extra 2.018 ;
-use IO::Compress::Zip::Constants 2.018 ;
+use IO::Uncompress::RawInflate  2.019 ;
+use IO::Compress::Base::Common  2.019 qw(:Status createSelfTiedObject);
+use IO::Uncompress::Adapter::Inflate  2.019 ;
+use IO::Uncompress::Adapter::Identity 2.019 ;
+use IO::Compress::Zlib::Extra 2.019 ;
+use IO::Compress::Zip::Constants 2.019 ;
 
-use Compress::Raw::Zlib  2.018 qw(crc32) ;
+use Compress::Raw::Zlib  2.019 qw(crc32) ;
 
 BEGIN
 {
@@ -30,7 +30,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
 
-$VERSION = '2.018';
+$VERSION = '2.019';
 $UnzipError = '';
 
 @ISA    = qw(Exporter IO::Uncompress::RawInflate);
@@ -63,7 +63,7 @@ sub unzip
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.018 qw(:Parse);
+    use IO::Compress::Base::Common  2.019 qw(:Parse);
 
     
     return (
diff --git a/ext/IO-Compress/t/000prereq.t b/ext/IO-Compress/t/000prereq.t
index e5ec181..f2a687b 100644
--- a/ext/IO-Compress/t/000prereq.t
+++ b/ext/IO-Compress/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
 
 
-    my $VERSION = '2.018';
+    my $VERSION = '2.019';
     my @NAMES = qw(
 			Compress::Raw::Bzip2
 			Compress::Raw::Zlib