github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-15 07:57:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

MODSEC-293

Browse Source
This commit is contained in:
brenosilva
2012-03-14 11:04:53 +00:00
parent 6dea751d65
commit a07d545a43
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apache2/msc_release.h
View File

@@ -38,7 +38,7 @@
#define MODSEC_VERSION_MAJOR "2" #define MODSEC_VERSION_MAJOR "2"
#define MODSEC_VERSION_MINOR "6" #define MODSEC_VERSION_MINOR "6"
#define MODSEC_VERSION_MAINT "4" #define MODSEC_VERSION_MAINT "5"
#define MODSEC_VERSION_TYPE "" #define MODSEC_VERSION_TYPE ""
#define MODSEC_VERSION_RELEASE "" #define MODSEC_VERSION_RELEASE ""

22
apache2/persist_dbm.c
View File

@@ -110,8 +110,10 @@ static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec
dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL); dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL);
msr_log(msr, 1, "collection_retrieve_ex: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name), if (msr->txcfg->debuglog_level >= 9) {
log_escape(msr->mp, dbm_filename)); msr_log(msr, 9, "collection_retrieve_ex: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
log_escape(msr->mp, dbm_filename));
}
key.dptr = (char *)col_key; key.dptr = (char *)col_key;
key.dsize = col_key_len + 1; key.dsize = col_key_len + 1;
@@ -353,8 +355,10 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
// ENH: lowercase the var name in the filename // ENH: lowercase the var name in the filename
dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", var_name->value, NULL); dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", var_name->value, NULL);
msr_log(msr, 1, "collection_store: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, var_name->value), if (msr->txcfg->debuglog_level >= 9) {
log_escape(msr->mp, dbm_filename)); msr_log(msr, 9, "collection_store: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, var_name->value),
log_escape(msr->mp, dbm_filename));
}
/* Delete IS_NEW on store. */ /* Delete IS_NEW on store. */
apr_table_unset(col, "IS_NEW"); apr_table_unset(col, "IS_NEW");
@@ -587,14 +591,16 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
else else
dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL); dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL);
msr_log(msr, 1, "collections_remove_stale: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name), if (msr->txcfg->debuglog_level >= 9) {
log_escape(msr->mp, dbm_filename)); msr_log(msr, 1, "collections_remove_stale: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
log_escape(msr->mp, dbm_filename));
}
rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK, rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
CREATEMODE, msr->mp); CREATEMODE, msr->mp);
if (rc != APR_SUCCESS) { if (rc != APR_SUCCESS) {
msr_log(msr, 1, "Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename), msr_log(msr, 1, "Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
get_apr_error(msr->mp, rc)); get_apr_error(msr->mp, rc));
dbm = NULL; dbm = NULL;
goto error; goto error;
} }