Software / code / prosody
Changeset
1834:d5a1fd78a06a
Merge with waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 27 Sep 2009 12:10:36 +0100 |
| parents | 1828:48cb27e2716e (current diff) 1830:dc4d47d91d66 (diff) |
| children | 1835:5ae3209fefa2 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 } }
