Nikita Popov
a32829f909
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-16 20:55:08 +01:00
Nikita Popov
fa92a16e46
Fix stack management in ini scanner
2016-12-16 20:54:46 +01:00
Nikita Popov
33e96c9d63
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-14 18:11:43 +01:00
Nikita Popov
f99bf70360
Partially fix bug #70492
...
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
Nikita Popov
2f438342ec
Fixed bug #73727
...
Error introduced when refactoring zend_alloc code into zend_bitset.
2016-12-14 17:56:31 +01:00
Nikita Popov
2c70581338
Fix T_NUM_STRING negation
...
T_NUM_STRING follows the rules of symtable numeric string
conversion. If the offset isn't an integer under those rules, it
is treated as a string. This should apply to negated T_NUM_STRINGs
as well.
2016-12-11 13:33:25 +01:00
Xinchen Hui
09b36113b0
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
2016-12-09 22:30:24 +08:00
Xinchen Hui
6812721ef2
Revert "Refix bug #73686 "
...
This reverts commit 4589386026 .
2016-12-09 22:22:59 +08:00
Xinchen Hui
4589386026
Refix bug #73686
2016-12-09 16:37:22 +08:00
Dmitry Stogov
ee15891c35
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Check if PHP is in execution state.
2016-12-07 15:12:48 +03:00
Dmitry Stogov
3c8c347fa7
Check if PHP is in execution state.
2016-12-07 15:12:18 +03:00
Xinchen Hui
d7a759916d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:32:48 +08:00
Xinchen Hui
358bd77b23
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:32:32 +08:00
Dmitry Stogov
547b735d34
Micro optimizations
2016-12-06 10:01:18 +03:00
Dmitry Stogov
2f0e61f4b7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-05 21:49:09 +03:00
Dmitry Stogov
a983b728a7
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-05 21:45:08 +03:00
Bob Weinand
46d708a1b6
Fix PHP-7.0 build (wrong fix for the branch)
2016-12-03 23:39:54 +01:00
Bob Weinand
146b68e022
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-03 18:28:47 +01:00
Bob Weinand
ffc1ef1eed
Fix leak when using $this outside of object context
2016-12-03 18:28:08 +01:00
Nikita Popov
91d365f805
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-02 17:03:59 +01:00
Nikita Popov
8f7325fc24
Fix leak in shift_right_function
2016-12-02 17:03:05 +01:00
Bob Weinand
7b5e89de82
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-02 15:42:19 +01:00
Bob Weinand
3c1a0d75bf
Fix test of wrong operator in self_xor.phpt
2016-12-02 15:41:47 +01:00
Dmitry Stogov
af2d47c9c7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Eliminated useless exception check
2016-12-02 15:40:04 +03:00
Dmitry Stogov
68558ab71d
Eliminated useless exception check
2016-12-02 15:39:33 +03:00
Dmitry Stogov
b3a4de65cd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-02 15:14:37 +03:00
Dmitry Stogov
2b70d44b57
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-02 15:13:55 +03:00
Dmitry Stogov
5a57b3d6e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
2016-12-02 14:00:29 +03:00
Dmitry Stogov
dbf39cddd9
Fixed behavior of failing compound assignments (they shouldn't change the source value).
2016-12-02 13:58:44 +03:00
Davey Shafik
2f5090168f
Bump versions and NEWS for 7.1.1-dev
2016-12-02 02:24:54 -08:00
Dmitry Stogov
04500f1fe0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed possible memory leak in &=, |=, ^=.
2016-12-02 12:35:44 +03:00
Dmitry Stogov
67d90a4870
Fixed possible memory leak in &=, |=, ^=.
2016-12-02 12:34:46 +03:00
Bob Weinand
ad5038bfee
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-01 15:21:49 +01:00
Bob Weinand
fcaccbaa22
Fix valgrind issue when throwing due to yield from aborted generator
2016-12-01 15:21:28 +01:00
Dmitry Stogov
cabcf8971f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
2016-11-28 12:57:02 +03:00
Dmitry Stogov
9a9ad56af0
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
2016-11-28 12:54:47 +03:00
Dmitry Stogov
458c732ed4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed calling generators through magic __call()
2016-11-28 12:30:01 +03:00
Dmitry Stogov
970f21be97
Fixed calling generators through magic __call()
2016-11-28 12:20:19 +03:00
Xinchen Hui
c1c91c95a6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
2016-11-24 12:03:44 +08:00
Xinchen Hui
e19d263d81
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
...
Actually, I doubt how thing bug could be triggered
2016-11-24 12:02:02 +08:00
Dmitry Stogov
cffa004240
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed use after free
2016-11-22 13:28:49 +03:00
Dmitry Stogov
0cf69234e9
Fixed use after free
2016-11-22 13:28:27 +03:00
Dmitry Stogov
4495ea4740
Micro-optimization
2016-11-22 12:06:39 +03:00
Dmitry Stogov
8d70b04a1c
Removed useless (double) checks for EG(exception). (Bob)
2016-11-22 11:50:48 +03:00
Dmitry Stogov
db5bbe94be
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed memory leak (Bob)
2016-11-22 11:22:55 +03:00
Dmitry Stogov
63ea4d194b
Fixed memory leak (Bob)
2016-11-22 11:22:10 +03:00
Anatol Belski
b10de2f5c2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "fix invalid read, follow up on 97b65cc9"
2016-11-22 02:59:17 +01:00
Anatol Belski
0da08fe595
Revert "fix invalid read, follow up on 97b65cc9"
...
This reverts commit b52fa5882a .
2016-11-22 02:52:23 +01:00
Anatol Belski
189df8e732
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix invalid read, follow up on 97b65cc9
2016-11-22 02:30:16 +01:00
Anatol Belski
b52fa5882a
fix invalid read, follow up on 97b65cc9
2016-11-22 02:28:45 +01:00