chore: remove NGINX refs in docs/tests and simplify apache2/msc_release.h (macros)

sanjib2006 · sanjib2006 · commit 05dce476b784 · 2026-02-22T15:29:21.000+05:30
diff --git a/apache2/msc_release.h b/apache2/msc_release.h
@@ -49,15 +49,14 @@
   MODSEC_VERSION_SUFFIX
 
 /* Apache Module Defines */
-#ifdef	VERSION_IIS
-#define MODSEC_MODULE_NAME "ModSecurity for IIS (STABLE)"
+#if defined(VERSION_IIS)
+  #define MODSEC_MODULE_NAME "ModSecurity for IIS (STABLE)"
+#elif defined(VERSION_STANDALONE)
+  #define MODSEC_MODULE_NAME "ModSecurity Standalone (STABLE)"
 #else
-#ifdef	VERSION_STANDALONE
-#define MODSEC_MODULE_NAME "ModSecurity Standalone (STABLE)"
-#else
-#define MODSEC_MODULE_NAME "ModSecurity for Apache"
-#endif
+  #define MODSEC_MODULE_NAME "ModSecurity for Apache"
 #endif
+
 #define MODSEC_MODULE_VERSION MODSEC_VERSION
 #define MODSEC_MODULE_NAME_FULL MODSEC_MODULE_NAME "/" MODSEC_MODULE_VERSION " (http://www.modsecurity.org/)"
 
diff --git a/doc/doxygen-apache.in b/doc/doxygen-apache.in
@@ -44,7 +44,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache, IIS and Nginx that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
+PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache and IIS that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
diff --git a/doc/doxygen-iis.in b/doc/doxygen-iis.in
@@ -44,7 +44,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache, IIS and Nginx that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
+PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache and IIS that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
diff --git a/doc/doxygen-standalone.in b/doc/doxygen-standalone.in
@@ -44,7 +44,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache, IIS and Nginx that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
+PROJECT_BRIEF          = "ModSecurity is an open source, cross platform web application firewall (WAF) engine for Apache and IIS that is developed by Trustwave's SpiderLabs. It has a robust event-based programming language which provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. With over 10,000 deployments world-wide, ModSecurity is the most widely deployed WAF in existence."
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
diff --git a/tests/regression/config/10-audit-directives.t b/tests/regression/config/10-audit-directives.t
@@ -97,61 +97,6 @@
 		GET => "http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/bogus",
 	),
 },
-{
-	type => "config",
-	comment => "SecAuditLogType Concurrent",
-	conf => qq(
-		SecAuditEngine On
-		SecAuditLog $ENV{AUDIT_LOG}
-		SecAuditLogType Concurrent
-		SecAuditLogStorageDir "$ENV{LOGS_DIR}/audit"
-	),
-	test => sub {
-		### Perl code to parse the audit log entry and verify
-		### that the concurrent audit log exists and contains
-		### the correct data.
-		###
-		### TODO: Need some API for this :)
-		###
-		### FIXME: Just workable with apache, the timing to load auditlog from nginx
-		###        is not correct, so the test is failing even when it should pass.
-		###        Disabling it for now until we figure out a way to handle that.
-
-		# Parse log
-		#my $alogre = qr/^(?:\S+)\ (?:\S+)\ (?:\S+)\ (?:\S+)\ \[(?:[^:]+):(?:\d+:\d+:\d+)\ (?:[^\]]+)\]\ \"(?:.*)\"\ (?:\d+)\ (?:\S+)\ \"(?:.*)\"\ \"(?:.*)\"\ (\S+)\ \"(?:.*)\"\ (\S+)\ (?:\d+)\ (?:\d+)\ (?:\S+)(?:.*)$/m;
-		#my $alog = match_log("audit", $alogre, 1);
-		#chomp $alog;
-		#dbg("Alog: $alog\n");
-		#my @log = ($alog =~ m/$alogre/);
-		#my($id, $fn) = ($log[0], $log[1]);
-		#if (!$id or !$fn) {
-		#dbg("LOG ENTRY: $alog");
-		#die "Failed to parse audit log: $ENV{AUDIT_LOG}\n";
-		#}
-
-		# Verify concurrent log exists
-		#my $alogdatafn = "$ENV{LOGS_DIR}/audit$fn";
-		#if (! -e "$alogdatafn") {
-		#die "Audit log does not exist: $alogdatafn\n";
-		#}
-
-		# Verify concurrent log contents
-		#if (defined match_file($alogdatafn, qr/^--[^-]+-A--.*$id.*-Z--$/s)) {
-		#return 0;
-		#}
-
-		# Error
-		#dbg("LOGDATA: \"$FILE{$alogdatafn}{buf}\"");
-		#die "Audit log data did not match.\n";
-		return 0;
-	},
-	match_response => {
-		status => qr/^200$/,
-	},
-	request => new HTTP::Request(
-		GET => "http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt",
-	),
-},
 
 # SecAuditLogRelevantStatus
 {
diff --git a/tests/regression/config/10-request-directives.t b/tests/regression/config/10-request-directives.t
@@ -610,42 +610,6 @@
 		131072*3
 	),
 },
-# Known issue on nginx, disable it for now.
-#{
-#	type => "config",
-#	comment => "SecRequestBodyLimitAction ProcessPartial (plain/greater)",
-#	conf => qq(
-#		SecRuleEngine On
-#		SecDebugLog $ENV{DEBUG_LOG}
-#		SecDebugLogLevel 9
-#		SecRequestBodyAccess On
-#		SecRequestBodyLimitAction ProcessPartial
-#		SecRequestBodyLimit 131072
-#	),
-#	match_log => {
-#		-debug => [ qr/Request body is larger than the configured limit/, 1],
-#	},
-#	match_response => {
-#		status => qr/^200$/,
-#	},
-#	request => new HTTP::Request(
-#		POST => "http://$ENV{SERVER_NAME}:$ENV{SERVER_PORT}/test.txt",
-#		[
-#			"Content-Type" => "application/json",
-#		],
-#		normalize_raw_request_data(
-#			q(
-#				{
-#					) . "'abcdefghijlmnopq'='abcdefghijlmnopqrstuvxz',\\n" x 99000 . q(
-#				},
-#			),
-#		),
-#	),
-#},
-
-
-
-
 
 # SecCookieFormat
 {
