X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzgdu.c;h=7fd3c73f640e1f487cda7653fca62b2333a8a5ff;hb=0e48274dd7b0ba3fd4d3f91e898f3d28bdf23dfa;hp=fa921536dc73851af54af85a5c48caf67b493425;hpb=b1419c61a0ac369638256f2afd1fc6b8ecd8fa34;p=yaz-moved-to-github.git

diff --git a/src/zgdu.c b/src/zgdu.c
index fa92153..7fd3c73 100644
--- a/src/zgdu.c
+++ b/src/zgdu.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: zgdu.c,v 1.3 2003-12-30 00:29:53 adam Exp $
+ * $Id: zgdu.c,v 1.6 2004-02-19 23:21:44 adam Exp $
  */
 
 #include <yaz/odr.h>
@@ -14,6 +14,7 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
                                   char **content_buf, int *content_len)
 {
     int i = off;
+    int chunked = 0;
 
     *headers = 0;
     while (i < o->size-1 && o->buf[i] == '\r')
@@ -52,6 +53,10 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
         memcpy ((*headers)->value, o->buf + po, i - po);
         (*headers)->value[i - po] = '\0';
         
+	if (!strcasecmp((*headers)->name, "Transfer-Encoding")
+	    &&
+	    !strcasecmp((*headers)->value, "chunked"))
+	    chunked = 1;
         headers = &(*headers)->next;
     }
     *headers = 0;
@@ -63,22 +68,70 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
     }
     i++;
 
-    if (i > o->size)
+    if (chunked)
     {
-        o->error = OHTTP;
-        return 0;
-    }
-    else if (i == o->size)
-    {
-        *content_buf = 0;
-        *content_len = 0;
+	int off = 0;
+	
+	/* we know buffer will be smaller than o->size - i - 2*/
+	*content_buf = (char*) odr_malloc(o, o->size - i - 2);  
+	
+	while (1)
+	{
+	    int chunk_len = 0;
+	    for (; i  < o->size-2; i++)
+		if (isdigit(o->buf[i]))
+		    chunk_len = chunk_len * 16 + 
+			(o->buf[i] - '0');
+		else if (isupper(o->buf[i]))
+		    chunk_len = chunk_len * 16 + 
+			(o->buf[i] - ('A'-10));
+		else if (islower(o->buf[i]))
+		    chunk_len = chunk_len * 16 + 
+			(o->buf[i] - ('a'-10));
+		else
+		    break;
+	    if (i > o->size - 2)
+		break;
+	    if (o->buf[i] != '\r' || o->buf[i+1] != '\n') 
+	    {   /* chunk length must be followed by \r\n */
+		o->error = OHTTP;
+		return 0;
+	    }
+	    i += 2;
+	    if (chunk_len == 0)
+		break;
+	    if (chunk_len < 0 || off + chunk_len > o->size)
+	    {
+		o->error = OHTTP;
+		return 0;
+	    }
+	    memcpy (*content_buf + off, o->buf + i, chunk_len);
+	    i += chunk_len;
+	    off += chunk_len;
+	}
+	if (!off)
+	    *content_buf = 0;
+	*content_len = off;
     }
-    else 
+    else
     {
-        *content_len = o->size - i;
-        *content_buf = (char*) odr_malloc(o, *content_len + 1);
-        memcpy(*content_buf, o->buf + i, *content_len);
-        (*content_buf)[*content_len] = '\0';
+	if (i > o->size)
+	{
+	    o->error = OHTTP;
+	    return 0;
+	}
+	else if (i == o->size)
+	{
+	    *content_buf = 0;
+	    *content_len = 0;
+	}
+	else 
+	{
+	    *content_len = o->size - i;
+	    *content_buf = (char*) odr_malloc(o, *content_len + 1);
+	    memcpy(*content_buf, o->buf + i, *content_len);
+	    (*content_buf)[*content_len] = '\0';
+	}
     }
     return 1;
 }
@@ -294,11 +347,10 @@ int z_GDU (ODR o, Z_GDU **p, int opt, const char *name)
             if (!z_HTTP_header_lookup((*p)->u.HTTP_Response->headers,
                                       "Content-Length"))
             {
-                char lstr[20];
-                sprintf(lstr, "%d", (*p)->u.HTTP_Response->content_len);
-                z_HTTP_header_add(o,
-                                  &(*p)->u.HTTP_Response->headers,
-                                  "Content-Length", lstr);
+                char lstr[60];
+                sprintf(lstr, "Content-Length: %d\r\n",
+			(*p)->u.HTTP_Response->content_len);
+                odr_write(o, (unsigned char *) lstr, strlen(lstr));
             }
             for (h = (*p)->u.HTTP_Response->headers; h; h = h->next)
             {
@@ -333,11 +385,10 @@ int z_GDU (ODR o, Z_GDU **p, int opt, const char *name)
                 !z_HTTP_header_lookup((*p)->u.HTTP_Request->headers,
                                       "Content-Length"))
             {
-                char lstr[20];
-                sprintf(lstr, "%d", (*p)->u.HTTP_Request->content_len);
-                z_HTTP_header_add(o,
-                                  &(*p)->u.HTTP_Request->headers,
-                                  "Content-Length", lstr);
+                char lstr[60];
+                sprintf(lstr, "Content-Length: %d\r\n",
+			(*p)->u.HTTP_Request->content_len);
+                odr_write(o, (unsigned char *) lstr, strlen(lstr));
             }
             for (h = (*p)->u.HTTP_Request->headers; h; h = h->next)
             {
@@ -353,7 +404,9 @@ int z_GDU (ODR o, Z_GDU **p, int opt, const char *name)
                           (*p)->u.HTTP_Request->content_len);
             if (o->direction == ODR_PRINT)
             {
-                fprintf(o->print, "-- HTTP request:\n%.*s\n", o->top, o->buf);
+                fprintf(o->print, "-- HTTP request:\n%.*s\n", o->top - top0,
+                        o->buf + top0);
+                fprintf(o->print, "-- \n");
             }
             break;
         case Z_GDU_Z3950: