www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

mod_lua:

Browse Source 
Clean up style
use apr_pstrcat instead of apr_psprintf
fix a bug that was causing bad string interpolations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1367875 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2012-08-01 07:28:22 +00:00
parent 7f40cfd3ee
commit 238af542a3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/lua/mod_lua.c
View File

@@ -183,18 +183,23 @@ static const char* ap_lua_interpolate_string(apr_pool_t* pool, const char* strin
if (x-y > 0) {
stringBetween = apr_pstrndup(pool, string+y, x-y);
}
else stringBetween = "";
int v = atoi(apr_pstrndup(pool,string+x+1, 1));
ret = apr_psprintf(pool, "%s%s%s", ret, stringBetween, values[v]);
y = ++x;
else {
stringBetween = "";
}
int v = *(string+x+1) - '0';
ret = apr_pstrcat(pool, ret, stringBetween, values[v], NULL);
y = ++x+1;
}
}
if (x-y > 0 && y > 0) {
stringBetween = apr_pstrndup(pool, string+y+1, x-y);
ret = apr_psprintf(pool, "%s%s", ret, stringBetween);
stringBetween = apr_pstrndup(pool, string+y, x-y);
ret = apr_pstrcat(pool, ret, stringBetween, NULL);
}
/* If no replacement was made, just return the original string */
else if (y==0) {
return string;
}
else if (y==0) return string; /* If no replacement was made, just return the original str. */
return ret;
}
@@ -362,7 +367,6 @@ static int lua_map_handler(request_rec *r)
hook_spec->bytecode_len,
function_name,
"mapped handler");
L = ap_lua_get_lua_state(pool, spec, r);
if (!L) {