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

Merge pull request #2832 from erkia/fix/add-aplog-use-module-2

Browse Source 
Move APLOG_USE_MODULE out of modsecurity.h
This commit is contained in:
martinhsv
2022-11-15 17:06:02 -05:00
committed by GitHub
parent 3bd5836fef b5130acb45
commit 012693d197
8 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apache2/apache2_config.c
View File

@@ -26,6 +26,9 @@
#include "msc_lua.h" #include "msc_lua.h"
#endif #endif
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
/* -- Directory context creation and initialisation -- */ /* -- Directory context creation and initialisation -- */

4
apache2/apache2_io.c
View File

@@ -18,6 +18,10 @@
#include "apache2.h" #include "apache2.h"
#include "msc_crypt.h" #include "msc_crypt.h"
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
/* -- Input filter -- */ /* -- Input filter -- */
#if 0 #if 0

4
apache2/apache2_util.c
View File

@@ -17,6 +17,10 @@
#include "http_core.h" #include "http_core.h"
#include "util_script.h" #include "util_script.h"
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
/** /**
* Sends a brigade with an error bucket down the filter chain. * Sends a brigade with an error bucket down the filter chain.
*/ */

4
apache2/mod_security2.c
View File

@@ -46,6 +46,10 @@
#include <yajl/yajl_version.h> #include <yajl/yajl_version.h>
#endif /* WITH_YAJL */ #endif /* WITH_YAJL */
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
/* ModSecurity structure */ /* ModSecurity structure */
msc_engine DSOLOCAL *modsecurity = NULL; msc_engine DSOLOCAL *modsecurity = NULL;

4
apache2/modsecurity.c
View File

@@ -27,6 +27,10 @@
#include <curl/curl.h> #include <curl/curl.h>
#endif #endif
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
unsigned long int DSOLOCAL unicode_codepage = 0; unsigned long int DSOLOCAL unicode_codepage = 0;
int DSOLOCAL *unicode_map_table = NULL; int DSOLOCAL *unicode_map_table = NULL;

3
apache2/modsecurity.h
View File

@@ -145,9 +145,6 @@ extern DSOLOCAL char *real_server_signature;
extern DSOLOCAL char *chroot_dir; extern DSOLOCAL char *chroot_dir;
extern module AP_MODULE_DECLARE_DATA security2_module; extern module AP_MODULE_DECLARE_DATA security2_module;
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
extern DSOLOCAL const command_rec module_directives[]; extern DSOLOCAL const command_rec module_directives[];

5
apache2/msc_status_engine.c
View File

@@ -45,6 +45,10 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
// Bese32 encode, based on: // Bese32 encode, based on:
// https://code.google.com/p/google-authenticator/source/browse/libpam/base32.c // https://code.google.com/p/google-authenticator/source/browse/libpam/base32.c
int DSOLOCAL msc_status_engine_base32_encode(char *encoded, int DSOLOCAL msc_status_engine_base32_encode(char *encoded,
@@ -504,4 +508,3 @@ failed_beacon_string_malloc:
return ret; return ret;
} }

4
apache2/re.c
View File

@@ -20,6 +20,10 @@
#include "msc_lua.h" #include "msc_lua.h"
#endif #endif
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
static const char *const severities[] = { static const char *const severities[] = {
"EMERGENCY", "EMERGENCY",
"ALERT", "ALERT",