diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | libsoup/Makefile.am | 6 | ||||
| -rw-r--r-- | libsoup/soup-openssl.c | 1 | ||||
| -rw-r--r-- | libsoup/soup-ssl-proxy.c | 2 | ||||
| -rw-r--r-- | libsoup/soup-ssl.c | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 7 |
7 files changed, 32 insertions, 10 deletions
@@ -1,3 +1,19 @@ +2002-12-13 Joe Shaw <joe@ximian.com> + + * libsoup/Makefile.am: Replace the BINDIR define with LIBEXECDIR. + (install-exec-hook): Install libsoup-ssl-proxy into libexecdir + instead of bindir. + + * libsoup/soup-openssl.c (soup_openssl_close): Call SSL_shutdown() + to properly shut down the SSL connection before closing the + socket. + + * libsoup/soup-ssl-proxy.c (soup_ssl_proxy_readwrite): Close the + iochannels before quitting the main loop. + + * tests/Makefile.am: disable building timeserver, the source file + wasn't added. + 2002-11-12 Dan Winship <danw@ximian.com> * configure.in: Check for IPv6 support in networking headers. @@ -13,11 +13,13 @@ Features: * Connection cache * HTTP chunked transfer support * HTTP, SOCKS4, and SOCKS5 authenticated proxy support - * SSL Support using OpenSSL or Mozilla NSS + * SSL Support using OpenSSL * Client support for Digest, NTLM, and Basic authentication + * HTTP server + * Server support for Digest and Basic authentication Planned Features: - * Server digest authentication + * SSL Support using NSS * Gconf configuration and proxy integration To subscribe to the Soup discussion list, send mail with the word diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index cca76441..dd759f21 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"SOUP\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DBINDIR=\"$(bindir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ -I$(top_srcdir) \ $(SOUP_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ @@ -79,5 +79,5 @@ libsoup_ssl_proxy_SOURCES = \ soup-ssl-proxy.c install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) libsoup-ssl-proxy $(DESTDIR)$(bindir)/$(SSL_PROXY_NAME) + $(mkinstalldirs) $(DESTDIR)$(libexecdir) + $(INSTALL_PROGRAM) libsoup-ssl-proxy $(DESTDIR)$(libexecdir)/$(SSL_PROXY_NAME) diff --git a/libsoup/soup-openssl.c b/libsoup/soup-openssl.c index 015cbf50..4bb57f94 100644 --- a/libsoup/soup-openssl.c +++ b/libsoup/soup-openssl.c @@ -136,6 +136,7 @@ soup_openssl_close (GIOChannel *channel, GError **err) { SoupOpenSSLChannel *chan = (SoupOpenSSLChannel *) channel; + SSL_shutdown (chan->ssl); g_io_channel_close (chan->real_sock); return G_IO_STATUS_NORMAL; diff --git a/libsoup/soup-ssl-proxy.c b/libsoup/soup-ssl-proxy.c index e161acce..b4ae9954 100644 --- a/libsoup/soup-ssl-proxy.c +++ b/libsoup/soup-ssl-proxy.c @@ -121,6 +121,8 @@ soup_ssl_proxy_readwrite (GIOChannel *iochannel, return TRUE; FINISH: + g_io_channel_close (iochannel); + g_io_channel_close (dest); g_main_quit (loop); return FALSE; } diff --git a/libsoup/soup-ssl.c b/libsoup/soup-ssl.c index 63adb338..d8aef717 100644 --- a/libsoup/soup-ssl.c +++ b/libsoup/soup-ssl.c @@ -109,8 +109,8 @@ soup_ssl_get_iochannel_real (GIOChannel *sock, SoupSSLType type) key_file)); } - execl (BINDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME, - BINDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME, + execl (LIBEXECDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME, + LIBEXECDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME, NULL); execlp (SSL_PROXY_NAME, SSL_PROXY_NAME, NULL); diff --git a/tests/Makefile.am b/tests/Makefile.am index 68898e5e..44482872 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,12 +2,13 @@ INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) -noinst_PROGRAMS = get timeserver +#noinst_PROGRAMS = get timeserver +noinst_PROGRAMS = get get_SOURCES = get.c get_LDADD = $(top_builddir)/libsoup/libsoup-2.0.la -timeserver_SOURCES = timeserver.c +#timeserver_SOURCES = timeserver.c -timeserver_LDADD = $(top_builddir)/libsoup/libsoup-2.0.la +#timeserver_LDADD = $(top_builddir)/libsoup/libsoup-2.0.la |