2096 Commits

Author SHA1 Message Date
Martin Vierula
0981b325a7
Support configurable limit on number of arguments processed 2022-12-14 07:01:23 -08:00
Martin Vierula
ac52086b44
Distinguish PCRE vs. PCRE2 in startup version message 2022-12-12 02:41:16 -08:00
Martin Vierula
583b465fdb
Silence compiler warning about discarded const 2022-12-12 02:26:13 -08:00
martinhsv
76ce55a675
Merge pull request #2840 from martinhsv/v2/master
Support for JIT option for PCRE2
2022-12-08 05:49:31 -08:00
Martin Vierula
a17cbc8f5e
Support for JIT option for PCRE2 2022-12-07 07:47:42 -08:00
Martin Vierula
bc8c37070a
Add CHANGES entry for previous PR 2022-11-23 14:28:00 -08:00
martinhsv
8f04f44b09
Merge pull request #2046 from arminabf/segfault-with-assigned-user
segfault with assigned user id on OpenShift
2022-11-23 14:20:25 -08:00
martinhsv
31c3b4e8fe
Merge pull request #2834 from martinhsv/v2/master
Fix: handle error with SecConnReadStateLimit configuration
2022-11-20 11:42:09 -08:00
Martin Vierula
f7fa00aadf
Fix: handle error with SecConnReadStateLimit configuration 2022-11-20 10:39:04 -08:00
martinhsv
2a42b08814
Merge pull request #2833 from martinhsv/v2/master
Only check for pcre2 install if required
2022-11-16 15:27:58 -05:00
Martin Vierula
f9bb518be5 Only check for pcre2 install if required 2022-11-16 11:35:10 -08:00
Martin Vierula
c291a8c9fb
Add CHANGES entry for last PR 2022-11-15 14:22:03 -08:00
martinhsv
012693d197
Merge pull request #2832 from erkia/fix/add-aplog-use-module-2
Move APLOG_USE_MODULE out of modsecurity.h
2022-11-15 17:06:02 -05:00
Erki Aring
b5130acb45 Move APLOG_USE_MODULE out of modsecurity.h 2022-11-15 17:31:18 +02:00
Martin Vierula
3bd5836fef
Add CHANGES entry for previous PR 2022-11-14 11:48:21 -08:00
martinhsv
c2b47ea1bb
Merge pull request #2781 from erkia/fix/add-aplog-use-module
Fix logging for Apache 2.4 (again)
2022-11-14 14:26:54 -05:00
Martin Vierula
e0ef146870
Add CHANGES entry for previous PR 2022-11-11 14:00:20 -08:00
martinhsv
701365f8f1
Merge pull request #2818 from hughmcmaster/libxml2-mods2
Use pkg-config to find libxml2, falling back to xml2-config if necessary
2022-11-11 16:52:01 -05:00
martinhsv
73f3921230
Merge pull request #2827 from martinhsv/v2/master
Support for PCRE2 in mlogc
2022-11-08 16:27:59 -05:00
Martin Vierula
9c8f8f03d7
Support for PCRE2 in mlogc 2022-11-08 13:04:27 -08:00
Martin Vierula
8fc0b519b7
Support for PCRE2 2022-11-08 08:06:39 -08:00
Hugh McMaster
baa38ddbaf build/find_xml.m4: Check for libxml2 via pkg-config then xml2-config
Debian is taking steps to remove xml2-config in favour of pkg-config.
This means ModSecurity will build without libxml2 support by default
on Debian, Ubuntu and other distributions tracking Debian packages.

This patch modifies build/find_xml.m4 to check for libxml2 via
pkg-config, falling back to xml2-config if necessary.
2022-10-16 18:46:26 +11:00
Martin Vierula
849cd7e848
CHANGES: Preparing for next version 2022-10-14 08:56:01 -07:00
Martin Vierula
dfba4fd24a
Version 2.9.6 v2.9.6 2022-09-07 13:36:13 -07:00
martinhsv
f034a34164
Merge pull request #2799 from martinhsv/v2/master
Adjust parser activation rules in modsecurity.conf-recommended
2022-09-07 15:01:53 -04:00
Martin Vierula
bb372850ac
Adjust parser activation rules in modsecurity.conf-recommended 2022-09-07 11:43:54 -07:00
martinhsv
51a30d7b40
Merge pull request #2797 from martinhsv/v2/master
Multipart parsing fixes and new MULTIPART_PART_HEADERS collection
2022-09-07 14:22:54 -04:00
Martin Vierula
7a489bd07c
Multipart parsing fixes and new MULTIPART_PART_HEADERS collection 2022-09-07 11:09:47 -07:00
martinhsv
e0ff7ed945
Merge pull request #2794 from martinhsv/v2/master
Limit rsub null termination to where necessary
2022-09-06 08:32:00 -04:00
Martin Vierula
d9df7f529e
Limit rsub null termination to where necessary 2022-09-06 05:29:38 -07:00
Martin Vierula
592519f45d
Correct previous CHANGES entry 2022-08-26 11:52:13 -07:00
Martin Vierula
46c1a0d62f
IIS: Update dependencies for next planned release 2022-08-26 11:35:43 -07:00
martinhsv
ed60de97e6
Merge pull request #2789 from martinhsv/v2/master
Fix a failing test.
2022-08-20 18:34:22 -04:00
Martin Vierula
159cb4e93c
Fix a failing test. 2022-08-20 15:24:37 -07:00
Erki Aring
45acae4330 Add APLOG_USE_MODULE to correctly mark log messages 2022-08-04 12:44:29 +03:00
Martin Vierula
9cb9309fdd
Add CHANGES entries for recent merges 2022-06-08 15:55:25 -07:00
martinhsv
4136c4c46b
Merge pull request #2760 from martinhsv/v2/master
XML parser cleanup: NULL duplicate pointer
2022-06-08 18:41:21 -04:00
Martin Vierula
dfbdaf8f31
XML parser cleanup: NULL duplicate pointer 2022-06-08 15:36:36 -07:00
martinhsv
fc8e5586e7
Merge pull request #2239 from microsoft/fix_malformed_xml_memory_leak
Properly cleanup XML parser contexts upon completion
2022-06-08 17:45:53 -04:00
martinhsv
dd2d3f74b6
Merge pull request #2715 from vloup/memory-leak-fix-2208
Fix memory leak in streams
2022-06-07 17:10:22 -04:00
martinhsv
08c051987c
Merge branch 'v2/master' into memory-leak-fix-2208 2022-06-07 17:09:40 -04:00
martinhsv
5e1c1312a6
Merge pull request #2753 from martinhsv/v2/master
Fix: negative usec on log line when data type long is 32b
2022-06-07 13:41:40 -04:00
Martin Vierula
b5b4e2fdd1
Fix: negative usec on log line when data type long is 32b 2022-06-01 07:19:10 -07:00
Vincent Loup
bc8662b0d5 Fix memory leak in streams 2022-05-30 16:16:39 +02:00
martinhsv
03ec81d86f
Merge pull request #2749 from martinhsv/v2/master
mlogc log-line parsing fails due to enhanced timestamp
2022-05-27 14:09:41 -04:00
Martin Vierula
f71498ceff
mlogc log-line parsing fails due to enhanced timestamp 2022-05-27 11:05:37 -07:00
martinhsv
784693b61c
Merge pull request #2735 from martinhsv/v2/master
Allow no-key, single-value JSON body
2022-05-03 15:58:43 -04:00
Martin Vierula
4a98032b7f
Allow no-key, single-value JSON body 2022-05-03 12:34:03 -07:00
Martin Vierula
733427197e
Set SecStatusEngine Off in modsecurity.conf-recommended 2022-04-19 10:07:36 -07:00
martinhsv
1dd1c6defd
Merge pull request #2663 from martinhsv/v2/master
Fix memory leak that occurs on JSON parsing error
2021-12-29 10:03:45 -05:00