clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,320 Commits 494 Branches 1,367 Tags 786 MiB
3273f15412
Commit Graph

447 Commits

Author SHA1 Message Date
Bob Weinand
abfd811ea4 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-05 12:20:06 +02:00
Bob Weinand
4790da5475 Update run command for allowing STDIN 2016-10-05 12:14:02 +02:00
Bob Weinand
eaff72f31b Remove phpdbg fix targeting 7.1 which landed in 7.0 2016-10-05 12:08:20 +02:00
Bob Weinand
8fcc938e56 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-03 12:55:23 +02:00
Bob Weinand
8908df690f Fix crash on Linux due to double fclose() 2016-10-03 12:55:06 +02:00
Bob Weinand
f58cf8b24d Merge branch 'PHP-7.0' into PHP-7.1 2016-10-02 12:46:22 +01:00
Bob Weinand
417a8ef6b4 Fix run command args passing when inmidst execution 2016-10-02 12:45:20 +01:00
Bob Weinand
3fe1010cee Merge branch 'PHP-7.0' into PHP-7.1 2016-10-01 19:14:26 +01:00
Bob Weinand
9d537951c5 Add proper escape sequences and reading stdin from file in phpdbg run command 2016-10-01 19:05:19 +01:00
Bob Weinand
a5129bcb5b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-01 10:47:31 +01:00
Bob Weinand
3280a29ee5 Fix invalid access to interned strings after they are freed in phpdbg 2016-10-01 10:46:21 +01:00
Bob Weinand
e5d75d7268 Add phpdbg generator command 2016-09-28 13:26:08 +02:00
Anatol Belski
8f256bebef Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  phpdbg next command must stop when leaving function
 2016-09-23 11:25:33 +02:00
Bob Weinand
cf35dae6e2 phpdbg next command must stop when leaving function 2016-09-23 03:29:37 +02:00
Stanislav Malyshev
8c16f2262f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
 2016-09-04 23:24:31 -07:00
David Carlier
19350b6b73 phpdbg: couple of network function return checks. Possible 
overflow when copy the socket_path configuration.
 2016-09-04 23:18:51 -07:00
Nikita Popov
f1bfd7fe00 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 23:31:05 +02:00
Nikita Popov
1ae2d074f8 Fix bug #72996 2016-09-03 23:30:23 +02:00
Anatol Belski
0e709fe42d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dealloc mismatch
 2016-08-29 13:43:08 +02:00
Anatol Belski
eac7f4b670 fix dealloc mismatch 2016-08-29 12:46:23 +02:00
Anatol Belski
88d86aeb53 add missing header to fix build 2016-07-19 01:30:07 +02:00
Bob Weinand
517bbb14fd Disable optimizer when it conflicts with phpdbg tests 2016-07-13 10:22:00 +02:00
Bob Weinand
7a125a4409 Remove bogus zend_signal_shutdown symbol from header 2016-07-13 01:05:32 +02:00
Bob Weinand
d08cb90462 Cleanup zend_/signal usage in phpdbg.c 2016-07-13 00:37:25 +02:00
Bob Weinand
ef6d0c8b6d Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpoints 2016-07-12 20:50:51 +02:00
Bob Weinand
b00376884e Rewrite watchpoints to be much more stable 
This mainly involves a separate abstraction layer for elements (e.g. $a->b) and watchpoints (on pointer of the Bucket for example).
Also better comparison handling (value backup vs. page dumps).

It is not yet finished (there are sometimes false positives announced and names not yet perfect), but the functionality is working and not crashing as far as I have tested.
Future scope is also relative watchpoints, e.g. "w $this->val expression()" which does not have the symbol tables as basis, but the value (in this example: return value of expression()) as basis.
 2016-07-11 23:58:20 +02:00
