فهرست منبع

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``
   ``--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::
 
@@ -142,13 +144,13 @@ JSON-RPC over WebSocket  libnettle or libgcrypt or OpenSSL
   installed.  If you prefer libgcrypt, run configure with
   ``--without-libnettle --with-libgcrypt``. If OpenSSL is selected over
   GnuTLS, neither libnettle nor libgcrypt will be used.
-  
+
   If none of the optional dependencies are installed, an internal
   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
 libraries:

+ 1 - 1
configure.ac

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

+ 0 - 1
mingw-config

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