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

Merge branch 'SpiderLabs:v2/master' into v2/master

Browse Source
This commit is contained in:
Marc Stern
2023-09-18 15:27:46 +02:00
committed by GitHub
parent 1cdc554d87 0dbdc2b3d0
commit e9bf697c00
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,6 +1,8 @@
DD mmm YYYY - 2.9.x (to be released) DD mmm YYYY - 2.9.x (to be released)
------------------- -------------------
* Check return code of apr_procattr_io_set()
[Issue #2958 - @marcstern]
* Do not escape special chars in rx pattern with macro * Do not escape special chars in rx pattern with macro
[Issue #2357 - @marcstern, @martinhsv] [Issue #2357 - @marcstern, @martinhsv]
* Substitute two equals-equals operators in build * Substitute two equals-equals operators in build

7
apache2/apache2_util.c
View File

@@ -99,7 +99,12 @@ int apache2_exec(modsec_rec *msr, const char *command, const char **argv, char *
return -1; return -1;
} }
apr_procattr_io_set(procattr, APR_NO_PIPE, APR_FULL_BLOCK, APR_NO_PIPE); rc = apr_procattr_io_set(procattr, APR_NO_PIPE, APR_FULL_BLOCK, APR_NO_PIPE);
if (rc != APR_SUCCESS) {
msr_log(msr, 1, "Exec: apr_procattr_io_set failed: %d (%s)", rc, get_apr_error(r->pool, rc));
return -1;
}
apr_procattr_cmdtype_set(procattr, APR_SHELLCMD); apr_procattr_cmdtype_set(procattr, APR_SHELLCMD);
if (msr->txcfg->debuglog_level >= 9) { if (msr->txcfg->debuglog_level >= 9) {