Martin Vobruba
2809a676b5 Pass error severity to SAPI modules and raise corresponding error level in Apache 2016-07-11 09:34:48 +02:00
Dmitry Stogov
d898344663 Inline simple constant functions 2016-06-30 17:04:25 +03:00
Xinchen Hui
de7a6b1232 MFH: Fixed fd leak (the origin commit can not be cherry-picked) 2016-06-28 11:36:27 +08:00
David Carlier
85e985f191 couple of resource leaks fixes and use after free's 2016-06-27 07:44:21 +01:00
Dmitry Stogov
c22a1c83f3 Zend signals should be installed after request startup (or regular signals may be installed before zend_signal_startup) 2016-06-20 19:19:16 +03:00
Dmitry Stogov
c622cc4446 Fixed phpdbg build without --enable-zend-signals 2016-06-20 16:32:24 +03:00
Dmitry Stogov
c8706331b5 Cleanup zend_signal API 2016-06-20 14:58:42 +03:00
Anatol Belski
6bd3b8108a Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix condition
 2016-05-30 18:36:06 +02:00
Anatol Belski
2524ab9e67 fix condition 2016-05-30 18:35:14 +02:00
Bob Weinand
67468fb417 Fixed bug #72284 (phpdbg fatal errors with coverage) 
Cherry-pick of original commits d3371b and 0f20e11 only present in master
 2016-05-30 13:31:17 +02:00
Adam Harvey
38be3b28cb Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix typo in phpdbg help.
 2016-05-25 12:48:00 -05:00
Adam Harvey
c523dfdb49 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix typo in phpdbg help.
 2016-05-25 12:47:49 -05:00
Adam Harvey
54eb659032 Fix typo in phpdbg help. 
Sorry, I would have included this in the last push had I spotted it a
minute earlier.
 2016-05-25 12:47:35 -05:00
Adam Harvey
457d3ad36c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add missing newlines to phpdbg's help for the run command.
 2016-05-25 12:42:17 -05:00
Adam Harvey
ac29f9de86 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add missing newlines to phpdbg's help for the run command.
 2016-05-25 12:40:23 -05:00
Adam Harvey
e623e91e27 Add missing newlines to phpdbg's help for the run command. 
This is not at all related to needing screenshots for a talk I'm giving
in two days. No sir. Not at all.
 2016-05-25 12:38:41 -05:00
Dmitry Stogov
2ae21abdf7 Fixed bug #72213 (Finally leaks on nested exceptions). 
Squashed commit of the following:

commit 8461b0407f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:34:42 2016 +0300

    Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset.

commit 0c71e24964
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:04:53 2016 +0300

    Move SAVE_OPLINE() to its original place

commit 111432a4df
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:01:10 2016 +0300

    Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper.

commit 4f21c06c2e
Author: Nikita Popov <nikic@php.net>
Date:   Tue May 24 14:55:27 2016 +0200

    Improve finally fix

commit da5c727499
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 10:36:08 2016 +0300

    Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt

commit cfcedf2fb4
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 02:59:27 2016 +0300

    Added test

commit 4c6aa93d43
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 00:38:20 2016 +0300

    Added tests

commit 8a8f4704b0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon May 23 23:27:34 2016 +0300

    Fixed bug #72213 (Finally leaks on nested exceptions)
 2016-05-25 01:25:12 +03:00
Dmitry Stogov
be071702b3 Fixed bug #72188 (Nested try/finally blocks losing return value) 2016-05-13 14:38:43 +03:00
Bob Weinand
d33e71b358 Fix include_once in phpdbg 2016-05-07 14:45:41 +02:00
Bob Weinand
0f20e113c2 Fix potential double free with phpdbg 2016-05-03 13:36:41 +02:00
Dmitry Stogov
747a482b9c Don't initialize EX(call)->symbol_table on each function call. 
Keep it uninitialized, and check ZEND_CALL_HAS_SYMBOL_TABLE flag when necessary.
 2016-04-28 15:17:24 +03:00
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead. 
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
 2016-04-28 04:13:34 +03:00
Dmitry Stogov
f0a2e8eb13 Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
Joe Watkins
fef494f99f Merge branch 'PHP-7.0' 
* PHP-7.0:
  phpdbg: close file handles
 2016-04-12 13:40:36 +01:00
Joe Watkins
b04125da85 phpdbg: close file handles 2016-04-12 13:40:03 +01:00
Nikita Popov
8e5b139732 Evaluate arguments of new for classes without ctor 
ML: http://markmail.org/message/4b3mk7jid64zvz34
 2016-03-25 19:11:37 +01:00
Nikita Popov
24551ed6c8 Print .0 in phpdbg opcode dumps 2016-03-25 19:11:32 +01:00
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.

Conflicts:

	build/genif.sh
	build/order_by_dep.awk
 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