Index: xymonnet/contest.c
===================================================================
--- xymonnet/contest.c	(revision 6804)
+++ xymonnet/contest.c	(working copy)
@@ -478,8 +478,10 @@
 
 	if (item->sslctx == NULL) {
 		switch (item->ssloptions->sslversion) {
+#if 0
 		  case SSLVERSION_V2:
 			item->sslctx = SSL_CTX_new(SSLv2_client_method()); break;
+#endif
 		  case SSLVERSION_V3:
 			item->sslctx = SSL_CTX_new(SSLv3_client_method()); break;
 		  case SSLVERSION_TLS1:
Index: xymonnet/dns.c
===================================================================
--- xymonnet/dns.c	(revision 6804)
+++ xymonnet/dns.c	(working copy)
@@ -67,8 +67,14 @@
 	dnscache = xtreeNew(strcasecmp);
 
 	if (use_ares_lookup) {
-		int status = ares_init(&mychannel);
+		struct ares_options options;
+		int status;
 
+		/* ARES timeout backported from Xymon trunk 20120411 - this should give us a ~23 second timeout */
+		options.timeout = 2000;
+		options.tries = 4;
+
+		status = ares_init_options(&mychannel, &options, (ARES_OPT_TIMEOUTMS | ARES_OPT_TRIES));
 		if (status != ARES_SUCCESS) {
 			errprintf("Cannot initialize ARES resolver, using standard\n");
 			errprintf("ARES error was: '%s'\n", ares_strerror(status));
@@ -300,9 +306,11 @@
 	options.flags = ARES_FLAG_NOCHECKRESP;
 	options.servers = &serveraddr;
 	options.nservers = 1;
-	options.timeout = dnstimeout;
+	/* ARES timeout backported from Xymon trunk 20120411 - this should give us a ~23 second timeout */
+	options.timeout = 2000;
+	options.tries = 4;
 
-	status = ares_init_options(&channel, &options, (ARES_OPT_FLAGS | ARES_OPT_SERVERS | ARES_OPT_TIMEOUT));
+	status = ares_init_options(&channel, &options, (ARES_OPT_FLAGS | ARES_OPT_SERVERS | ARES_OPT_TIMEOUTMS | ARES_OPT_TRIES));
 	if (status != ARES_SUCCESS) {
 		errprintf("Could not initialize ares channel: %s\n", ares_strerror(status));
 		return 1;