1
0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Commit Graph

93525 Commits

Author SHA1 Message Date
Dmitry Stogov
796e1629b0 Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string 2016-02-18 23:15:38 +03:00
Dmitry Stogov
25fbb06e2d Better fix for bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable()) 2016-02-18 23:14:46 +03:00
Anatol Belski
830b2bd368 refix broken 20ca0b89bd 2016-02-18 19:51:18 +01:00
Anatol Belski
9ac01060f9 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 2016-02-18 19:44:58 +01:00
Anatol Belski
7f7dce3cd6 update NEWS 2016-02-18 19:43:27 +01:00
Anatol Belski
bbaece44ee Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2016-02-18 19:43:03 +01:00
Anatol Belski
bbce94ed78 update NEWS 2016-02-18 19:42:18 +01:00
Anatol Belski
b3df715f50 add test for bug #71625, 7 variant 2016-02-18 19:40:17 +01:00
Anatol Belski
4564b4c8f6 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add test for bug #71625
2016-02-18 19:39:30 +01:00
Anatol Belski
688b914217 add test for bug #71625 2016-02-18 19:38:39 +01:00
Rasmus Lerdorf
20ca0b89bd Fix typo 2016-02-18 10:35:53 -08:00
Anatol Belski
9a5797976a Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #71625 Crash in php7.dll with bad phar filename
2016-02-18 19:33:27 +01:00
Anatol Belski
0445abd547 Fixed bug #71625 Crash in php7.dll with bad phar filename 2016-02-18 19:32:08 +01:00
Anatol Belski
150e3804b9 update NEWS 2016-02-18 19:17:54 +01:00
Anatol Belski
148eba2afd Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2016-02-18 19:17:22 +01:00
Anatol Belski
f613d89501 update NEWS 2016-02-18 19:16:39 +01:00
Anatol Belski
4b5cce269b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:14:22 +01:00
Anatol Belski
632fc51d98 Bug #71596 Segmentation fault on ZTS with date function (setlocale) 2016-02-18 19:13:07 +01:00
Bob Weinand
3ce6ad9d13 Fixed bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable()) 2016-02-18 13:53:15 +01:00
Leigh
a0724d3081 Revert "Fix #71152: mt_rand() returns the different values from original mt19937ar.c"
This reverts commit 6f6bd8ce53.

`mt_rand()` is seedable with `mt_srand()` which means it can be used to (re)produce specific streams of numbers. All code (no matter how few instances that may be) that previously depended on this behaviour will no longer produce the same results.

This kind of change needs to be discussed before being committed.
2016-02-18 11:09:01 +00:00
Lior Kaplan
aa383d633e Sort 7.0.4 extensions by name, merge FPM entries 2016-02-18 11:24:03 +02:00
Stanislav Malyshev
9afb29aa68 Remove TSRMLS_* from code, they are not used anymore 2016-02-17 22:44:05 -08:00
Stanislav Malyshev
cf842f1064 Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
Anatol Belski
491925bc53 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix ts buld
2016-02-18 07:12:42 +01:00
Anatol Belski
a329dc70e9 fix ts buld 2016-02-18 07:11:36 +01:00
Ferenc Kovacs
e87ac6de31 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  5.6.20 is next
2016-02-18 00:32:15 +01:00
Ferenc Kovacs
4762ed4d27 5.6.20 is next 2016-02-18 00:31:18 +01:00
Bob Weinand
055b411218 Fix crash when advancing inside an internal function
This just happened in the "double ctrl+c" mode, when we halted inside an internal function; there was some code assuming a proper op_array
2016-02-17 20:27:46 +01:00
Dmitry Stogov
d228752939 Fixed process synchronisation problem, that may cause crashes after opcache restart 2016-02-17 13:58:05 +03:00
kusano
6f6bd8ce53 Fix #71152: mt_rand() returns the different values from original mt19937ar.c 2016-02-17 11:32:59 +08:00
Anatol Belski
837e2a912d prepare next 2016-02-16 09:14:05 +01:00
Anatol Belski
7f5e8704bf Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  yet two test fixes in openssl in 5.6
2016-02-16 08:29:37 +01:00
Anatol Belski
343307000e yet two test fixes in openssl in 5.6 2016-02-16 08:28:10 +01:00
Anatol Belski
84014cf733 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  improve test
2016-02-16 08:06:38 +01:00
Anatol Belski
974dea5e88 improve test 2016-02-16 08:05:16 +01:00
Xinchen Hui
0fccd154bd Fixed bug #71603 (compact() maintains references in php7) 2016-02-16 11:02:57 +08:00
Bob Weinand
23b770f31f Fixed bug #71601 (finally block not executed after yield from) 2016-02-15 22:37:21 +01:00
Anatol Belski
7faf625ff3 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix timelib compat with PHP5
2016-02-15 16:53:31 +01:00
Anatol Belski
11102e2653 Fix timelib compat with PHP5
Windows builds in PHP5 are always using long which is 32-bit even
in 64-bit build. Thus in PHP5, timelib_long and the company have
to always evaluate to a 32-bit.
2016-02-15 16:50:42 +01:00
Anatol Belski
64b16deaba Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Backported fix for bug #71525
2016-02-15 15:15:52 +01:00
Anatol Belski
633fb2d0e8 Backported fix for bug #71525 2016-02-15 15:14:23 +01:00
Dmitry Stogov
388ab976b5 Fixed possible memory leak 2016-02-15 16:40:05 +03:00
Dmitry Stogov
5c4b4d11be Added missing semicolon 2016-02-15 16:37:27 +03:00
Stanislav Malyshev
c1355152db More fixing for bug #71540 2016-02-15 01:53:02 -08:00
Stanislav Malyshev
e34a7a1b08 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

Conflicts:
	ext/xsl/xsltprocessor.c
2016-02-15 00:09:30 -08:00
Stanislav Malyshev
cf0cf5b507 Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() 2016-02-15 00:09:09 -08:00
Stanislav Malyshev
c11b23c465 Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() 2016-02-15 00:08:18 -08:00
Anatol Belski
9b277e6cff Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix dir separator in test
2016-02-15 09:01:59 +01:00
Anatol Belski
c94ee2e0c8 fix dir separator in test 2016-02-15 09:00:07 +01:00
Anatol Belski
a3927fa7f5 fix dir separator in test 2016-02-15 08:58:20 +01:00