Nikita Popov
b8b00263c5
Merge branch 'PHP-7.4'
2019-04-12 10:37:27 +02:00
Nikita Popov
1ef5b79b6b
Merge branch 'PHP-7.3' into PHP-7.4
2019-04-12 10:37:17 +02:00
Nikita Popov
354a1c27aa
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-12 10:37:08 +02:00
Nikita Popov
3b53d28e60
Fix key leaks in mb_convert_encoding()
2019-04-12 10:36:58 +02:00
Nikita Popov
8e8d129d7f
Use EMPTY_SWITCH_DEFAULT_CASE in php_unicode.c
...
Avoids a potentially uninitialized variable warning.
2019-04-12 10:26:11 +02:00
Nikita Popov
e91de955be
Merge branch 'PHP-7.4'
2019-04-11 16:02:20 +02:00
Nikita Popov
ca47732eee
Remove incorrect mbstring includes
...
And thus fix unused variable warnings.
2019-04-11 15:47:41 +02:00
Nikita Popov
44a1cd4fcd
Remove unused function prototype
2019-04-11 15:39:24 +02:00
Nikita Popov
47c74e780d
Merge branch 'PHP-7.4'
2019-04-11 12:36:10 +02:00
Nikita Popov
cd8312a77e
Merge branch 'PHP-7.3' into PHP-7.4
2019-04-11 12:36:01 +02:00
Nikita Popov
a61d24e4d8
Avoid onig match param unused variable warning
2019-04-11 12:35:24 +02:00
Stanislav Malyshev
63e0c22037
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Unfortunately, travis CI has old oniguruma library
Update NEWS & UPGRADING
Add fallbacks for older oniguruma versions
Add mbstring.regex_stack_limit to php.ini-*
Implement RF bug #72777 - ensure stack limits on mbstring functions.
2019-04-01 00:32:49 -07:00
Stanislav Malyshev
0eea9a6429
Unfortunately, travis CI has old oniguruma library
...
So we can't test it there.
2019-04-01 00:30:56 -07:00
Stanislav Malyshev
077ce33aa9
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Update NEWS & UPGRADING
Add fallbacks for older oniguruma versions
Add mbstring.regex_stack_limit to php.ini-*
Implement RF bug #72777 - ensure stack limits on mbstring functions.
2019-04-01 00:05:36 -07:00
Stanislav Malyshev
bc8f292c05
Merge branch 'mb-limit-73' into PHP-7.3
...
* mb-limit-73:
Add fallbacks for older oniguruma versions
Add mbstring.regex_stack_limit to php.ini-*
Implement RF bug #72777 - ensure stack limits on mbstring functions.
2019-04-01 00:00:14 -07:00
Stanislav Malyshev
e12c069d33
Add fallbacks for older oniguruma versions
2019-03-30 23:18:33 -07:00
Matteo Beccati
263c587854
Fixed SKIPIF when --disable-mbregex is used
2019-03-30 18:29:49 +01:00
Matteo Beccati
f030f34622
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed SKIPIF when --disable-mbregex is used
2019-03-30 18:29:44 +01:00
Matteo Beccati
0dbb581cf4
Fixed SKIPIF when --disable-mbregex is used
2019-03-30 18:28:33 +01:00
Matteo Beccati
d02c8ede15
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Removed declaration inside for loops
2019-03-29 14:24:40 +01:00
Matteo Beccati
4726c35ca3
Removed declaration inside for loops
2019-03-29 14:24:09 +01:00
Matteo Beccati
db1647ae1f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed SKIPIF when --disable-mbregex is used
2019-03-29 14:11:46 +01:00
Matteo Beccati
16b40a1806
Fixed SKIPIF when --disable-mbregex is used
2019-03-29 14:09:39 +01:00
Stanislav Malyshev
66c35b083b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Validate subject encoding in mb_split and mb_ereg_match
Validate pattern against mbregex encoding
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-28 00:42:56 -07:00
Stanislav Malyshev
402adc1df1
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Validate subject encoding in mb_split and mb_ereg_match
Validate pattern against mbregex encoding
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
2019-03-28 00:35:22 -07:00
Yasuo Ohgaki
738016bd88
Implement RF bug #72777 - ensure stack limits on mbstring functions.
...
The patch creates new config: mbstring.regex_stack_limit, which
defaults to 100000.
2019-03-28 00:31:57 -07:00
Nikita Popov
0ecac37c40
Validate subject encoding in mb_split and mb_ereg_match
...
We were already validating the subject encoding in most functions,
but not these two.
2019-03-27 23:20:27 -07:00
Nikita Popov
40fe50daf6
Validate pattern against mbregex encoding
...
Oniguruma does not consistently perform this validation itself (at least
on older versions), so make sure we check pattern encoding validity on the
PHP side.
2019-03-27 23:19:46 -07:00
Nikita Popov
d7348cd2b4
Merge branch 'PHP-7.4'
2019-03-22 10:30:15 +01:00
Nikita Popov
e7e2056d1a
Remove HAVE_PCRE/HAVE_BUNDLED_PCRE checks
...
PCRE is always available.
2019-03-22 10:29:18 +01:00
Peter Kokot
6426420f61
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Replace dirname(__FILE__) by __DIR__ in tests
2019-03-15 23:36:47 +01:00
Fabien Villepinte
26dfce7f36
Replace dirname(__FILE__) by __DIR__ in tests
2019-03-15 22:55:30 +01:00
Anatol Belski
81ec402a08
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Sync with ZEND_ENABLE_STATIC_TSRMLS_CACHE enablement in ext/mbstring
2019-03-12 21:35:34 +01:00
Anatol Belski
e10349152b
Sync with ZEND_ENABLE_STATIC_TSRMLS_CACHE enablement in ext/mbstring
2019-03-12 21:33:43 +01:00
Dmitry Stogov
59e954524e
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed ZTS cache usage
2019-03-12 16:58:16 +03:00
Dmitry Stogov
7139c381f1
Fixed ZTS cache usage
2019-03-12 16:58:02 +03:00
Nikita Popov
852485d8ec
Adjust tests for zpp TypeError change
2019-03-11 11:32:20 +01:00
Gabriel Caruso
726919e4b5
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Use EXPECT when possible
Fix tests filenames
2019-03-11 00:07:32 -03:00
Gabriel Caruso
c67c2c4d8f
Fix tests filenames
2019-03-10 23:57:32 -03:00
Peter Kokot
d0fd9fe977
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add AS_HELP_STRING to *nix build configure options
2019-03-07 20:38:04 +01:00
Peter Kokot
9df6a1e4dd
Add AS_HELP_STRING to *nix build configure options
...
The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.
[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
2019-03-07 20:36:59 +01:00
Gabriel Caruso
a54fb4bc7a
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove unnecessary check for always available extension
2019-03-05 12:55:07 -03:00
Gabriel Caruso
e907fbaf7c
Remove unnecessary check for always available extension
2019-03-05 12:54:24 -03:00
Nikita Popov
6395e7e37c
Merge branch 'PHP-7.4'
2019-03-05 14:10:05 +01:00
Nikita Popov
7e3f4a2390
Remove more zpp error/variation tests
2019-03-05 14:09:33 +01:00
Nikita Popov
80324281c9
Merge branch 'PHP-7.4'
2019-03-05 11:43:23 +01:00
Nikita Popov
4bd18db8cc
Remove custom error handler in mbstring tests
...
To make it more obvious what is tested and what the error messages
are.
2019-03-05 11:41:53 +01:00
Nikita Popov
ae59537d84
Merge branch 'PHP-7.4'
2019-03-05 10:24:38 +01:00
Nikita Popov
b26df0e395
Remove tests for zpp failure conditions
...
These tests only check zpp error conditions, so drop them per
zpp testing policy.
2019-03-05 10:22:23 +01:00
Peter Kokot
ac6b9b0b7f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove obsolescent AC_HEADER_STDC and memcpy check
2019-03-01 19:24:06 +01:00