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
Choose IPV6 over IPV4 addrany addresses (bug #2350).
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
4c8fe05
..
0020c97
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: comstack.c,v 1.22 2007-11-30 11:44:47 adam Exp $
*/
/**
*/
/**
@@
-24,6
+22,14
@@
#define strncasecmp _strnicmp
#endif
#define strncasecmp _strnicmp
#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",
@@
-100,7
+106,7
@@
static int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
@@
-128,7
+134,7
@@
static int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp(uri, "https:", 6) == 0)
{
}
else if (strncmp(uri, "https:", 6) == 0)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
*t = ssl_type;
*host = uri + 6;
while (**host == '/')
*t = ssl_type;
*host = uri + 6;
while (**host == '/')