projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use XML comments for debug/verbose info.
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
7ee51fe
..
71ab081
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,8
+1,13
@@
/*
/*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* 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.14 2005-01-15 19:47:11 adam Exp $
+ */
+
+/**
+ * \file comstack.c
+ * \brief Implements Generic COMSTACK functions
*/
#include <string.h>
*/
#include <string.h>
@@
-74,13
+79,6
@@
COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
COMSTACK cs;
CS_TYPE t;
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;
if (strncmp (type_and_host, "tcp:", 4) == 0)
{
t = tcpip_type;
@@
-108,8
+106,8
@@
COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
{
t = tcpip_type;
host = type_and_host + 5;
{
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)
proto = PROTO_HTTP;
}
else if (strncmp(type_and_host, "https:", 6) == 0)
@@
-117,8
+115,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 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;
proto = PROTO_HTTP;
#else
return 0;
@@
-128,7
+126,6
@@
COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
{
t = tcpip_type;
host = type_and_host;
{
t = tcpip_type;
host = type_and_host;
-
}
cs = cs_create (t, blocking, proto);
if (!cs)
}
cs = cs_create (t, blocking, proto);
if (!cs)
@@
-156,11
+153,18
@@
int cs_complete_auto(const unsigned char *buf, int len)
{
/* deal with HTTP request/response */
int i = 2, content_len = 0, chunked = 0;
{
/* deal with HTTP request/response */
int i = 2, content_len = 0, chunked = 0;
+
+ /* if dealing with HTTP responses - then default
+ content length is unlimited (socket close) */
+ if (!memcmp(buf, "HTTP/", 5))
+ content_len = -1;
while (i <= len-4)
{
if (i > 8192)
while (i <= len-4)
{
if (i > 8192)
+ {
return i; /* do not allow more than 8K HTTP header */
return i; /* do not allow more than 8K HTTP header */
+ }
if (buf[i] == '\r' && buf[i+1] == '\n')
{
i += 2;
if (buf[i] == '\r' && buf[i+1] == '\n')
{
i += 2;
@@
-244,23
+248,27
@@
int cs_complete_auto(const unsigned char *buf, int len)
{ /* not chunked ; inside body */
/* i += 2 seems not to work with GCC -O2 ..
so i+2 is used instead .. */
{ /* 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;
return (i+2)+ content_len;
+ }
}
break;
}
else if (i < len - 20 &&
}
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)
{
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 &&
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] == ' ')
{
i+= 15;
while (buf[i] == ' ')