[yum-commits] urlgrabber/grabber.py

[skvidal at osuosl.org]

 urlgrabber/grabber.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7b7efa431449e5af771a9229c942480357ba9899
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Nov 12 11:00:43 2009 -0500

    - move the hdr_ended check around so we're resetting the size only when
      we actually have a new hdr, not when we don't. :(

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 044d0ad..a26880c 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -1092,14 +1092,15 @@ class PyCurlFileObject():
             return -1
             
     def _hdr_retrieve(self, buf):
+        if self._hdr_ended:
+            self._hdr_dump = ''
+            self.size = 0
+            self._hdr_ended = False
+
         if self._over_max_size(cur=len(self._hdr_dump), 
                                max_size=self.opts.max_header_size):
             return -1
         try:
-            if self._hdr_ended:
-                self._hdr_dump = ''
-                self._hdr_ended = False
-                
             self._hdr_dump += buf
             # we have to get the size before we do the progress obj start
             # but we can't do that w/o making it do 2 connects, which sucks
@@ -1124,8 +1125,7 @@ class PyCurlFileObject():
                 
             if len(self._hdr_dump) != 0 and buf == '\r\n':
                 self._hdr_ended = True
-                self.size = 0
-                if DEBUG: DEBUG.info('header reset:')                
+                if DEBUG: DEBUG.info('header ended:')
                 
             return len(buf)
         except KeyboardInterrupt: