Martin Vierula
29dbf829cd
Add CHANGES entry for previous merge
2023-10-12 07:55:56 -07:00
martinhsv
68683c328c
Merge pull request #2975 from martinhsv/v2/master
...
Configure: do not check for pcre1 if pcre2 requested
2023-10-12 10:47:08 -04:00
Marc Stern
d644ebee0a
Implemented msre_action_phase_validate()
2023-10-05 14:48:24 +02:00
Marc Stern
40c6f80ccf
Avoid some useless code and memory allocation in case no macro is present
2023-10-03 16:50:12 +02:00
Marc Stern
1d9ad64a56
if WITH_PCRE2 id defined, jit was not initialized
2023-09-25 16:15:19 +02:00
Marc Stern
077d1bd0b7
if WITH_PCRE2 id defined, jit was not initialized
2023-09-25 16:00:17 +02:00
Marc Stern
e9bf697c00
Merge branch 'SpiderLabs:v2/master' into v2/master
2023-09-18 15:27:46 +02:00
Martin Vierula
0dbdc2b3d0
Check return code of apr_procattr_io_set()
2023-09-11 08:07:49 -07:00
martinhsv
a8b7b26983
Merge pull request #2958 from marcstern/v2/mst/rc_check
...
Check return code of apr_procattr_io_set()
2023-09-11 11:01:10 -04:00
Martin Vierula
d4310f54cc
Configure: do not check for pcre1 if pcre2 requested
2023-08-24 15:01:14 -07:00
Marc Stern
1cdc554d87
Merge pull request #57 from SpiderLabs/v2/master
...
Merge pull request #2912 from martinhsv/v2/master
2023-08-24 11:27:00 +02:00
Marc Stern
18efc80bdd
Double memory allocation:
...
'current_targets' is allocated in ruleset->mp.
'rule->p1' is a copy of current_targets, but we strdup it in the same memory pool as 'current_targets'.
So, simply assign 'current_targets' to 'rule->p1'.
2023-08-21 10:30:36 +02:00
Marc Stern
eab780e992
typo
2023-08-21 10:01:46 +02:00
Marc Stern
931f8b6ed4
Update re_operators.c
2023-08-21 09:39:42 +02:00
Marc Stern
9c0d05f734
Update re_operators.c
2023-08-21 09:33:27 +02:00
Marc Stern
afe4e12828
Update persist_dbm.c
2023-08-18 17:16:18 +02:00
Marc Stern
063fc9f5c8
Update msc_logging.c
2023-08-18 16:54:19 +02:00
Marc Stern
ea1d78c80e
Update msc_json.c
2023-08-18 16:48:25 +02:00
Marc Stern
1a552bcc5d
Update msc_json.c
2023-08-18 16:47:00 +02:00
Marc Stern
ba227fa731
Fix for https://github.com/SpiderLabs/ModSecurity/issues/610
2023-08-16 16:54:55 +02:00
Marc Stern
82c69ccf49
Fix for DEBUG_CONF compile flag
2023-08-16 08:50:09 +02:00
Marc Stern
541707c0aa
removed useless code
2023-08-16 08:28:12 +02:00
Marc Stern
25a60e259a
Fixed 2 memory leaks
2023-08-16 08:25:50 +02:00
Marc Stern
7575eae3f5
Check return code of apr_procattr_io_set()
2023-08-14 16:57:21 +02:00
Marc Stern
0d5a8dec2a
Compatibility with libyajl decoding the buffer inline
2023-08-11 17:41:04 +02:00
Marc Stern
0708339359
Centralized function to get user name, compatible with Linux & Windows (also with mpm-itk & mod_ruid2)
2023-08-11 17:22:24 +02:00
Marc Stern
b3b33c9ff1
Revert "Centralized function compatible with Linux & Windows (also with mpm-itk & mod_ruid2) to get username"
...
This reverts commit c7b28f0e13fa18d8503877e026744f76607cfbae.
2023-08-11 17:19:08 +02:00
Marc Stern
c7b28f0e13
Centralized function compatible with Linux & Windows (also with mpm-itk & mod_ruid2) to get username
2023-08-11 17:17:59 +02:00
Marc Stern
3dc5ff5f65
remove useless memset
2023-08-11 16:44:18 +02:00
Marc Stern
eb532bd791
remove useless apr_pstrdup()
2023-08-11 16:34:04 +02:00
martinhsv
11f85b82e1
Merge pull request #2912 from martinhsv/v2/master
...
Do not escape special chars in regex pattern with macro
2023-07-27 09:37:35 -04:00
Martin Vierula
2105ed0639
Do not escape special chars in regex pattern with macro
2023-07-27 06:21:45 -07:00
Paolino
5bb58b8e60
Adding PCRE2 support for windows build in Makefile.win
...
Including new parameter PCRE2, which if set will enable PCRE2 in the build.
2023-07-17 17:32:10 +02:00
Martin Vierula
fb1abae980
Add CHANGES entry for previous merger
2023-03-20 10:49:44 -07:00
martinhsv
0e1df01b21
Merge pull request #2883 from Polynomial-C/v2_avoid_bashisms
...
build: Avoid bashisms
2023-03-20 08:26:29 -07:00
Lars Wendler
4b9edaddfc
build: Avoid bashisms
...
otherwise configure fails to find pcre2 when /bin/sh does not point to bash:
configure: using pcre v8.45
./configure: 16601: test: xno: unexpected operator
./configure: 16601: test: xno: unexpected operator
checking for libpcre2 config script... no
configure: *** pcre2 library not found.
configure: error: pcre2 library is required
Signed-off-by: Lars Wendler <polynomial-c@gmx.de>
2023-03-14 11:36:22 +01:00
Martin Vierula
916bded590
CHANGES: Preparing for next version
2023-01-19 12:20:13 -08:00
Martin Vierula
053965529c
Version 2.9.7
2023-01-04 13:15:13 -08:00
martinhsv
9640b5408a
Merge pull request #2857 from martinhsv/v2/master
...
Fix: FILES_TMP_CONTENT may sometimes lack complete content
2023-01-04 11:37:17 -08:00
Martin Vierula
4324f0ac59
Fix: FILES_TMP_CONTENT may sometimes lack complete content
2023-01-04 11:34:11 -08:00
Martin Vierula
afb48b2c97
Adjust one automated test
2023-01-04 08:00:49 -08:00
Martin Vierula
8b3b7a0e23
Add ostensibly unnecessary null check
2023-01-04 06:56:54 -08:00
Martin Vierula
8038a529c0
Copyright line updates
2022-12-21 07:07:14 -08:00
Martin Vierula
1cba2d4758
PCRE2 fix: correct length arg in calls to match functions
2022-12-16 08:37:56 -08:00
martinhsv
9d4b426b22
Merge pull request #2844 from martinhsv/v2/master
...
Support configurable limit on number of arguments processed
2022-12-14 11:12:57 -08:00
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
