summaryrefslogtreecommitdiff
path: root/ext/mbstring
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-047-7/+7
|
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-171-3/+6
|\ | | | | | | | | * PHP-7.0: fix C89 compat
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-12-171-3/+6
| |\ | | | | | | | | | | | | * PHP-5.6: fix C89 compat
| | * fix C89 compatAnatol Belski2016-12-171-3/+6
| | |
| | * Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-261-1/+29
| | |
* | | Fixed bug #73646 (mb_ereg_search_init null pointer dereference)Xinchen Hui2016-12-092-6/+17
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-261-0/+28
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Add more mbfl string size checks (bug #73505)
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-261-0/+28
| |\ \ | | | | | | | | | | | | | | | | * PHP-5.6: Add more mbfl string size checks (bug #73505)
| | * | Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-261-1/+29
| | |/
| | * Fix bug #73082Stanislav Malyshev2016-09-251-48/+48
| | |
| | * Fix bug26639.phptYasuo Ohgaki2016-09-081-0/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: remove TSRMLS_*
| * | remove TSRMLS_*Anatol Belski2016-11-211-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-11-171-12/+20
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
| * | Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt ↵Dmitry Stogov2016-11-171-12/+20
| | | | | | | | | | | | failure with opcache.protect_memory=1)
* | | Fixed bug #73532 (Null pointer dereference in mb_eregi)Xinchen Hui2016-11-162-2/+12
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Yasuo Ohgaki2016-09-081-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
| * | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-09-081-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
| | * Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charsetYasuo Ohgaki2016-09-081-3/+3
| | |
* | | Merge branch 'pull-request/2115' into PHP-7.1Christoph M. Becker2016-09-061-1/+1
|\ \ \
| * | | Fix #72948: Uncatchable "Catchable" fatal error for class to string conversionsChristoph M. Becker2016-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | E_RECOVERABLE errors are reported as "Catchable fatal error". This is misleading, because they actually can't be caught via try-catch statements. Therefore we change the wording to "Recoverable fatal error" as suggested by Nikita.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Yasuo Ohgaki2016-09-062-1/+90
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * PHP-7.0: Fixed Bug #66964 mb_convert_variables() cannot detect recursion
| * | | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-09-062-1/+90
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.6: Fixed Bug #66964 mb_convert_variables() cannot detect recursion
| | * | Fixed Bug #66964 mb_convert_variables() cannot detect recursionYasuo Ohgaki2016-09-062-12/+102
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-041-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: Sync fix for bug #72910 with current upstream
| * | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-041-3/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: Sync fix for bug #72910 with current upstream
| | * | Sync fix for bug #72910 with current upstreamStanislav Malyshev2016-09-041-3/+5
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-041-0/+17
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-041-0/+17
| |\ \ | | |/
| | * Fix #72994: mbc_to_code() out of bounds readChristoph M. Becker2016-09-042-1/+22
| | | | | | | | | | | | We're backporting commit 999a3553 to the still supported PHP 5.6.
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: Fix bug #72910 5.6.27 will be next
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-011-1/+1
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: Fix bug #72910 5.6.27 will be next
| | * Fix bug #72910Stanislav Malyshev2016-09-011-1/+1
| | | | | | | | | | | | Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-302-0/+30
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-302-0/+30
| |\ \ | | |/
| | * Fix #66797: mb_substr only takes 32-bit signed integerChristoph M. Becker2016-08-302-0/+30
| | | | | | | | | | | | | | | | | | `from` and `len` are `long`, but get passed to mbfl_substr() which expects `int`s. Therefore we clamp the values to avoid the undefined conversion behavior.
* | | Fix #72711: `mb_ereg` does not clear the `$regs` parameter on failureju1ius2016-08-056-50/+100
| | | | | | | | | | | | | | | When `mb_ereg` failed to match, it didn't update the `$regs` argument. Now it will always set it to the empty array.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-302-1/+13
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-302-1/+13
| |\ \ | | |/
| | * fixes bad address given to onig_error_code_to_strju1ius2016-07-302-1/+13
| | | | | | | | | | | | | | | | | | Closes bug #72710 (cherry picked from commit 0fb7eb6723bcc6fd98053911543e801edb5ab763)
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-283-5/+26
|\ \ \ | |/ / | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-282-1/+22
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| | * Fix #72694: mb_ereg_search_setpos does not accept a string's last positionChristoph M. Becker2016-07-282-1/+22
| | | | | | | | | | | | | | | Setting the search position immediately behind the last character should be allowed, so we fix this off-by-one error.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-283-5/+46
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-283-5/+46
| |\ \ | | |/
| | * Fix #72693: mb_ereg_search increments search position when a match zero-widthChristoph M. Becker2016-07-283-5/+46
| | | | | | | | | | | | That's caused by an off-by-one error, which we fix.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-282-3/+48
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-282-3/+48
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| | * Fix #72691: mb_ereg_search raises a warning if a match zero-widthChristoph M. Becker2016-07-282-3/+48
| | | | | | | | | | | | | | | That warning doesn't make sense (PCRE doesn't throw such a warning either), so we remove it.
* | | add testMasaki Kagaya2016-07-171-0/+21
| | |
View Lorry Controller Status