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
9efaac30ae
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
2019-03-31 23:09:57 -07:00
Stanislav Malyshev
f3ab302270
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
2019-03-31 23:09:18 -07:00
Stanislav Malyshev
f3aefc6d07
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
2019-03-31 23:09:06 -07:00
Christoph M. Becker
d8b7728b0e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77827 : preg_match does not ignore \r in regex flags
2019-03-31 13:33:21 +02:00
Christoph M. Becker
88460c017a
Fix #77827 : preg_match does not ignore \r in regex flags
2019-03-31 13:31:54 +02: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
Christoph M. Becker
9d8b913de5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test expectation
2019-03-29 09:56:58 +01:00
Christoph M. Becker
0aa1a2c833
Fix test expectation
...
The `W32_SM_SENDMAIL_FROM_MALFORMED` error message will only be shown
if the `$additional_headers` parameter is passed to `mail`, which is
not the case for this test. Instead we have to expect `BAD_MSG_RPATH`.
2019-03-29 09:55:04 +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
e4d9d91462
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-25 17:45:03 +01:00
Vlad Temian
ec2ecb7e12
Fix bug #77680 : Correctly implement recursive mkdir on FTP stream
...
If the root directory was missing, an extra CWD without arguments was
made. Also, the MKD contained an empty string.
Now the CWD will use / and MKDs will be issued starting from the root
directory.
2019-03-25 17:43:46 +01:00
Nikita Popov
e97577edde
Fixed bug #77793
...
By making sure that we always first increment the refcount of the
new value before we destroy the old one.
2019-03-25 17:33:17 +01:00
Nikita Popov
91d4d175ab
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-25 16:43:21 +01:00
Nikita Popov
85095dfd09
Fixed bug #72175
...
Make sure we don't close the connection we're trying to reuse...
2019-03-25 16:41:21 +01:00
Remi Collet
e68fd40e22
ensure pcre.jit=1 for this test
2019-03-22 15:31:36 +01:00
Remi Collet
bb47fb0783
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
ensure pcre.jit=1 for these tests
2019-03-22 15:01:49 +01:00
Remi Collet
2e9dccef78
ensure pcre.jit=1 for these tests
2019-03-22 15:00:31 +01:00
Nikita Popov
30ddfd49ed
Fixed bug #77773
2019-03-22 13:07:00 +01:00
Nikita Popov
620a753185
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-22 12:41:02 +01:00
Nikita Popov
da35fa2cb8
Fixed bug #77772
2019-03-22 12:39:27 +01:00
Remi Collet
5c8d69bf6f
fix test
2019-03-21 09:19:42 +01:00
Remi Collet
cf65905974
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix tests after fix for #76717
2019-03-20 14:08:18 +01:00
Remi Collet
a467a89f16
Fix tests after fix for #76717
2019-03-20 14:07:26 +01:00
Remi Collet
c421d9afec
fix test for upcoming pcre2 10.33
...
"group name ..." => "subpattern name ..."
2019-03-19 16:15:14 +01:00
Nikita Popov
661bce47ae
Fixed bug #76127
...
Per documentation, and consistent with other preg functions, we
should return false if an error occurred.
2019-03-19 13:57:39 +01:00
Nikita Popov
d53e9c7392
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-19 10:03:05 +01:00
Vlad Temian
fe2885d80a
Fixed bug #77765
...
Set mode 40755 for directories, via FTP stream stat.
Because we already manage to CWD into the current directory,
we should set 40755 as mode, instead of 40644.
2019-03-19 10:02:38 +01:00
Christoph M. Becker
a529826d95
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77578 : Crash when php unload
2019-03-18 19:24:56 +01:00
Christoph M. Becker
41bc51ce2d
Fix #77578 : Crash when php unload
...
Since we're putting `ITypeLib *`s into the hash, we're getting
`ITypeLib *`s back, not `ITypeLib **`s.
2019-03-18 19:21:38 +01:00
Xinchen Hui
ab8782d1e6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Simplfy test case
2019-03-18 19:30:11 +08:00
Xinchen Hui
e072537e7f
Simplfy test case
...
(I was working on the same bug while nikic committed the similar fix
2019-03-18 19:28:23 +08:00
Nikita Popov
763a7b8ca3
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-18 12:16:12 +01:00
Nikita Popov
b3a669bec1
Make test independent of icu version
...
We don't really care about the actual output here, just that it
doesn't fail.
2019-03-18 12:14:58 +01:00
Nikita Popov
623a11d7de
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-18 11:39:58 +01:00
Nikita Popov
433758ceb3
Allow DateTimeImmutable in datefmt_format_object()
...
As pointed out in a comment on bug #65683 .
2019-03-18 11:39:16 +01:00
Nikita Popov
82fbaab53c
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-18 11:07:27 +01:00
Nikita Popov
4f03401628
Partial fix for bug #77751
...
This avoids the segfault, but it will not make writing to the
SplFileObject during output shutdown work.
2019-03-18 11:06:23 +01:00
Nikita Popov
da7add3525
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-18 10:51:00 +01:00
Nikita Popov
54bf8c820f
Fixed bug #77743
2019-03-18 10:49:53 +01:00
Nikita Popov
00cfa1a367
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-18 10:11:25 +01:00
Nikita Popov
a573c0e9ed
Fix unused variable warning
2019-03-18 10:11:00 +01:00
Derick Rethans
d209ccd4cc
Merge branch 'PHP-7.2' into PHP-7.3
2019-03-17 14:55:53 -04:00