Nikita Popov
7ed893712f
Merge branch 'PHP-7.0'
...
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h
2016-03-03 23:20:50 +01:00
Nikita Popov
5602f64213
Eliminate usages of _PP macros
...
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
2016-03-03 23:20:12 +01:00
Nikita Popov
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Dmitry Stogov
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
Dmitry Stogov
960b3755b3
Merge branch 'PHP-7.0'
...
* PHP-7.0:
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:57:08 +03:00
Dmitry Stogov
908b662f7f
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:56:39 +03:00
Bob Weinand
eea576d589
Merge branch 'PHP-7.0'
2016-02-17 20:28:07 +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
Nikita Popov
2d605e5f24
Merge branch 'PHP-7.0'
2016-02-14 14:47:42 +01:00
Nikita Popov
c9357f82d3
Format string fixes
...
Conflicts:
ext/pgsql/pgsql.c
2016-02-14 14:45:53 +01:00
Nikita Popov
5983378364
Fix format attributes in ZTS
2016-02-14 14:44:27 +01:00
Bob Weinand
c7a18a4a24
Merge branch 'PHP-7.0'
2016-02-11 06:43:55 +01:00
Bob Weinand
1a01a5ec83
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()
...
See also https://github.com/krakjoe/phpdbg/issues/152
2016-02-11 06:42:51 +01:00
Nikita Popov
1c709f08c7
Merge branch 'PHP-7.0'
2016-01-29 17:03:32 +01:00
Guillaume Outters
10b2172f01
phpdbg config.m4: make it detectable by old shells
...
--enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator).
Replacing == with the historic = makes it pass.
2016-01-29 17:01:04 +01:00
Bob Weinand
cc9445ce68
Merge branch 'PHP-7.0'
2016-01-23 18:17:18 +01:00
Bob Weinand
65ef7f8c33
Use uint64_t for flags (warning)
2016-01-23 18:16:57 +01:00
Nikita Popov
af255c67eb
Make op1/op2 decoding in phpdbg more complete
2016-01-21 21:58:23 +01:00
Insu Yun
35d5cd5c6e
phpdbg: fix potential format string bug
2016-01-12 04:21:57 +00:00
Lior Kaplan
3d5438bf7b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update header to PHP Version 7
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
Lior Kaplan
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
41dcdb1d73
Merge branch 'PHP-7.0'
2016-01-01 13:46:44 +08:00
Xinchen Hui
05defb4f56
Fixed test after fix lineno of finally
2016-01-01 13:46:19 +08:00
Reeze Xia
bdadec4581
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Unused value casting should be `void`
2015-12-12 23:29:46 +08:00
Reeze Xia
95ad414658
Unused value casting should be void
2015-12-12 23:25:30 +08:00
Xinchen Hui
f43baba1f9
Fixed test by disable opcache
2015-12-10 21:46:37 +08:00
Xinchen Hui
e80791e161
Fixed test (opcache denpends)
2015-12-09 07:52:03 -08:00
Dmitry Stogov
404e003cf1
Delete empty live-ranges
2015-12-09 05:16:30 +03:00
Joe Watkins
03a43d50e1
standard tsrm usage for seven
2015-12-06 14:06:07 +01:00
Joe Watkins
003c91bd9b
standard tsrm usage for seven
2015-12-06 10:04:35 +00:00
Bob Weinand
9bbdb86ed7
Merge branch 'PHP-7.0'
2015-11-23 17:46:39 +01:00
Bob Weinand
c1189eccae
Output stderr on real stderr in phpdbg
2015-11-23 17:46:07 +01:00
Xinchen Hui
58168b48e2
Fixed tests (new opcache will optimize serias echo IS_CONST into one)
2015-11-22 06:49:28 -08:00
Xinchen Hui
ae196280bb
Revert pushed by mistake
...
Revert "Revert "Remove assumption that extensions are in ext/ext-name""
This reverts commit 7e47bf1e65
2015-11-16 18:04:29 +08:00
Xinchen Hui
7e47bf1e65
Revert "Remove assumption that extensions are in ext/ext-name"
...
This reverts commit 82b73fd1e3
2015-11-13 14:27:59 +08:00
Dmitry Stogov
86a96f2cf1
Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FAST_RET.
...
Previously it was an instruction number.
Now it's an index in op_array->try_cacth_array[].
2015-11-10 19:13:54 +03:00
Dmitry Stogov
648347536a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed incomplete initialization.
2015-10-30 07:16:31 +03:00
Dmitry Stogov
3c5a3e77d4
Fixed incomplete initialization.
2015-10-30 07:15:56 +03:00
Nuno Lopes
36311ee4fd
unbreak coverage data: fix #line directives in phpdbg parser
2015-10-24 18:12:24 -04:00
Nuno Lopes
a0665f3a18
unbreak coverage data: fix #line directives in phpdbg parser
2015-10-24 17:45:53 -04:00
Nuno Lopes
b5206970fb
unbreak coverage data: fix #line directives in phpdbg parser
2015-10-24 17:45:31 -04:00
Bob Weinand
387b7c7905
Merge branch 'PHP-7.0'
2015-10-20 21:56:20 +02:00
Bob Weinand
2ef327caed
Exempt paging from -qrr mode
2015-10-20 21:56:00 +02:00
Felipe Pena
b2466061d5
Merge branch 'PHP-7.0'
2015-10-18 12:10:03 -02:00
Felipe Pena
f231ddddaf
- Implemented output paging
2015-10-18 12:08:04 -02:00
Bob Weinand
bcf6012cf4
Merge branch 'PHP-7.0'
2015-10-13 15:51:42 +02:00
