github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert 'normalise' into 'normalize' throughout, but support the previous version for backward compatibility (MODSEC-103)

Browse Source
This commit is contained in:
ivanr
2009-12-04 23:15:44 +00:00
parent 1fb6f974db
commit 853b1f9fc8
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apache2/re_tfns.c
View File

@@ -451,27 +451,27 @@ static int msre_fn_escapeSeqDecode_execute(apr_pool_t *mptmp, unsigned char *inp
return (*rval_len == input_len ? 0 : 1);
}
/* normalisePath */
/* normalizePath */
static int msre_fn_normalisePath_execute(apr_pool_t *mptmp, unsigned char *input,
static int msre_fn_normalizePath_execute(apr_pool_t *mptmp, unsigned char *input,
long int input_len, char **rval, long int *rval_len)
{
int changed;
*rval_len = normalise_path_inplace(input, input_len, 0, &changed);
*rval_len = normalize_path_inplace(input, input_len, 0, &changed);
*rval = (char *)input;
return changed;
}
/* normalisePathWin */
/* normalizePathWin */
static int msre_fn_normalisePathWin_execute(apr_pool_t *mptmp, unsigned char *input,
static int msre_fn_normalizePathWin_execute(apr_pool_t *mptmp, unsigned char *input,
long int input_len, char **rval, long int *rval_len)
{
int changed;
*rval_len = normalise_path_inplace(input, input_len, 1, &changed);
*rval_len = normalize_path_inplace(input, input_len, 1, &changed);
*rval = (char *)input;
return changed;
@@ -683,13 +683,25 @@ void msre_engine_register_default_tfns(msre_engine *engine) {
/* normalisePath */
msre_engine_tfn_register(engine,
"normalisePath",
msre_fn_normalisePath_execute
msre_fn_normalizePath_execute
);
/* normalizePath */
msre_engine_tfn_register(engine,
"normalizePath",
msre_fn_normalizePath_execute
);
/* normalisePathWin */
msre_engine_tfn_register(engine,
"normalisePathWin",
msre_fn_normalisePathWin_execute
msre_fn_normalizePathWin_execute
);
/* normalizePathWin */
msre_engine_tfn_register(engine,
"normalizePathWin",
msre_fn_normalizePathWin_execute
);
/* parityEven7bit */