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

Move APLOG_USE_MODULE out of modsecurity.h

Author: martinhsv

apache2/apache2_config.c

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

apache2/apache2_io.c

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

apache2/apache2_util.c

@@ -17,6 +17,10 @@
 #include "http_core.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.
  */

apache2/mod_security2.c

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

apache2/modsecurity.c

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

apache2/modsecurity.h

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

apache2/msc_status_engine.c

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

apache2/re.c

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