diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | configure.in | 95 |
4 files changed, 56 insertions, 54 deletions
@@ -1,5 +1,13 @@ 2003-03-18 Dan Winship <danw@ximian.com> + * configure.in: comment out NSS checks. The NSS code doesn't work + and there are no current plans to fix it. + + * README (Features): Mention GnuTLS, remove NSS and the rest of + the "Planned Features" section. + + * MAINTAINERS: remove Alex + * libsoup/soup-openssl.c (soup_openssl_get_iochannel): Bump the timeout to 10 seconds (and get rid of the 3 tries) so we don't fail to connect just because the server is slow/far away. diff --git a/MAINTAINERS b/MAINTAINERS index 2a6f53a3..94b373eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,3 +1,2 @@ -Alex Graveley <alex@ximian.com> Joe Shaw <joe@ximian.com> Dan Winship <danw@ximian.com> @@ -13,15 +13,11 @@ Features: * Connection cache * HTTP chunked transfer support * HTTP, SOCKS4, and SOCKS5 authenticated proxy support - * SSL Support using OpenSSL + * SSL Support using OpenSSL or GnuTLS * Client support for Digest, NTLM, and Basic authentication * HTTP server * Server support for Digest and Basic authentication -Planned Features: - * SSL Support using NSS - * Gconf configuration and proxy integration - To subscribe to the Soup discussion list, send mail with the word "Subscribe" in the message body to soup-list-request@ximian.com. diff --git a/configure.in b/configure.in index 16dcc499..99d1ef14 100644 --- a/configure.in +++ b/configure.in @@ -181,23 +181,23 @@ AC_ARG_ENABLE(ssl, [ --enable-ssl Turn on Secure Sockets Layer support [default=yes]],, enable_ssl=yes) -AC_ARG_WITH(nspr-includes, - [ --with-nspr-includes Specify location of Netscape Portable Runtime headers], - [nspr_inc_prefix=-I$withval]) - -AC_ARG_WITH(nspr-libs, - [ --with-nspr-libs Specify location of Netscape Portable Runtime libs], - [nspr_prefix=$withval], - [nspr_prefix=$libdir]) - -AC_ARG_WITH(nss-includes, - [ --with-nss-includes Specify location of NSS header files], - [nss_inc_prefix=-I$withval]) - -AC_ARG_WITH(nss-libs, - [ --with-nss-libs Specify location of NSS libs], - [nss_prefix=$withval], - [nss_prefix=$libdir]) +dnl NSS AC_ARG_WITH(nspr-includes, +dnl NSS [ --with-nspr-includes Specify location of Netscape Portable Runtime headers], +dnl NSS [nspr_inc_prefix=-I$withval]) +dnl NSS +dnl NSS AC_ARG_WITH(nspr-libs, +dnl NSS [ --with-nspr-libs Specify location of Netscape Portable Runtime libs], +dnl NSS [nspr_prefix=$withval], +dnl NSS [nspr_prefix=$libdir]) +dnl NSS +dnl NSS AC_ARG_WITH(nss-includes, +dnl NSS [ --with-nss-includes Specify location of NSS header files], +dnl NSS [nss_inc_prefix=-I$withval]) +dnl NSS +dnl NSS AC_ARG_WITH(nss-libs, +dnl NSS [ --with-nss-libs Specify location of NSS libs], +dnl NSS [nss_prefix=$withval], +dnl NSS [nss_prefix=$libdir]) AC_ARG_WITH(openssl-includes, @@ -240,7 +240,7 @@ AC_ARG_ENABLE(ssl-link-static, enable_gnutls="no" enable_openssl="no" -enable_nss="no" +dnl NSS enable_nss="no" if test "x$enable_ssl" = xyes; then found_ssl= @@ -307,35 +307,35 @@ if test "x$enable_ssl" = xyes; then CPPFLAGS=$save_CPPFLAGS fi - ### - ### Check for Mozilla NSS - ### - if test "x$found_ssl" != "xyes"; then - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $nspr_inc_prefix $nss_inc_prefix" - AC_CHECK_HEADERS(nss.h ssl.h pk11func.h, - [enable_nss="yes"], - [enable_nss="no"; break]) - - if test "x$enable_nss" = xyes; then - if test "x$enable_static_ssl" = "xyes"; then - NSS_LIBS="-lpthread $nspr_prefix/libnspr4.a $nspr_prefix/libplc4.a $nspr_prefix/libplds4.a $nss_prefix/libnssb.a" - else - NSS_LIBS="-lpthread -L$nspr_prefix -lnspr4 -lplc4 -lplds4 $nss_prefix -lnss3 -lssl3" - fi - NSS_CFLAGS=$CPPFLAGS - AC_DEFINE(HAVE_NSS, 1, - [Defined if you are using Mozilla NSS for SSL support]) - found_ssl=yes - else - NSS_LIBS= - NSS_CFLAGS= - fi - - AC_SUBST(NSS_CFLAGS) - AC_SUBST(NSS_LIBS) - CPPFLAGS=$save_CPPFLAGS - fi +dnl NSS ### +dnl NSS ### Check for Mozilla NSS +dnl NSS ### +dnl NSS if test "x$found_ssl" != "xyes"; then +dnl NSS save_CPPFLAGS=$CPPFLAGS +dnl NSS CPPFLAGS="$CPPFLAGS $nspr_inc_prefix $nss_inc_prefix" +dnl NSS AC_CHECK_HEADERS(nss.h ssl.h pk11func.h, +dnl NSS [enable_nss="yes"], +dnl NSS [enable_nss="no"; break]) +dnl NSS +dnl NSS if test "x$enable_nss" = xyes; then +dnl NSS if test "x$enable_static_ssl" = "xyes"; then +dnl NSS NSS_LIBS="-lpthread $nspr_prefix/libnspr4.a $nspr_prefix/libplc4.a $nspr_prefix/libplds4.a $nss_prefix/libnssb.a" +dnl NSS else +dnl NSS NSS_LIBS="-lpthread -L$nspr_prefix -lnspr4 -lplc4 -lplds4 $nss_prefix -lnss3 -lssl3" +dnl NSS fi +dnl NSS NSS_CFLAGS=$CPPFLAGS +dnl NSS AC_DEFINE(HAVE_NSS, 1, +dnl NSS [Defined if you are using Mozilla NSS for SSL support]) +dnl NSS found_ssl=yes +dnl NSS else +dnl NSS NSS_LIBS= +dnl NSS NSS_CFLAGS= +dnl NSS fi +dnl NSS +dnl NSS AC_SUBST(NSS_CFLAGS) +dnl NSS AC_SUBST(NSS_LIBS) +dnl NSS CPPFLAGS=$save_CPPFLAGS +dnl NSS fi fi @@ -441,7 +441,6 @@ Configuration: OpenSSL support: ${enable_openssl} Static SSL Proxy: ${enable_static_proxy:-no} SSL Proxy Name: ${SSL_PROXY_NAME} - Mozilla NSS support: ${enable_nss} " |