Commit Graph

775 Commits

Author SHA1 Message Date
Remi Collet
90f33b1ac7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
2017-06-13 08:50:10 +02:00
Remi Collet
78970d5338 Fix bug #74705 for collator_get_sort_key 2017-06-13 08:48:17 +02:00
Tyson Andre
5f07a895cc Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
https://secure.php.net/manual/en/collator.getsortkey.php
2017-06-13 08:46:47 +02:00
Nikita Popov
bfedff58e3 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 00:05:52 +02:00
libnex
95c4564f93 Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message 2017-06-03 00:05:16 +02:00
Jesper Hagström
cea34425f3 Set timezone for intl/test/bug74298.phpt
Now sets UTC as default timezone for the DateTime which otherwise
uses the timezone defined in php.ini.
2017-06-02 23:40:48 +02:00
Anatol Belski
7d418430fd Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  variation of icu libraries causes failure
2017-05-16 12:47:24 +02:00
Steve Walk
d74fbfb38f variation of icu libraries causes failure 2017-05-16 12:46:27 +02:00
Joe Watkins
2735318c7b
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:21:54 +01:00
Fabien Villepinte
f50df1d0e3
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys 2017-05-02 06:20:40 +01:00
Joe Watkins
0959e6f422
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74439 Wrong reflection on the Locale methods
2017-04-17 07:58:22 +01:00
Fabien Villepinte
7dc6b04f45
Fixed bug #74439 Wrong reflection on the Locale methods 2017-04-17 07:56:47 +01:00
Joe Watkins
bd32837acf
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74433 Wrong reflection on the Normalizer methods
2017-04-13 13:21:51 +01:00
Fabien Villepinte
f05d74feb8
Fixed bug #74433 Wrong reflection on the Normalizer methods 2017-04-13 13:21:05 +01:00
andrewnester
1ce355abb6 Fixed #74298 - IntlDateFormatter->format() doesn't return microseconds/fractions 2017-04-09 12:56:21 +02:00
Ben Scholzen
d896878ad5 Let MessageFormatter and IntlDateFormatter accept DateTimeImmutable as well 2017-03-29 00:20:46 +02:00
Anatol Belski
6508320936 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  deps updated, cherry-pick 88642decf9
  add test for bug #74230
2017-03-27 19:42:24 +02:00
Anatol Belski
6da475367a add test for bug #74230 2017-03-27 19:33:51 +02:00
Remi Collet
2ce8a4cf87 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  NEWS
  Fix #73956 Link use CC instead of CXX
2017-01-18 13:02:19 +01:00
Remi Collet
6af22d0d3e Fix #73956 Link use CC instead of CXX 2017-01-18 13:00:49 +01:00
Stanislav Malyshev
34d6b63501 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo
2017-01-16 01:18:50 -08:00
Stanislav Malyshev
8c44d07fd4 Fix bug #73634 - grapheme_strpos illegal memory access 2017-01-16 01:18:16 -08:00
Dmitry Stogov
96655ad01e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bad merge
2016-12-01 16:22:23 +03:00
Dmitry Stogov
7f22e3c879 Fixed bad merge 2016-12-01 16:21:57 +03:00
Dmitry Stogov
d149ba217f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
2016-12-01 15:50:19 +03:00
Dmitry Stogov
b7b7dd8cea Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
2016-12-01 15:50:05 +03:00
Stanislav Malyshev
c8778eb293 oops, changed in wrong place 2016-11-27 16:11:41 -08:00
Stanislav Malyshev
53655c5af1 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add NEWS
  Fix #68447: grapheme_extract take an extra trailing character
2016-11-27 15:38:33 -08:00
Stanislav Malyshev
f1a9851c3e Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix #68447: grapheme_extract take an extra trailing character
2016-11-27 15:36:29 -08:00
Stanislav Malyshev
8856b3a63c Merge branch 'pull-request/1974' into PHP-5.6
* pull-request/1974:
  Fix #68447: grapheme_extract take an extra trailing character
2016-11-27 15:34:58 -08:00
Anatol Belski
d61db8d602 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  remove TSRMLS_*
2016-11-22 00:32:42 +01:00
Anatol Belski
5e9b4c26a5 remove TSRMLS_* 2016-11-21 23:53:37 +01:00
Stanislav Malyshev
25d04ad8e3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes
2016-11-03 22:53:05 -07:00
Stanislav Malyshev
1fd18821e0 More string length checks & fixes 2016-11-03 21:35:09 -07:00
Stanislav Malyshev
6e12e49b5b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  More string length checks & fixes
2016-11-03 20:46:25 -07:00
Stanislav Malyshev
ea9fac94bb More string length checks & fixes 2016-11-03 20:36:52 -07:00
Anatol Belski
81f859b5ce Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  make config.w32 compatible with ICU 58
2016-10-26 13:07:44 +02:00
Anatol Belski
0f9a4af90b make config.w32 compatible with ICU 58 2016-10-26 13:05:03 +02:00
Anatol Belski
6f9c3b4558 update len in fallback cases
(cherry picked from commit 58b18892bf)
2016-10-14 01:49:55 +02:00
Anatol Belski
48f06ada89 fix test
(cherry picked from commit 7c6cb1282d)
2016-10-14 01:42:50 +02:00
Anatol Belski
0cf880e70c avoid strlen
(cherry picked from commit aaa5d07365)
2016-10-14 01:41:32 +02:00
Stanislav Malyshev
d25e427ab1 Bug #73218: add mitigation for ICU int overflow
(cherry picked from commit d946d10293)
(cherry picked from commit b26b02b2df)
2016-10-14 01:41:06 +02:00
Stanislav Malyshev
0d9d133cd6 Add more locale length checks, due to ICU bugs.
(cherry picked from commit d3eb58332a)
(cherry picked from commit 87a8240b5a)
2016-10-14 01:40:36 +02:00
Anatol Belski
58b18892bf update len in fallback cases 2016-10-12 20:52:46 +02:00
Anatol Belski
7c6cb1282d fix test 2016-10-12 16:03:09 +02:00
Anatol Belski
aaa5d07365 avoid strlen 2016-10-12 13:28:23 +02:00
Stanislav Malyshev
b26b02b2df Bug #73218: add mitigation for ICU int overflow
(cherry picked from commit d946d10293)
2016-10-12 13:22:51 +02:00
Stanislav Malyshev
87a8240b5a Add more locale length checks, due to ICU bugs.
(cherry picked from commit d3eb58332a)
2016-10-12 13:11:16 +02:00
Stanislav Malyshev
082d1f2375 Fix tests 2016-10-11 16:18:08 -07:00
Stanislav Malyshev
d946d10293 Bug #73218: add mitigation for ICU int overflow 2016-10-04 22:40:43 -07:00