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

Silence compiler warning about discarded const

Browse Source
This commit is contained in:
Martin Vierula
2022-12-12 02:26:13 -08:00
parent 76ce55a675
commit 583b465fdb
2 changed files with 4 additions and 2 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)
------------------- -------------------
* Silence compiler warning about discarded const
[Issue #2843 - @Steve8291, @martinhsv]
* Support for JIT option for PCRE2 * Support for JIT option for PCRE2
[Issue #2840 - @martinhsv] [Issue #2840 - @martinhsv]
* Use uid for user if apr_uid_name_get() fails * Use uid for user if apr_uid_name_get() fails

4
apache2/mod_security2.c
View File

@@ -105,7 +105,7 @@ static int server_limit, thread_limit;
*/ */
static void version(apr_pool_t *mp) { static void version(apr_pool_t *mp) {
char *pcre_vrs = NULL; char *pcre_vrs = NULL;
char *pcre_loaded_vrs = NULL; const char *pcre_loaded_vrs = NULL;
char pcre2_loaded_vrs_buffer[80] ={0}; char pcre2_loaded_vrs_buffer[80] ={0};
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
@@ -119,7 +119,7 @@ static void version(apr_pool_t *mp) {
#ifdef WITH_PCRE2 #ifdef WITH_PCRE2
pcre_vrs = apr_psprintf(mp,"%d.%d ", PCRE2_MAJOR, PCRE2_MINOR); pcre_vrs = apr_psprintf(mp,"%d.%d ", PCRE2_MAJOR, PCRE2_MINOR);
pcre_loaded_vrs = pcre2_loaded_vrs_buffer; pcre_loaded_vrs = pcre2_loaded_vrs_buffer;
pcre2_config(PCRE2_CONFIG_VERSION, pcre_loaded_vrs); pcre2_config(PCRE2_CONFIG_VERSION, pcre2_loaded_vrs_buffer);
#else #else
pcre_vrs = apr_psprintf(mp,"%d.%d ", PCRE_MAJOR, PCRE_MINOR); pcre_vrs = apr_psprintf(mp,"%d.%d ", PCRE_MAJOR, PCRE_MINOR);
pcre_loaded_vrs = pcre_version(); pcre_loaded_vrs = pcre_version();