summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-02-22 14:44:35 -0800
committerDaniel Pittman <daniel@rimspace.net>2011-02-22 14:44:35 -0800
commit101527b0231bcbad8a9d0d5f2b434c9fcb2b518c (patch)
tree2d89725c0fbaacc419600aa37a2b66703d2e05e8 /lib
parentea7b9dfc19ed704bc3abbd9c955e8a40970ada1f (diff)
parent0e9858f19d9d2e021a9d0aa43b69c6ddee229352 (diff)
Merge branch 'bug/2.6.next/6407-specs-hang-on-zlib-test' into 2.6.next
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/http/compression.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/network/http/compression.rb b/lib/puppet/network/http/compression.rb
index d9b56f184..c8d001169 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