# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254049850 -3600
# Node ID 5ae3209fefa2c8dc1c53d08c2c1caa340b8ec542
# Parent  d5a1fd78a06aa493d33490a7896417f09f823965# Parent  5408d5100bd0722982ba1e0736f2cc8bd763f1d7
Merge with waqas

diff -r 5408d5100bd0 -r 5ae3209fefa2 core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Sep 27 15:50:41 2009 +0500
+++ b/core/s2smanager.lua	Sun Sep 27 12:10:50 2009 +0100
@@ -254,20 +254,20 @@
 		host_session.connecting = nil;
 		
 		-- COMPAT: This is a compromise for all you CNAME-(ab)users :)
-		if not (reply and reply[1] and reply[1].a) then
+		if not (reply and reply[#reply] and reply[#reply].a) then
 			local count = max_dns_depth;
 			reply = dns.peek(connect_host, "CNAME", "IN");
-			while count > 0 and reply and reply[1] and not reply[1].a and reply[1].cname do
-				log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[1].cname), count);
-				reply = dns.peek(reply[1].cname, "A", "IN") or dns.peek(reply[1].cname, "CNAME", "IN");
+			while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
+				log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
+				reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
 				count = count - 1;
 			end
 		end
 		-- end of CNAME resolving
 		
-		if reply and reply[1] and reply[1].a then
-			log("debug", "DNS reply for %s gives us %s", connect_host, reply[1].a);
-			return make_connect(host_session, reply[1].a, connect_port);
+		if reply and reply[#reply] and reply[#reply].a then
+			log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a);
+			return make_connect(host_session, reply[#reply].a, connect_port);
 		else
 			log("debug", "DNS lookup failed to get a response for %s", connect_host);
 			if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
diff -r 5408d5100bd0 -r 5ae3209fefa2 util-src/Makefile.win
--- a/util-src/Makefile.win	Sun Sep 27 15:50:41 2009 +0500
+++ b/util-src/Makefile.win	Sun Sep 27 12:10:50 2009 +0100
@@ -1,7 +1,7 @@
 
 LUA_PATH=$(LUA_DEV)
-IDN_PATH=.\libidn-1.9
-OPENSSL_PATH=.\openssl-0.9.8i
+IDN_PATH=..\..\libidn-1.15
+OPENSSL_PATH=..\..\openssl-0.9.8k
 
 LUA_INCLUDE=$(LUA_PATH)\include
 LUA_LIB=$(LUA_PATH)\lib\lua5.1.lib
diff -r 5408d5100bd0 -r 5ae3209fefa2 util-src/encodings.c
--- a/util-src/encodings.c	Sun Sep 27 15:50:41 2009 +0500
+++ b/util-src/encodings.c	Sun Sep 27 12:10:50 2009 +0100
@@ -172,11 +172,11 @@
 	int ret = idna_to_ascii_8z(s, &output, 0);
 	if (ret == IDNA_SUCCESS) {
 		lua_pushstring(L, output);
-		if (output) free(output);
+		idn_free(output);
 		return 1;
 	} else {
 		lua_pushnil(L);
-		if (output) free(output);
+		idn_free(output);
 		return 1; // TODO return error message
 	}
 }
@@ -189,11 +189,11 @@
 	int ret = idna_to_unicode_8z8z(s, &output, 0);
 	if (ret == IDNA_SUCCESS) {
 		lua_pushstring(L, output);
-		if (output) free(output);
+		idn_free(output);
 		return 1;
 	} else {
 		lua_pushnil(L);
-		if (output) free(output);
+		idn_free(output);
 		return 1; // TODO return error message
 	}
 }