X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcomstack.c;h=fdcfcdb7548b69ecda555973c4d88ce6f640d5a0;hp=f52abde82c6954c3ef9d1cd30a141393858faa12;hb=d33b2b3730c2746928944277ea8268485dc875b8;hpb=a922f2f81cc0a360e271eb155df9b4f8cb8cd4e9

diff --git a/src/comstack.c b/src/comstack.c
index f52abde..fdcfcdb 100644
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -19,10 +19,7 @@
 #include <yaz/tcpip.h>
 #include <yaz/unix.h>
 #include <yaz/odr.h>
-
-#ifdef WIN32
-#define strncasecmp _strnicmp
-#endif
+#include <yaz/matchstr.h>
 
 #if HAVE_GNUTLS_H
 #define ENABLE_SSL 1
@@ -90,9 +87,9 @@ void cs_get_host_args(const char *type_and_host, const char **args)
     }
 }
 
-static int cs_parse_host(const char *uri, const char **host,
-                         CS_TYPE *t, enum oid_proto *proto,
-                         char **connect_host)
+int cs_parse_host(const char *uri, const char **host,
+                  CS_TYPE *t, enum oid_proto *proto,
+                  char **connect_host)
 {
     *connect_host = 0;
 
@@ -127,6 +124,8 @@ static int cs_parse_host(const char *uri, const char **host,
             uri = cp + 1;
         }
 #ifdef WIN32
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #else
         *t = unix_type;
@@ -145,6 +144,8 @@ static int cs_parse_host(const char *uri, const char **host,
         *host = uri + 4;
         *proto = PROTO_Z3950;
 #else
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #endif
     }
@@ -164,6 +165,8 @@ static int cs_parse_host(const char *uri, const char **host,
             (*host)++;
         *proto = PROTO_HTTP;
 #else
+        xfree(*connect_host);
+        *connect_host = 0;
         return 0;
 #endif
     }
@@ -190,10 +193,7 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
     char *connect_host = 0;
 
     if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
-    {
-        xfree(connect_host);
         return 0;
-    }
 
     if (proxy_host)
     {
@@ -201,10 +201,7 @@ COMSTACK cs_create_host_proxy(const char *vhost, int blocking, void **vp,
 
         xfree(connect_host);
         if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host))
-        {
-            xfree(connect_host);
             return 0;
-        }
     }
 
     if (t == tcpip_type)
@@ -261,8 +258,8 @@ static int cs_read_chunk(const char *buf, int i, int len)
 #if CHUNK_DEBUG
         if (i < len-2)
         {
-            printf ("\n<<<");
             int j;
+            printf ("\n<<<");
             for (j = i; j <= i+3; j++)
                 printf ("%c", buf[j]);
             printf (">>>\n");
@@ -331,22 +328,40 @@ static int cs_read_chunk(const char *buf, int i, int len)
 static int cs_complete_http(const char *buf, int len, int head_only)
 {
     /* deal with HTTP request/response */
-    int i = 2, content_len = 0, chunked = 0;
+    int i, content_len = 0, chunked = 0;
 
-    if (len < 6)
-        return 0;
+    /* need at least one line followed by \n or \r .. */
+    for (i = 0; ; i++)
+        if (i == len)
+            return 0; /* incomplete */
+        else if (buf[i] == '\n' || buf[i] == '\r')
+            break;
 
-    /* if dealing with HTTP responses - then default
-       content length is unlimited (socket close) */
+    /* check to see if it's a response with content */
     if (!head_only && !memcmp(buf, "HTTP/", 5))
-        content_len = -1;
-
+    {
+        int j;
+        for (j = 5; j < i; j++)
+            if (buf[j] == ' ')
+            {
+                ++j;
+                if (buf[j] == '1') /* 1XX */
+                    ;
+                else if (!memcmp(buf + j, "204", 3))
+                    ;
+                else if (!memcmp(buf + j, "304", 3))
+                    ;
+                else
+                    content_len = -1;
+                break;
+            }
+    }
 #if 0
     printf("len = %d\n", len);
     fwrite (buf, 1, len, stdout);
     printf("----------\n");
 #endif
-    while (i <= len-2)
+    for (i = 2; i <= len-2; )
     {
         if (i > 8192)
         {
@@ -371,17 +386,19 @@ static int cs_complete_http(const char *buf, int len, int head_only)
                 break;
             }
             else if (i < len - 20 &&
-                     !strncasecmp((const char *) buf+i, "Transfer-Encoding:", 18))
+                     !yaz_strncasecmp((const char *) buf+i,
+                                      "Transfer-Encoding:", 18))
             {
                 i+=18;
                 while (buf[i] == ' ')
                     i++;
                 if (i < len - 8)
-                    if (!strncasecmp((const char *) buf+i, "chunked", 7))
+                    if (!yaz_strncasecmp((const char *) buf+i, "chunked", 7))
                         chunked = 1;
             }
             else if (i < len - 17 &&
-                     !strncasecmp((const char *)buf+i, "Content-Length:", 15))
+                     !yaz_strncasecmp((const char *)buf+i,
+                                      "Content-Length:", 15))
             {
                 i+= 15;
                 while (buf[i] == ' ')
@@ -410,7 +427,7 @@ static int cs_complete_auto_x(const char *buf, int len, int head_only)
         int r = cs_complete_http(buf, len, head_only);
         return r;
     }
-    return completeBER((const unsigned char *) buf, len);
+    return completeBER(buf, len);
 }