github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-09 15:52:53 +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

2
apache2/msc_util.c
View File

@@ -1148,7 +1148,7 @@ int ansi_c_sequences_decode_inplace(unsigned char *input, int input_len) {
* *
* IMP1 Assumes NUL-terminated * IMP1 Assumes NUL-terminated
*/ */
int normalise_path_inplace(unsigned char *input, int input_len, int win, int *changed) { int normalize_path_inplace(unsigned char *input, int input_len, int win, int *changed) {
unsigned char *d = input; unsigned char *d = input;
int i, count; int i, count;

2
apache2/msc_util.h
View File

@@ -24,7 +24,7 @@
#include "modsecurity.h" #include "modsecurity.h"
int DSOLOCAL normalise_path_inplace(unsigned char *input, int len, int win, int *changed); int DSOLOCAL normalize_path_inplace(unsigned char *input, int len, int win, int *changed);
int DSOLOCAL parse_boolean(const char *input); int DSOLOCAL parse_boolean(const char *input);

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); 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) long int input_len, char **rval, long int *rval_len)
{ {
int changed; 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; *rval = (char *)input;
return changed; 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) long int input_len, char **rval, long int *rval_len)
{ {
int changed; 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; *rval = (char *)input;
return changed; return changed;
@@ -683,13 +683,25 @@ void msre_engine_register_default_tfns(msre_engine *engine) {
/* normalisePath */ /* normalisePath */
msre_engine_tfn_register(engine, msre_engine_tfn_register(engine,
"normalisePath", "normalisePath",
msre_fn_normalisePath_execute msre_fn_normalizePath_execute
);
/* normalizePath */
msre_engine_tfn_register(engine,
"normalizePath",
msre_fn_normalizePath_execute
); );
/* normalisePathWin */ /* normalisePathWin */
msre_engine_tfn_register(engine, msre_engine_tfn_register(engine,
"normalisePathWin", "normalisePathWin",
msre_fn_normalisePathWin_execute msre_fn_normalizePathWin_execute
);
/* normalizePathWin */
msre_engine_tfn_register(engine,
"normalizePathWin",
msre_fn_normalizePathWin_execute
); );
/* parityEven7bit */ /* parityEven7bit */