Dmitry Stogov
d688129360
Removed recursive call
2018-01-16 09:44:49 +03:00
Dmitry Stogov
1e783db679
Put ZEND_FASTCALL into the proper place.
2018-01-16 09:44:10 +03:00
Dmitry Stogov
022e029984
Optimize zval_dtor_func()
2018-01-16 00:57:47 +03:00
Anatol Belski
08478abc59
Merge branch 'PHP-7.2'
...
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
2018-01-15 17:49:46 +01:00
Anatol Belski
be89405839
[ci skip] Update NEWS
2018-01-15 17:49:21 +01:00
Anatol Belski
cc5e53695a
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
2018-01-15 17:47:29 +01:00
Anatol Belski
47941976b7
[ci skip] Update NEWS
2018-01-15 17:46:34 +01:00
Dmitry Stogov
d5238b95a3
Added missing #if to allow compilation withput ZEND_MM_CUSTOM
2018-01-15 17:37:15 +03:00
Dmitry Stogov
106575ed39
Manual CSE
2018-01-15 17:36:35 +03:00
Xinchen Hui
0b7a968109
Added missed PHPAPI
2018-01-15 21:39:25 +08:00
Xinchen Hui
92d6f26e3f
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
Allow pecl like usage in ext/phar, closes #2955
2018-01-15 21:34:03 +08:00
Xinchen Hui
56d2147cbb
Restore change committed by accident
2018-01-15 21:30:56 +08:00
Anatol Belski
89463341c8
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Allow pecl like usage in ext/phar, closes #2955
2018-01-15 14:26:22 +01:00
Anatol Belski
c5768a7e24
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Allow pecl like usage in ext/phar, closes #2955
2018-01-15 14:25:45 +01:00
Anatol Belski
2d4fb56c1d
Allow pecl like usage in ext/phar, closes #2955
2018-01-15 14:23:46 +01:00
Xinchen Hui
98aa3a65c4
Optimized php_addslashes with SSE4.2 instructions
...
According to benchmark
(https://gist.github.com/laruence/fd0d443d2c5bacca9d8ab99250499956 ) this brings 30%+ execution time reduced.
In the further, this open the door for possible SSE4.2 optimizations in
other places.
2018-01-15 21:17:50 +08:00
motecshine
0e10bed83e
Remove double include of fpm_scoreboard.h
2018-01-15 12:22:04 +01:00
Bishop Bettini
cb7387275f
Add test for bug #66960
2018-01-15 12:20:10 +01:00
Nikita Popov
3eaab04663
Merge branch 'PHP-7.2'
2018-01-15 12:16:16 +01:00
Nikita Popov
f3c1726d25
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-15 12:16:00 +01:00
Nikita Popov
2023346973
Fixed bug #75079
2018-01-15 12:15:40 +01:00
Anatol Belski
3e40f661a3
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Sync for upcoming vc++ 15.6 version raise
2018-01-14 16:43:21 +01:00
Anatol Belski
be0620a2f0
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Sync for upcoming vc++ 15.6 version raise
2018-01-14 16:42:17 +01:00
Anatol Belski
089a3213ae
Sync for upcoming vc++ 15.6 version raise
2018-01-14 16:38:36 +01:00
Anatol Belski
b4412e0dbc
Merge branch 'PHP-7.2'
...
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
2018-01-13 14:51:34 +01:00
Anatol Belski
43c578b4b2
[ci skip] Update NEWS
2018-01-13 14:50:58 +01:00
Anatol Belski
4fabee770f
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
2018-01-13 14:50:00 +01:00
Anatol Belski
05c4f72ab6
[ci skip] Update NEWS
2018-01-13 14:48:48 +01:00
Anatol Belski
50431d0820
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix invalid free
2018-01-13 12:33:45 +01:00
Anatol Belski
1350f4f997
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix invalid free
2018-01-13 12:33:02 +01:00
Anatol Belski
2503a27ae0
Fix invalid free
2018-01-13 12:32:22 +01:00
Nikita Popov
6aa045e174
Merge branch 'PHP-7.2'
2018-01-13 11:06:58 +01:00
Nikita Popov
cf70e1910b
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-13 11:06:46 +01:00
Nikita Popov
8c07170ddb
Fix generator GC if yield from parent chain does not reach root
...
Parents may be unlinked while another generator sharing part of the
chain is running. As such, we cannot assume that the parent chain
goes all the way to the root. Instead walk backwards from root to
leaf, like we also do during destruction.
2018-01-13 11:04:26 +01:00
Nikita Popov
47e6c1491b
Merge branch 'PHP-7.2'
2018-01-12 22:51:29 +01:00
Nikita Popov
d00f52b6a9
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-12 22:51:20 +01:00
Nikita Popov
cab0a814bd
Try to fix yield from GC issues
...
Make sure we always update root and parent references before
releasing the old root object.
This fixes some crashes under aggressive cycle collection, so
hopefully this will also fix bug #75351 .
2018-01-12 22:51:03 +01:00
Nikita Popov
d8d20020f5
Merge branch 'PHP-7.2'
2018-01-12 21:28:31 +01:00
Nikita Popov
e112b8474a
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-12 21:28:24 +01:00
Nikita Popov
420d11e8ca
Fixed bug #75396
...
Do not run finally blocks in generators on unclean shutdown (e.g.
caused by exit). This is consistent with how finally blocks outside
of generators behave.
2018-01-12 21:27:23 +01:00
Nikita Popov
5fef837c28
Simplify non-linear generator yield from tree
...
Remove special handling for 2-4 children. Now the three possible
cases are no children, one child, or many children (HT).
The non-linear (many children) case is extremely rare, so there is
no point in trying to optimize it.
2018-01-12 21:14:50 +01:00
Anatol Belski
b2a1199d33
[ci skip] Fix typos
2018-01-12 19:12:54 +01:00
timurib
a484b9a535
Fix #75765 Exception on extend of undefined class
...
As the parent class is fetched prior to binding, there are no
safety concerns in this case and we can replace the fatal error
with an Error exception.
2018-01-12 18:41:39 +01:00
Nikita Popov
2d083a3da7
Don't directly access refcount in interbase
2018-01-12 18:38:45 +01:00
Nikita Popov
27f09efa11
Avoid duplicate addition of generators in yield from tree
2018-01-12 18:37:47 +01:00
Nikita Popov
5c983ae852
Merge branch 'PHP-7.2'
2018-01-12 18:34:34 +01:00
Nikita Popov
8c73fc8027
Fixed bug #75653
2018-01-12 18:30:22 +01:00
Nikita Popov
b942648771
Merge branch 'PHP-7.2'
2018-01-12 18:18:45 +01:00
Nikita Popov
f8c889760c
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-12 18:18:34 +01:00
Nikita Popov
9e98e99a3a
Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)"
...
This reverts commit 816758eda2 .
After this commit relative router scripts were resolved against
docroot rather than shell cwd.
2018-01-12 18:11:12 +01:00