[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Daniel Pittman]

The following commit has been merged in the upstream branch:
commit 0e9858f19d9d2e021a9d0aa43b69c6ddee229352
Author: Daniel Pittman <daniel at rimspace.net>
Date:   Tue Feb 22 14:18:57 2011 -0800

    (#6407) Fix spec test hang with Mocha >= 0.9.11 in zlib testing
    
    We had a combination of bad logic, and bad testing, and a nasty behaviour of
    Mocha <= 0.9.10 that would result in a false pass for one of our tests.
    
    This not only falsely passed, but hid an infinite loop retrying decompression
    on an invalid data stream; it could be triggered by anything that sent an HTTP
    request with an invalid compressed body, resulting in a livelock.
    
    Paired-with: Jesse Wolfe <jesse at puppetlabs.com>
    Signed-off-by: Daniel Pittman <daniel at puppetlabs.com>

diff --git a/lib/puppet/network/http/compression.rb b/lib/puppet/network/http/compression.rb
index d9b56f1..c8d0011 100644
--- a/lib/puppet/network/http/compression.rb
+++ b/lib/puppet/network/http/compression.rb
@@ -75,7 +75,10 @@ module Puppet::Network::HTTP::Compression
         # in this case, we try with a verbatim (no header)
         # deflater.
         @uncompressor = Zlib::Inflate.new
-        retry if @first
+        if @first then
+          @first = false
+          retry
+        end
         raise
       end
 
diff --git a/spec/unit/network/http/compression_spec.rb b/spec/unit/network/http/compression_spec.rb
old mode 100644
new mode 100755
index c5bbbb0..3828ec5
--- a/spec/unit/network/http/compression_spec.rb
+++ b/spec/unit/network/http/compression_spec.rb
@@ -178,7 +178,7 @@ describe "http compression" do
       end
 
       it "should raise the error the second time" do
-        @inflater.expects(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
+        @inflater.stubs(:inflate).raises(Zlib::DataError.new("not a zlib stream"))
         Zlib::Inflate.expects(:new).with.returns(@inflater)
         lambda { @adapter.uncompress("chunk") }.should raise_error
       end

-- 
Puppet packaging for Debian