* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: comstack.c,v 1.7 2004-04-28 22:44:59 adam Exp $
+ * $Id: comstack.c,v 1.11 2004-09-21 14:59:01 adam Exp $
*/
#include <string.h>
COMSTACK cs;
CS_TYPE t;
- printf (
-#if HAVE_OPENSSL_SSL_H
- "cs_create_host SSL\n"
-#else
- "cs_create_host\n"
-#endif
- );
if (strncmp (type_and_host, "tcp:", 4) == 0)
{
t = tcpip_type;
{
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)
#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;
{
t = tcpip_type;
host = type_and_host;
-
}
cs = cs_create (t, blocking, proto);
if (!cs)
&& buf[2] >= 0x20 && buf[2] < 0x7f)
{
/* deal with HTTP request/response */
- int i = 2, content_len = 0, chunked = 0;
+ int i = 2, content_len = -1, chunked = 0;
while (i <= len-4)
{
if (i > 8192)
+ {
return i; /* do not allow more than 8K HTTP header */
+ }
if (buf[i] == '\r' && buf[i+1] == '\n')
{
i += 2;
{ /* not chunked ; inside body */
/* i += 2 seems not to work with GCC -O2 ..
so i+2 is used instead .. */
- if (len >= (i+2)+ content_len)
+ if (content_len == -1)
+ return 0; /* no content length */
+ else if (len >= (i+2)+ content_len)
+ {
return (i+2)+ content_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] == ' ')