diff options
| -rw-r--r-- | camel/ChangeLog | 4 | ||||
| -rw-r--r-- | camel/camel-tcp-stream-ssl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 2dcdb99614..d7f49a760b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,9 @@ 2002-06-19 Jeffrey Stedfast <fejj@ximian.com> + * camel-tcp-stream-ssl.c (stream_connect): Set the poll timeout to + be PR_INTERVAL_MIN, this one shouldn't need to be 2 minutes (plus + it blocks my connection at home for far too long). + * providers/imap/camel-imap-folder.c (imap_refresh_info): Make sure we hold the command_lock before accessing current_folder. (imap_append_online): Same. diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c index 6419cbf4e2..97901940e4 100644 --- a/camel/camel-tcp-stream-ssl.c +++ b/camel/camel-tcp-stream-ssl.c @@ -617,7 +617,7 @@ stream_connect (CamelTcpStream *stream, struct hostent *host, int port) poll.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; poll.out_flags = 0; - timeout = CONNECT_TIMEOUT; + timeout = PR_INTERVAL_MIN; if (PR_Poll (&poll, 1, timeout) == PR_FAILURE) { set_errno (PR_GetError ()); |