浏览代码

Enable wintls by default and remove its experimental status

Tatsuhiro Tsujikawa 11 年之前
父节点
当前提交
67aa993ca9
共有 3 个文件被更改,包括 10 次插入9 次删除
  1. 9 7
      README.rst
  2. 1 1
      configure.ac
  3. 0 1
      mingw-config

+ 9 - 7
README.rst

@@ -129,9 +129,11 @@ JSON-RPC over WebSocket  libnettle or libgcrypt or OpenSSL
   If you prefer OpenSSL, run configure with ``--without-gnutls``
   If you prefer OpenSSL, run configure with ``--without-gnutls``
   ``--with-openssl``.
   ``--with-openssl``.
 
 
-  On Windows there is an experimental SSL implementation available that
-  is based on the native Windows SSL capabilities (Schannel). Run
-  configure with ``--with-wintls`` to use.
+  On Windows there is SSL implementation available that is based on
+  the native Windows SSL capabilities (Schannel) and it will be
+  preferred.  Hence neither GnuTLS nor OpenSSL are required on that
+  platform.  If you'd like to disable this behavior, run configure
+  with ``--without-wintls``.
 
 
 .. note::
 .. note::
 
 
@@ -142,13 +144,13 @@ JSON-RPC over WebSocket  libnettle or libgcrypt or OpenSSL
   installed.  If you prefer libgcrypt, run configure with
   installed.  If you prefer libgcrypt, run configure with
   ``--without-libnettle --with-libgcrypt``. If OpenSSL is selected over
   ``--without-libnettle --with-libgcrypt``. If OpenSSL is selected over
   GnuTLS, neither libnettle nor libgcrypt will be used.
   GnuTLS, neither libnettle nor libgcrypt will be used.
-  
+
   If none of the optional dependencies are installed, an internal
   If none of the optional dependencies are installed, an internal
   implementation that only supports md5 and sha1 will be used.
   implementation that only supports md5 and sha1 will be used.
 
 
-  On Windows there is an experimental implementation available that is
-  based on the native Windows capabilities. Run configure with
-  ``--with-wintls`` to use.
+  On Windows there is SSL implementation available that is based on
+  the native Windows capabilities and it will be preferred, unless
+  aria2 is configured with ``--without-wintls``.
 
 
 A user can have one of the following configurations for SSL and crypto
 A user can have one of the following configurations for SSL and crypto
 libraries:
 libraries:

+ 1 - 1
configure.ac

@@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED([TARGET], ["$target"], [Define target-type])
 # Checks for arguments.
 # Checks for arguments.
 ARIA2_ARG_WITHOUT([libuv])
 ARIA2_ARG_WITHOUT([libuv])
 ARIA2_ARG_WITHOUT([appletls])
 ARIA2_ARG_WITHOUT([appletls])
-ARIA2_ARG_WITH([wintls])
+ARIA2_ARG_WITHOUT([wintls])
 ARIA2_ARG_WITHOUT([gnutls])
 ARIA2_ARG_WITHOUT([gnutls])
 ARIA2_ARG_WITHOUT([libnettle])
 ARIA2_ARG_WITHOUT([libnettle])
 ARIA2_ARG_WITHOUT([libgmp])
 ARIA2_ARG_WITHOUT([libgmp])

+ 0 - 1
mingw-config

@@ -63,7 +63,6 @@ test -z "$PREFIX" && PREFIX=/usr/local/$HOST
     --without-included-gettext \
     --without-included-gettext \
     --disable-nls \
     --disable-nls \
     --with-libcares \
     --with-libcares \
-    --with-wintls \
     --without-gnutls \
     --without-gnutls \
     --without-openssl \
     --without-openssl \
     --with-sqlite3 \
     --with-sqlite3 \