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 memcached factory function when available
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
eac17f7
..
dfab102
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-19,19
+19,12
@@
#include <yaz/tcpip.h>
#include <yaz/unix.h>
#include <yaz/odr.h>
#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
#endif
#if HAVE_GNUTLS_H
#define ENABLE_SSL 1
#endif
-#if HAVE_OPENSSL_SSL_H
-#define ENABLE_SSL 1
-#endif
-
static const char *cs_errlist[] =
{
"No error or unspecified error",
static const char *cs_errlist[] =
{
"No error or unspecified error",
@@
-90,9
+83,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;
{
*connect_host = 0;
@@
-127,6
+120,8
@@
static int cs_parse_host(const char *uri, const char **host,
uri = cp + 1;
}
#ifdef WIN32
uri = cp + 1;
}
#ifdef WIN32
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#else
*t = unix_type;
return 0;
#else
*t = unix_type;
@@
-145,6
+140,8
@@
static int cs_parse_host(const char *uri, const char **host,
*host = uri + 4;
*proto = PROTO_Z3950;
#else
*host = uri + 4;
*proto = PROTO_Z3950;
#else
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#endif
}
return 0;
#endif
}
@@
-164,6
+161,8
@@
static int cs_parse_host(const char *uri, const char **host,
(*host)++;
*proto = PROTO_HTTP;
#else
(*host)++;
*proto = PROTO_HTTP;
#else
+ xfree(*connect_host);
+ *connect_host = 0;
return 0;
#endif
}
return 0;
#endif
}
@@
-190,10
+189,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))
char *connect_host = 0;
if (!cs_parse_host(vhost, &host, &t, &proto, &connect_host))
- {
- xfree(connect_host);
return 0;
return 0;
- }
if (proxy_host)
{
if (proxy_host)
{
@@
-201,10
+197,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);
if (!cs_parse_host(proxy_host, &host, &t, &proto1, &connect_host))
- {
- xfree(connect_host);
return 0;
return 0;
- }
}
if (t == tcpip_type)
}
if (t == tcpip_type)
@@
-389,17
+382,19
@@
static int cs_complete_http(const char *buf, int len, int head_only)
break;
}
else if (i < len - 20 &&
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)
{
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 &&
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] == ' ')
{
i+= 15;
while (buf[i] == ' ')
@@
-428,7
+423,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;
}
int r = cs_complete_http(buf, len, head_only);
return r;
}
- return completeBER((const unsigned char *) buf, len);
+ return completeBER(buf, len);
}
}