From 3427bece89ee00fdf82519e584a971f97c9f2071 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 21 Jan 2011 14:27:10 -0800
Subject: [PATCH] Mention axTLS in some more documentation
---
docs/FEATURES | 2 +-
docs/INTERNALS | 1 +
docs/LICENSE-MIXING | 4 ++++
docs/libcurl/libcurl-tutorial.3 | 4 ++++
tests/FILEFORMAT | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/docs/FEATURES b/docs/FEATURES
index 32589e1d32..63e4f676c1 100644
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -125,7 +125,7 @@ FILE
FOOTNOTES
=========
- *1 = requires OpenSSL, GnuTLS, NSS, yassl or PolarSSL
+ *1 = requires OpenSSL, GnuTLS, NSS, yassl, axTLS or PolarSSL
*2 = requires OpenLDAP
*3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
*4 = requires FBopenssl
diff --git a/docs/INTERNALS b/docs/INTERNALS
index 9d0bdbaa1b..e667c33076 100644
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -44,6 +44,7 @@ Portability
MIT krb5 lib 1.2.4
qsossl V5R2M0
NSS 3.11.x
+ axTLS 1.2.7
Heimdal ?
* = only partly functional, but that's due to bugs in the third party lib, not
diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index 3db1a3d7f1..f596546da5 100644
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -55,6 +55,10 @@ NSS http://www.mozilla.org/projects/security/pki/nss/
grant you different permissions and impose different obligations. You
should select the license that best meets your needs.
+axTLS http://axtls.sourceforge.net/
+
+ (May be used for SSL/TLS support) Uses a Modified BSD-style license.
+
c-ares http://daniel.haxx.se/projects/c-ares/license.html
(Used for asynchronous name resolves) Uses an MIT license that is very
diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3
index 72f002963a..1efd6fbb32 100644
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libcurl-tutorial.3
@@ -283,6 +283,10 @@ yassl
Required actions unknown.
+axTLS
+
+ Required actions unknown.
+
When using multiple threads you should set the CURLOPT_NOSIGNAL option to 1
for all handles. Everything will or might work fine except that timeouts are
not honored during the DNS lookup - which you can work around by building
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 05d622f333..74fecacdd6 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -168,6 +168,7 @@ A list of features that MUST be present in the client/library for this test to
be able to run (if these features are not present, the test will be
SKIPPED). Features testable here are:
+axTLS
crypto
getrlimit
GnuTLS
--
GitLab