changeset 1908:b37cea7ef4a9

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Thu, 27 Sep 2007 13:06:17 -0500
parents bc245b3ad09c (diff) 353787f211ec (current diff)
children 7f9d2bb96441 31e9908cf91e
files src/neon/neon.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/neon/neon.c	Thu Sep 27 15:36:15 2007 +0200
+++ b/src/neon/neon.c	Thu Sep 27 13:06:17 2007 -0500
@@ -53,6 +53,11 @@
     neon_vfs_metadata_impl
 };
 
+/* bring ne_set_connect_timeout in as a weak reference, not using it
+ * unless we have it available (neon 0.27) --nenolod
+ */
+extern void ne_set_connect_timeout(ne_session *sess, int timeout) __attribute__ ((weak));
+
 /*
  * ========
  */
@@ -565,7 +570,10 @@
         ne_add_server_auth(handle->session, NE_AUTH_BASIC, server_auth_callback, (void *)handle);
         ne_set_session_flag(handle->session, NE_SESSFLAG_ICYPROTO, 1);
         ne_set_session_flag(handle->session, NE_SESSFLAG_PERSIST, 0);
-        /* ne_set_connect_timeout(handle->session, 10); */
+
+        if (ne_set_connect_timeout != NULL)
+            ne_set_connect_timeout(handle->session, 10);
+
         ne_set_read_timeout(handle->session, 10);
         ne_set_useragent(handle->session, "Audacious/1.4.0");
         ne_redirect_register(handle->session);