Xinchen Hui
463413db53
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
2017-07-21 12:02:54 +08:00
Joe Watkins
8c238c15bc
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:52:43 +01:00
Joe Watkins
2e82ed9b73
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:50:59 +01:00
Dmitry Stogov
27e01cd918
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 10:01:22 +03:00
Joe Watkins
68b312db7d
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:07:52 +01:00
Joe Watkins
e642375764
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 condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:07:24 +01:00
Joe Watkins
e24dcf97f1
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:06:52 +01:00
Joe Watkins
5b013e7935
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:28 +01:00
Joe Watkins
c961beb5de
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:11 +01:00
Joe Watkins
60b68f19f0
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:05:31 +01:00
Xinchen Hui
696bd37e67
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
2017-04-10 14:49:13 +08:00
Xinchen Hui
9398f15efd
Fixed condition check
2017-04-10 14:48:31 +08:00
Xinchen Hui
65d77812fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed condition check
2017-04-10 14:47:42 +08:00
Xinchen Hui
4bebcb84ad
Fixed condition check
2017-04-10 14:47:24 +08:00
Sara Golemon
2b86a89193
Update tests and add NEWS entry for phpdbg opcode dump change
2017-03-29 12:54:52 -07:00
Sara Golemon
764b529efd
Add extended_value to phpdbg opcode dump
2017-03-29 04:08:52 -07:00
Nikita Popov
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
Anatol Belski
c698299550
Interned strings unification for TS/NTS
...
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings
- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end
There is no runtime interning.
With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
2017-03-04 10:39:13 +01:00
Joe Watkins
c564924d31
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
...
This reverts commit 008fb28eaf
2017-02-27 19:21:10 +00:00
Joe Watkins
61ecad0f53
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:31 +00:00
Joe Watkins
7aa59a4440
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:54:48 +00:00
Bob Weinand
d4dd540233
Merge branch 'PHP-7.1'
2017-01-25 13:01:48 +01:00
Bob Weinand
d0272ef1ef
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-25 13:01:10 +01:00
Bob Weinand
c44efbbbb1
Fix copying too much leading to potential segfault
2017-01-25 13:00:48 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Anatol Belski
afb6ca2566
Finish remaining replacement uint => uint32_t
...
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
Bob Weinand
5d7ce72747
Merge branch 'PHP-7.1'
2016-12-22 00:42:05 +01:00
Bob Weinand
728502fc29
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 00:40:54 +01:00
Bob Weinand
3b2b080cbc
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
2016-12-22 00:39:24 +01:00
Bob Weinand
942d4d5614
Merge branch 'PHP-7.1'
2016-12-21 02:43:04 +01:00
Bob Weinand
7e2146293b
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 02:42:38 +01:00
Bob Weinand
becda86ae5
Fix issue with -- in phpdbg command line
2016-12-21 02:42:23 +01:00
Bob Weinand
c3ee875aec
Merge branch 'PHP-7.1'
2016-12-20 20:18:53 +01:00
Bob Weinand
8b06b7e266
Fixed bug #73794 (Crash (out of memory) when using run and # command separator)
2016-12-20 20:18:36 +01:00
Bob Weinand
e4db84f231
Merge branch 'PHP-7.1'
2016-12-20 19:49:25 +01:00
Bob Weinand
3273f15412
Fix segfault in ZTS mode when just printing and exiting in phpdbg
2016-12-20 19:49:04 +01:00
Nikita Popov
ef1ed6ab8e
Merge branch 'PHP-7.1'
2016-12-14 18:11:51 +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
Bob Weinand
b149001ffd
Merge branch 'PHP-7.1'
2016-12-06 18:30:50 +01:00
Bob Weinand
43f88f25bb
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-06 18:30:37 +01:00
Bob Weinand
7e12b5da71
Fixed issue getting executable lines from custom wrappers
...
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +01:00
Nuno Lopes
d5a2af6d1c
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
2016-11-30 14:41:26 -05:00
Bob Weinand
c406d1e9b5
Merge branch 'PHP-7.1'
2016-11-30 11:45:36 +01:00
Bob Weinand
e37412e19c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-30 11:45:18 +01:00
Bob Weinand
344ef050aa
Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available
2016-11-30 11:44:10 +01:00
