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
Anatol Belski
53639c44df
make sure the tests always uses same tz
2016-02-15 08:38:55 +01:00
Xinchen Hui
afe0ddf6dd
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
fixed news entry
fix NEWS entry
update NEWS
Fix bug #71525
2016-02-15 15:32:52 +08:00
Anatol Belski
8f5cdca9c4
fixed news entry
2016-02-15 08:27:41 +01:00
Anatol Belski
9746f2e9da
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix NEWS entry
2016-02-15 08:27:17 +01:00
Xinchen Hui
e917402f05
Fixed typo (I think it should be a typo)
2016-02-15 15:26:44 +08:00
Anatol Belski
199c0ec48d
fix NEWS entry
2016-02-15 08:25:23 +01:00
Anatol Belski
e027f16e94
update NEWS
2016-02-15 08:21:46 +01:00
Sean DuBois
f31e0cd334
Fix bug #71525
...
timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out
it latters causes other date operations to fail (like date_date_set)
2016-02-15 08:19:07 +01:00
Xinchen Hui
d0649a8441
Update NEWS
2016-02-15 13:24:39 +08:00
Mickaël
0c2e184eac
fpm: call zend_signal_init() in child
...
This addresses bug #71269 .
When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).
This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4
which addresses
bug #61083 .
2016-02-15 13:23:37 +08:00
Xinchen Hui
0e363e90a4
Update NEWS
2016-02-15 10:37:37 +08:00
Xinchen Hui
8974e4c781
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
Fix use-after-free of ZCG(cwd) in Zend Optimizer
Conflicts:
ext/opcache/ZendAccelerator.c
2016-02-15 10:32:50 +08:00
Xinchen Hui
2b850e1565
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
2016-02-15 10:31:37 +08:00
Xinchen Hui
5e152f54ae
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
update NEWS
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Check length of string before comparing to :memory:
Fix bounds check in strip_tags()
Fix test description
FIx bug #71569
2016-02-15 10:29:28 +08:00
Anatol Belski
1740648312
updated NEWS
2016-02-14 20:54:13 +01:00
Anatol Belski
aabb6b70c5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-14 20:53:41 +01:00
Anatol Belski
aa10fc6092
update NEWS
2016-02-14 20:52:47 +01:00
Anatol Belski
724ee19111
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:49:03 +01:00
Anatol Belski
ce4a2f0fc6
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:47:23 +01:00
Anatol Belski
9bef2212aa
cleanup duplicated var
2016-02-14 17:20:37 +01:00
Anatol Belski
8289f11390
fix file lists with subdirs passed to EXTENSION()
...
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like
EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)
are working correctly. Same for
ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
2016-02-14 17:15:20 +01:00