# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254049836 -3600
# Node ID d5a1fd78a06aa493d33490a7896417f09f823965
# Parent  48cb27e2716e54c4927085d6793db4217c86602e# Parent  dc4d47d91d66aafc078f88f8c50e48318b90998e
Merge with waqas

diff -r 48cb27e2716e -r d5a1fd78a06a util-src/Makefile.win
--- a/util-src/Makefile.win	Sun Sep 27 11:59:11 2009 +0100
+++ b/util-src/Makefile.win	Sun Sep 27 12:10:36 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 48cb27e2716e -r d5a1fd78a06a util-src/encodings.c
--- a/util-src/encodings.c	Sun Sep 27 11:59:11 2009 +0100
+++ b/util-src/encodings.c	Sun Sep 27 12:10:36 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
 	}
 }