php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,229 Commits 549 Branches 1,485 Tags
4faa540b45fce018252cd00751d3a5002ad3d00a
Commit Graph

753 Commits

Author SHA1 Message Date
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
Stanislav Malyshev d3eb58332a Add more locale length checks, due to ICU bugs. 2016-10-04 21:28:40 -07:00
Stanislav Malyshev dad0e9d1a3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0: (22 commits)
  Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields
  I don't think 8cceb012a7 is needed
  Fix test
  Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)
  Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c
  Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
  Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction
  Fix bug #73029 - Missing type check when unserializing SplArray
  Fix bug #72860: wddx_deserialize use-after-free
  Fix bug #73007: add locale length check
  Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile
  sync NEWS
  Revert "Merge branch 'PHP-5.6' into PHP-7.0"
  Merge branch 'PHP-5.6' into PHP-7.0
  Merge branch 'PHP-5.6' into PHP-7.0
  Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0""
  fix version
  sync NEWS
  Fix bug #72957
  set versions
  ...
 2016-09-12 21:10:34 -07:00
Stanislav Malyshev 6d55ba2656 Fix bug #73007: add locale length check 2016-09-12 21:04:23 -07:00
Stanislav Malyshev 92db16e456 Fix bug #73007: add locale length check 
(cherry picked from commit 9e07089626f373d0e7b24b7aeb8b8459aae5f5f8)

Conflicts:
	ext/intl/msgformat/msgformat_format.c
 2016-09-12 17:19:47 +02:00
Anatol Belski aeb7b4094a sync tests 2016-08-31 12:26:51 +02:00
Anatol Belski a349afd26b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix double free
 2016-08-29 19:34:19 +02:00
Anatol Belski 3437dbfa00 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix double free
 2016-08-29 19:33:22 +02:00
Anatol Belski 1a840b9af0 fix double free 2016-08-29 19:27:47 +02:00
Anatol Belski 5c8aa478da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix double free
 2016-08-29 18:57:50 +02:00
Anatol Belski 1d93086937 fix double free 2016-08-29 18:56:25 +02:00
Christoph M. Becker 29849e5ba1 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-20 03:11:05 +02:00
Christoph M. Becker 078f674212 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-20 03:04:08 +02:00
Christoph M. Becker e4a006cd3e Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence 
According to the Unicode specification (at least as of 5.1), CRLF sequences
are considered to be a single grapheme. We cater to that special case by
letting grapheme_ascii_check() fail. While it would be trivial to fix
grapheme_ascii_check() wrt. grapheme_strlen(), grapheme_substr() and
grapheme_strrpos() would be much harder to handle, so we accept the slight
performance penalty if CRLF is involved.
 2016-08-20 03:01:35 +02:00
Anatol Belski 21f80a00a9 fix broken proto doc 2016-07-26 16:29:24 +02:00
Anatol Belski 893e3b06ea fix compiler warning 2016-07-26 07:53:24 +02:00
Anatol Belski 3958f7af00 fix data type 2016-07-26 07:53:24 +02:00
Anatol Belski 2334d8335b use more suitable types here, too 
and simplify the loop
 2016-07-25 14:46:20 +02:00
Anatol Belski 198c2ec5f0 change to more suitable datatypes 2016-07-25 14:46:20 +02:00
Anatol Belski bd9a5b183c Fixed bug #72658 Locale::lookup() / locale_lookup() hangs if no match found 2016-07-25 12:49:13 +02:00
Nikita Popov ca64223193 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:18:51 +02:00
Nikita Popov aecc435482 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-24 00:18:47 +02:00
Nikita Popov 04b42b1e05 More tolerance in another IntlCalendar test 
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
 2016-07-24 00:15:14 +02:00