delta/php-git.git/ext, branch php-7.0.0alpha2 git.php.net: repository/php-src.git Merge branch 'PHP-5.6' 2015-06-23T14:50:52+00:00 Christoph M. Becker cmb@php.net 2015-06-23T14:50:52+00:00 ec8731c46b40769ceac5242c04197e31477bf3d1 * PHP-5.6: Fixed bug #69864 (Segfault in preg_replace_callback) 
* PHP-5.6:
  Fixed bug #69864 (Segfault in preg_replace_callback)
Merge branch 'PHP-5.5' into PHP-5.6 2015-06-23T14:36:35+00:00 Christoph M. Becker cmb@php.net 2015-06-23T14:36:35+00:00 bc47f10a97063a53cca9a4901399546f5115933d * PHP-5.5: updated NEWS Fixed bug #69864 (Segfault in preg_replace_callback) 
* PHP-5.5:
  updated NEWS
  Fixed bug #69864 (Segfault in preg_replace_callback)
Fixed two errors in LDAP tests 2015-06-23T14:11:12+00:00 Côme Bernigaud mcmic@php.net 2015-06-23T14:09:56+00:00 d29cc63bb681e426d93d69eb21941e2e9719a51f 






Fixed two errors in LDAP tests
2015-06-23T14:09:56+00:00

Côme Bernigaud
mcmic@php.net

2015-06-23T14:09:56+00:00

9bcdd2aabe176cdcf78514297960d6a8eb7d40fd












Revert "Simplify php_implode(). Fill the resulting string in direct order."
2015-06-23T13:46:41+00:00

Dmitry Stogov
dmitry@zend.com

2015-06-23T13:46:41+00:00

6bf3ecf69a76789c31415d4f7dbca818614285f5

The patch slightly improved performance of string imploding, but reduced speed of integers imploding.

This reverts commit 36d39b70443dcefeeb62d189ce67b414caf5486a.





The patch slightly improved performance of string imploding, but reduced speed of integers imploding.

This reverts commit 36d39b70443dcefeeb62d189ce67b414caf5486a.







Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23T11:00:17+00:00

Christoph M. Becker
cmb@php.net

2015-06-23T11:00:17+00:00

a39beaa2514514892d34bc2e9fd89f7333a6ed1f

When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.





When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.







Simplify php_implode(). Fill the resulting string in direct order.
2015-06-23T09:57:36+00:00

Dmitry Stogov
dmitry@zend.com

2015-06-23T09:57:36+00:00

36d39b70443dcefeeb62d189ce67b414caf5486a












Drop duplicate object-to-type notices
2015-06-22T14:25:32+00:00

Nikita Popov
nikic@php.net

2015-06-22T14:24:11+00:00

8a83aed45847edf7e6ed59a996bc991dec3ef96b

We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.





We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.







Fix typo + DSP reference
2015-06-22T11:30:12+00:00

Kalle Sommer Nielsen
kalle@php.net

2015-06-22T11:30:12+00:00

055755a4ae6f6f30b9345b416f5cf931f9abe40d












Remove these old references to the DSP files we don't use anymore
2015-06-22T11:29:42+00:00

Kalle Sommer Nielsen
kalle@php.net

2015-06-22T11:29:42+00:00

db22946b25181ddbb23067418ac7092a0c26d9b3