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

Revert "Detailed error message when writing collections"

Browse Source
This commit is contained in:
Ervin Hegedus
2024-02-07 22:40:39 +01:00
committed by GitHub
parent bdae95a93e
commit 4b936128c3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apache2/apache2_config.c
View File

@@ -1749,9 +1749,6 @@ char *parser_conn_limits_operator(apr_pool_t *mp, const char *p2,
apr_filepath_merge(&file, config_orig_path, param, APR_FILEPATH_TRUENAME, apr_filepath_merge(&file, config_orig_path, param, APR_FILEPATH_TRUENAME,
mp); mp);
if (config_orig_path == NULL) {
return apr_psprintf(mp, "ModSecurity: failed to duplicate filename in parser_conn_limits_operator");
}
if ((strncasecmp(p2, "!@ipMatchFromFile", strlen("!@ipMatchFromFile")) == 0) || if ((strncasecmp(p2, "!@ipMatchFromFile", strlen("!@ipMatchFromFile")) == 0) ||
(strncasecmp(p2, "!@ipMatchF", strlen("!@ipMatchF")) == 0)) { (strncasecmp(p2, "!@ipMatchF", strlen("!@ipMatchF")) == 0)) {

4
apache2/persist_dbm.c
View File

@@ -608,8 +608,8 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
rc = apr_sdbm_store(dbm, key, value, APR_SDBM_REPLACE); rc = apr_sdbm_store(dbm, key, value, APR_SDBM_REPLACE);
if (rc != APR_SUCCESS) { if (rc != APR_SUCCESS) {
msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s (key=%s, length=%d)", dbm_filename, msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s", dbm_filename,
get_apr_error(msr->mp, rc), key.dptr, value.dsize); get_apr_error(msr->mp, rc));
if (dbm != NULL) { if (dbm != NULL) {
#ifdef GLOBAL_COLLECTION_LOCK #ifdef GLOBAL_COLLECTION_LOCK
apr_sdbm_close(dbm); apr_sdbm_close(dbm);