php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,115 Commits 549 Branches 1,485 Tags
230804b08da86cff7dfba93f2b5dcdd7ccf4dcf7
Commit Graph

619 Commits

Author SHA1 Message Date
Xinchen Hui 1f496744ed Merge branch 'PHP-5.5' into PHP-5.6 2014-08-11 17:47:36 +08:00
Xinchen Hui b6ddcf9c71 Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) 2014-08-11 17:46:56 +08:00
Stanislav Malyshev 90a0d58af8 Fix SPL objects initialization checks 2014-07-26 18:59:16 -07:00
Xinchen Hui f48f311533 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:58:11 +08:00
Xinchen Hui 22882a9d89 Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) 2014-07-02 17:57:42 +08:00
Xinchen Hui df78c48354 Fixed Bug #67538 (SPL Iterators use-after-free) 2014-07-02 17:45:09 +08:00
Stanislav Malyshev b03993dde9 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-24 10:29:26 -07:00
Stanislav Malyshev e2ed4874b5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	ext/intl/locale/locale_methods.c
 2014-06-24 10:25:09 -07:00
Stanislav Malyshev 88223c5245 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-21 19:46:16 -07:00
Remi Collet bf7fed7e41 new test, missing in ea466a3 2014-06-18 15:59:45 +02:00
Remi Collet ea466a316f Fix Request #67453 Allow to unserialize empty data. 
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
 2014-06-17 09:38:54 +02:00
Stanislav Malyshev 2b04d68972 Fix bug #66127 (Segmentation fault with ArrayObject unset) 2014-06-10 23:24:11 -07:00
Stanislav Malyshev 2ed66ed21c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
 2014-06-10 23:20:07 -07:00
Stanislav Malyshev f11bba4929 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

Conflicts:
	configure.in
	main/php_version.h
 2014-06-10 23:19:21 -07:00
Stanislav Malyshev 317bcb96d0 Fix bug #66127 (Segmentation fault with ArrayObject unset) 2014-06-10 23:17:30 -07:00
Xinchen Hui c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Xinchen Hui 9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui 38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Adam Harvey b8042acdde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:56:32 +00:00
Adam Harvey 43e3a83d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
 2014-05-29 17:53:28 +00:00
Adam Harvey b5d9983ff4 Check for zero-length keys in spl_array_skip_protected and don't skip them. 
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
 2014-05-29 17:49:32 +00:00
Tjerk Meesters d4295eb26a Prevent recursion in ZF2 Parameters class 2014-05-16 16:49:47 +08:00
Stanislav Malyshev f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:56:32 -07:00
Stanislav Malyshev af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
 2014-05-11 18:16:19 -07:00
Stanislav Malyshev 2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Etienne Kneuss 6006a3ed51 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 11:36:36 +02:00
Joshua Thijssen e8d6c6587d fixed bug66702 : regexiterator's invert flag doesn't work as expected 2014-04-09 11:13:33 +02:00
Tjerk Meesters 5dee3c11fe Call offsetGet() when called with isset() on ArrayObject derivatives 2014-03-25 18:15:18 +08:00
Tjerk Meesters 8d3f4b647b Merge branch 'PHP-5.5' into PHP-5.6 2014-03-07 19:24:02 +08:00
Tjerk Meesters 972935cd95 Fixed null termination 2014-03-07 19:23:46 +08:00
Tjerk Meesters 64906cdc38 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-07 18:57:36 +08:00
datibbaw 3c673fed34 Add fread(length) method 
Fixed off-by-one write bug

Added test
 2014-03-07 18:50:33 +08:00
Anatol Belski 1cb4398ac1 primitive test fixes 2014-02-28 09:43:57 +01:00
Ferenc Kovacs 42a43d4531 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests broken by 633f898f15
 2014-02-27 02:32:47 +01:00
Ferenc Kovacs fd20278fa5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix tests broken by 633f898f15
 2014-02-27 02:32:07 +01:00
Ferenc Kovacs bd961f3e87 fix tests broken by 633f898f15 2014-02-27 02:31:42 +01:00
Dmitry Stogov 0f39089384 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests
 2013-12-02 12:05:29 +04:00
Dmitry Stogov 2f5ab04c5f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests
 2013-12-02 12:04:07 +04:00
Dmitry Stogov edbefd1d5c Fixed tests 2013-12-02 11:53:35 +04:00
Ferenc Kovacs 91108818e1 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt
 2013-11-06 10:46:34 +01:00
ptarjan 9c1e1bbc05 fix many parallel test issues 
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
 2013-11-06 10:31:47 +01:00
Christopher Jones c439ac6c35 Cleanup temp test file 2013-11-06 10:31:35 +01:00
Sara Golemon 92fe33c570 Merge branch 'pull-request/473' 2013-09-26 13:24:08 -07:00
Nikita Popov 0d7a638866 Implement variadic function syntax 
As per RFC: https://wiki.php.net/rfc/variadics
 2013-09-26 18:39:17 +02:00
ptarjan ecbe4af0de fix many parallel test issues 
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
 2013-09-26 00:30:23 -07:00
David Soria Parra dc7015d4e4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:58 +02:00
David Soria Parra 94e4c4df86 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:51 +02:00
David Soria Parra 7a24ee13ec Revert "EmptyIterator now implements Countable; fixes bug 60577" 
This reverts commit 8a936e8eb9.
 2013-09-18 15:06:36 +02:00
Michael Wallner 6866b45a48 fix test concurrency 2013-09-18 10:52:35 +02:00
David Soria Parra 3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:37 +02:00