From cd2a27e637abb0db3ae8f357ffbea13f71209735 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 15 Nov 2004 20:01:00 +0000 Subject: Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream. 2004-11-15 Jeffrey Stedfast * providers/imap/camel-imap-store.c (connect_to_server): Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream. * providers/imap4/camel-imap4-store.c (connect_to_server): Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream. * providers/pop3/camel-pop3-store.c: Change default port numbers to be correct (they shouldn't all be the pop3s port). (connect_to_server): Moved the last tcp_stream unref to afetr the last fail-check so that we won't ever get a double-unref on something we only own one ref on. (connect_to_server): Unref the tcp_stream if we fail to create an engine object before returning fail. (connect_to_server): Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream. svn path=/trunk/; revision=27927 --- camel/providers/pop3/camel-pop3-store.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'camel/providers/pop3') diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index ea6d248231..d25a533704 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -157,7 +157,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam if (ssl_mode != MODE_CLEAR) { #ifdef HAVE_SSL if (ssl_mode == MODE_TLS) { - tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, STARTTLS_FLAGS); + tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS); } else { tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS); } @@ -275,9 +275,9 @@ static struct { } ssl_options[] = { { "", "pop3s", POP3S_PORT, MODE_SSL }, /* really old (1.x) */ { "always", "pop3s", POP3S_PORT, MODE_SSL }, - { "when-possible", "pop3", POP3S_PORT, MODE_TLS }, - { "never", "pop3", POP3S_PORT, MODE_CLEAR }, - { NULL, "pop3", POP3S_PORT, MODE_CLEAR }, + { "when-possible", "pop3", POP3_PORT, MODE_TLS }, + { "never", "pop3", POP3_PORT, MODE_CLEAR }, + { NULL, "pop3", POP3_PORT, MODE_CLEAR }, }; static gboolean -- cgit v1.2.3