diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
| commit | 8862e1b27eb767c99a068d13bd15c77c2c9e1471 (patch) | |
| tree | 067f338a5f8e31a6b1fb6ca706562a044af80024 /util-src | |
| parent | 87ff54c75266ffa37f716d1c7a542e956bbe54b3 (diff) | |
| parent | 5d9b9b6b30f06a3e3aa957279357dd42ae19ddf4 (diff) | |
| download | prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.tar.gz prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.zip | |
Merge 0.6.2/waqas with 0.6.2/MattJ
Diffstat (limited to 'util-src')
| -rw-r--r-- | util-src/encodings.c | 2 | ||||
| -rw-r--r-- | util-src/pposix.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c index 5147512f..c573a330 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -174,7 +174,7 @@ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */ size_t len; const char *s = luaL_checklstring(L, 1, &len); char* output = NULL; - int ret = idna_to_ascii_8z(s, &output, 0); + int ret = idna_to_ascii_8z(s, &output, IDNA_USE_STD3_ASCII_RULES); if (ret == IDNA_SUCCESS) { lua_pushstring(L, output); idn_free(output); diff --git a/util-src/pposix.c b/util-src/pposix.c index 94086ed6..cef75287 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -463,9 +463,10 @@ int lc_getrlimit(lua_State *L) { return 3; } -void lc_abort(lua_State* L) +int lc_abort(lua_State* L) { abort(); + return 0; } /* Register functions */ |