Changeset 24256 for titan/titan/sock.h

Timestamp:

10/13/13 10:16:30 (10 years ago)

Author:

nit

Message:

[titan] extend http unzip

File:

• titan/titan/sock.h (modified) (2 diffs)

titan/titan/sock.h

@@ -726 +726 @@
                 len = strtoul(contentlen, NULL, 10);
         }
-        if(filename == NULL && flag == 0 && ostrstr(tmpbuf, "Content-Type: application/x-gzip") != NULL)
-                gzip = 1;
+        if(filename == NULL && (flag == 0 || flag == 1) && ostrstr(tmpbuf, "Content-Type: application/x-gzip") != NULL)
+        {
+                if(flag == 0) gzip = -1;
+                else if(flag == 1) gzip = headerlen;
+        }
 
         if(flag == 0) headerlen = 0;
@@ -776 +779 @@
         sockclose(&sock);
         
-        if(gzip == 1)
+        if(gzip != 0)
         {
                 int unzipret = 0, outlen = 0;
                 char* outbuf = NULL;
                 
-                unzipret = ounzip(buf, count, &outbuf, &outlen, MINMALLOC * 100, 2);
-                if(unzipret == 0 && outbuf != NULL)
-                {
-                        free(buf); buf = outbuf;
-                        count = outlen;
-                }
+                if(gzip == -1)
+                        outbuf = malloc(MINMALLOC * 100);
                 else
-                {
-                        err("unzip http data");
+                        outbuf = malloc((MINMALLOC * 100) + gzip);
+                        
+                if(outbuf != NULL)
+                {
+                        if(gzip == -1)
+                                unzipret = ounzip(buf, count, &outbuf, &outlen, MINMALLOC * 100, 1);
+                        else
+                        {
+                                memcpy(outbuf, buf, gzip);
+                                char* tmpoutbuf = outbuf + gzip;
+                                unzipret = ounzip(buf + gzip, count - gzip, &tmpoutbuf, &outlen, MINMALLOC * 100, 1);
+                                outlen += gzip;                 
+                        }
+                        if(unzipret == 0)
+                        {
+                                free(buf); buf = outbuf;
+                                count = outlen;
+                        }
+                        else
+                        {
+                                free(outbuf); outbuf = NULL;
+                                err("unzip http data");
+                        }
+                }
+                else
+                {
+                        err("no mem");
                 }
         }