diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2004-11-16 04:01:00 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-11-16 04:01:00 +0800 |
| commit | cd2a27e637abb0db3ae8f357ffbea13f71209735 (patch) | |
| tree | 778a952f444b7cea286a346a0ba11fc4dadb6b55 /camel/providers | |
| parent | 4f7f3b910d5dfabd621e70af29eb59a99bb24d8c (diff) | |
| download | gsoc2013-evolution-cd2a27e637abb0db3ae8f357ffbea13f71209735.tar.gz gsoc2013-evolution-cd2a27e637abb0db3ae8f357ffbea13f71209735.tar.zst gsoc2013-evolution-cd2a27e637abb0db3ae8f357ffbea13f71209735.zip | |
Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream.
2004-11-15 Jeffrey Stedfast <fejj@novell.com>
* 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
Diffstat (limited to 'camel/providers')
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 2 | ||||
| -rw-r--r-- | camel/providers/imap4/camel-imap4-store.c | 2 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index a2ecb71b91..067221571a 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -525,7 +525,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); } diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c index c8832b54a6..809be506a9 100644 --- a/camel/providers/imap4/camel-imap4-store.c +++ b/camel/providers/imap4/camel-imap4-store.c @@ -225,7 +225,7 @@ connect_to_server (CamelIMAP4Engine *engine, struct addrinfo *ai, int ssl_mode, 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); } 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 |