X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcomstack.c;h=ba1cad329fcf69bdb466c5603923642bb0b279ba;hb=b55ea70d15d3ffaa247cc30db0e6b8dcc4d6ac7c;hp=050fcc1e6d6c00f23f442ab9483a1674db8869c1;hpb=82988dd4a36739a5559015cb7df4dd757765d289;p=yaz-moved-to-github.git

diff --git a/src/comstack.c b/src/comstack.c
index 050fcc1..ba1cad3 100644
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: comstack.c,v 1.3 2004-01-06 19:12:19 adam Exp $
+ * $Id: comstack.c,v 1.10 2004-05-03 09:00:50 adam Exp $
  */
 
 #include <string.h>
@@ -14,6 +14,10 @@
 #include <yaz/unix.h>
 #include <yaz/odr.h>
 
+#ifdef WIN32
+#define strncasecmp _strnicmp
+#endif
+
 static const char *cs_errlist[] =
 {
     "No error or unspecified error",
@@ -97,8 +101,8 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
     {
 	t = tcpip_type;
         host = type_and_host + 5;
-        if (host[0] == '/' && host[1] == '/')
-            host = host + 2;
+        while (host[0] == '/')
+            host++;
         proto = PROTO_HTTP;
     }
     else if (strncmp(type_and_host, "https:", 6) == 0)
@@ -106,8 +110,8 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
 #if HAVE_OPENSSL_SSL_H
 	t = ssl_type;
         host = type_and_host + 6;
-        if (host[0] == '/' && host[1] == '/')
-            host = host + 2;
+        while (host[0] == '/')
+            host++;
         proto = PROTO_HTTP;
 #else
 	return 0;
@@ -117,7 +121,6 @@ COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
     {
 	t = tcpip_type;
 	host = type_and_host;
-        
     }
     cs = cs_create (t, blocking, proto);
     if (!cs)
@@ -136,6 +139,7 @@ int cs_look (COMSTACK cs)
     return cs->event;
 }
 
+#define CHUNK_DEBUG 0
 int cs_complete_auto(const unsigned char *buf, int len)
 {
     if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f
@@ -156,23 +160,26 @@ int cs_complete_auto(const unsigned char *buf, int len)
                 {
                     if (chunked)
                     { 
+			/* inside chunked body .. */
                         while(1)
                         {
-                            int chunk_len = 0;
+                            int j, chunk_len = 0;
                             i += 2;
-#if 0
+#if CHUNK_DEBUG
 /* debugging */
                             if (i <len-2)
                             {
-                                printf ("\n>>>");
+                                printf ("\n<<<");
+				int j;
                                 for (j = i; j <= i+4; j++)
                                     printf ("%c", buf[j]);
-                                printf ("<<<\n");
+                                printf (">>>\n");
                             }
 #endif
+			    /* read chunk length */
                             while (1)
                                 if (i >= len-2) {
-#if 0
+#if CHUNK_DEBUG
 /* debugging */                                    
                                     printf ("XXXXXXXX not there yet 1\n");
                                     printf ("i=%d len=%d\n", i, len);
@@ -189,29 +196,41 @@ int cs_complete_auto(const unsigned char *buf, int len)
                                         (buf[i++] - ('a'-10));
                                 else
                                     break;
-                            if (buf[i] != '\r' || buf[i+1] != '\n' ||
-                                chunk_len < 0)
-                                return i+2;    /* bad. stop now */
+			    /* move forward until CRLF - skip chunk ext */
+			    j = 0;
+			    while (buf[i] != '\r' && buf[i+1] != '\n')
+			    {
+				if (i >= len-2)
+				    return 0;   /* need more buffer .. */
+				if (++j > 1000)
+				    return i; /* enough.. stop */
+				i++;
+			    }
+			    /* got CRLF */
+#if CHUNK_DEBUG
+			    printf ("XXXXXX chunk_len=%d\n", chunk_len);
+#endif			    
+			    if (chunk_len < 0)
+				return i+2;    /* bad chunk_len */
                             if (chunk_len == 0)
-                            {
-                                /* consider trailing headers .. */
-                                while(i <= len-4)
-                                {
-                                    if (buf[i] == '\r' &&  buf[i+1] == '\n' &&
-                                        buf[i+2] == '\r' && buf[i+3] == '\n')
-                                        if (len >= i+4)
-                                            return i+4;
-                                    i++;
-                                }
-#if 0
-/* debugging */
-                                printf ("XXXXXXXXX not there yet 2\n");
-                                printf ("i=%d len=%d\n", i, len);
-#endif
-                                return 0;
-                            }
+				break;
                             i += chunk_len+2;
                         }
+			/* consider trailing headers .. */
+			while(i <= len-4)
+			{
+			    if (buf[i] == '\r' &&  buf[i+1] == '\n' &&
+				buf[i+2] == '\r' && buf[i+3] == '\n')
+				if (len >= i+4)
+				    return i+4;
+			    i++;
+			}
+#if CHUNK_DEBUG
+/* debugging */
+			printf ("XXXXXXXXX not there yet 2\n");
+			printf ("i=%d len=%d\n", i, len);
+#endif
+			return 0;
                     }
                     else
                     {   /* not chunked ; inside body */
@@ -223,17 +242,17 @@ int cs_complete_auto(const unsigned char *buf, int len)
                     break;
                 }
                 else if (i < len - 20 && 
-                         !strncasecmp(buf+i, "Transfer-Encoding:", 18))
+                         !strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18))
                 {
                     i+=18;
                     while (buf[i] == ' ')
                         i++;
                     if (i < len - 8)
-                        if (!strncasecmp(buf+i, "chunked", 7))
+                        if (!strncasecmp((const char *) buf+i, "chunked", 7))
                             chunked = 1;
                 }
                 else if (i < len - 17 &&
-                         !strncasecmp(buf+i, "Content-Length:", 15))
+                         !strncasecmp((const char *)buf+i, "Content-Length:", 15))
                 {
                     i+= 15;
                     while (buf[i] == ' ')