Changeset 24286 for titan/titan/sock.h

Timestamp:

10/13/13 22:02:15 (10 years ago)

Author:

nit

Message:

[titan] add chunk support to gethttp

File:

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

titan/titan/sock.h

@@ -585 +585 @@
 }
 
+int getchunkedlen(int sock, int timeout)
+{
+        int ret = 0, end = 0;;
+        char chunked[16] = {'\0'};
+        int chunkedid = 0;
+
+        while(chunkedid < 15)
+        {
+                unsigned char c = '\0';
+
+                ret = sockreceive(&sock, &c, 1, timeout * 1000);
+                if(ret != 0)
+                {
+                        printf("no client data in buffer");
+                        break;
+                }
+
+                if(c == ';') break;
+
+                chunked[chunkedid] = c;
+                chunkedid++;
+                if(chunkedid > 2 && c == '\n')
+                        break;
+        }
+
+        return(strtol(chunked, NULL, 16));
+}
+
 //flag 0: output without header
 //flag 1: output with header
@@ -591 +619 @@
 {
         int sock = -1, ret = 0, count = 0, hret = 0, freeheader = 0, gzip = 0;
-        int headerlen = 0;
+        int headerlen = 0, chunkedlen = 0, chunked = 0;
         unsigned int len = 0, maxret = 0;
         char *ip = NULL;
@@ -680 +708 @@
         while(pbuf - tmpbuf < MINMALLOC)
         {
-                unsigned char c;
+                unsigned char c = '\0';
 
                 ret = sockreceive(&sock, &c, 1, timeout * 1000);
@@ -736 +764 @@
                 else if(flag == 1) gzip = headerlen;
         }
+        if(strstr(tmpbuf, "Transfer-Encoding: chunked") != NULL)
+        {
+                chunked = 1; 
+                chunkedlen = getchunkedlen(sock, timeout);
+                if(chunkedlen > MINMALLOC) chunked = 0;
+        }
+                
 
         if(flag == 0) headerlen = 0;
-        while((ret = sockread(sock, (unsigned char*)tmpbuf + headerlen, 0, MINMALLOC - headerlen, timeout * 1000, 0)) > 0)
+        if(chunked == 0) chunkedlen = MINMALLOC - headerlen;
+        while((ret = sockread(sock, (unsigned char*)tmpbuf + headerlen, 0, chunkedlen, timeout * 1000, 0)) > 0)
         {
                 maxret += ret;
@@ -762 +798 @@
                 }
                 memset(tmpbuf, 0, ret);
+                
+                if(chunked == 1)
+                {
+                        chunkedlen = getchunkedlen(sock, timeout);
+                        if(chunkedlen > MINMALLOC) chunked = 0;
+                }
+                if(chunked == 0) chunkedlen = MINMALLOC - headerlen;
         }
         if(ret < 0)