]>
granicus.if.org Git - php/log
Xinchen Hui [Thu, 30 Oct 2014 08:00:08 +0000 (16:00 +0800)]
Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot)
Xinchen Hui [Thu, 30 Oct 2014 03:54:00 +0000 (11:54 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 30 Oct 2014 03:52:29 +0000 (11:52 +0800)]
Use macro
Xinchen Hui [Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Thu, 30 Oct 2014 03:42:02 +0000 (11:42 +0800)]
Fixed build.... (shouldn't it be zend_output_globals?)
Anatol Belski [Wed, 29 Oct 2014 19:04:56 +0000 (20:04 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Anatol Belski [Wed, 29 Oct 2014 19:03:28 +0000 (20:03 +0100)]
fix output globals importing
Anatol Belski [Wed, 29 Oct 2014 19:02:41 +0000 (20:02 +0100)]
export output globals
needed by phpdbg
Anatol Belski [Wed, 29 Oct 2014 18:49:20 +0000 (19:49 +0100)]
use portable strndup implementation
Anatol Belski [Wed, 29 Oct 2014 18:39:46 +0000 (19:39 +0100)]
unix sockets aren't available on windows
Anatol Belski [Wed, 29 Oct 2014 18:32:52 +0000 (19:32 +0100)]
dll export APIs needed by phpdbg
Anatol Belski [Wed, 29 Oct 2014 18:28:21 +0000 (19:28 +0100)]
fix sapi/phpdbg/config.w32
Anatol Belski [Wed, 29 Oct 2014 13:33:50 +0000 (14:33 +0100)]
fix datatype mismatches
Anatol Belski [Wed, 29 Oct 2014 13:28:16 +0000 (14:28 +0100)]
fix datatype mismatches
sizeof(struct _string) doesn't increase.
Anatol Belski [Wed, 29 Oct 2014 13:09:30 +0000 (14:09 +0100)]
fix datatype mismatch
Anatol Belski [Wed, 29 Oct 2014 12:46:58 +0000 (13:46 +0100)]
fix datatype mismatches
especially spl_dual_it_object current.pos should have the same datatype as
limit.offset, also this doesn't increase the struct size.
Anatol Belski [Wed, 29 Oct 2014 12:36:10 +0000 (13:36 +0100)]
fix datatype mismatches
PCRE uses plain datatypes, no typedefs.
Anatol Belski [Wed, 29 Oct 2014 10:48:29 +0000 (11:48 +0100)]
fix the comparison return value
Anatol Belski [Wed, 29 Oct 2014 10:39:54 +0000 (11:39 +0100)]
fix datatype mismatch
Anatol Belski [Tue, 28 Oct 2014 19:12:20 +0000 (20:12 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 19:11:53 +0000 (20:11 +0100)]
fix datatype mismatch warning
Anatol Belski [Tue, 28 Oct 2014 18:59:31 +0000 (19:59 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 18:50:06 +0000 (19:50 +0100)]
fix datatype mismatch warnings
Anatol Belski [Tue, 28 Oct 2014 18:32:51 +0000 (19:32 +0100)]
fix datatype mismatch warns
Anatol Belski [Tue, 28 Oct 2014 18:29:07 +0000 (19:29 +0100)]
fix datatype mismatch warn
Anatol Belski [Tue, 28 Oct 2014 18:25:55 +0000 (19:25 +0100)]
fix datatype mismatch warnings
Anatol Belski [Tue, 28 Oct 2014 18:18:47 +0000 (19:18 +0100)]
fix "inconsistent dll linkage" warning caused by bison
stdlib.h might not be always using _STDLIB_H, that will move bison
to redeclare the malloc/free prototypes.
Anatol Belski [Tue, 28 Oct 2014 17:43:22 +0000 (18:43 +0100)]
fix datatype mismatch warnings
Matteo Beccati [Wed, 29 Oct 2014 13:32:41 +0000 (14:32 +0100)]
Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
Matteo Beccati [Wed, 29 Oct 2014 13:32:41 +0000 (14:32 +0100)]
Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
Bob Weinand [Wed, 29 Oct 2014 10:44:46 +0000 (11:44 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Wed, 29 Oct 2014 10:43:01 +0000 (11:43 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Wed, 29 Oct 2014 10:40:56 +0000 (11:40 +0100)]
Merge php-src into phpdbg
Matteo Beccati [Wed, 29 Oct 2014 10:32:57 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Matteo Beccati [Wed, 29 Oct 2014 10:32:12 +0000 (11:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Conflicts:
configure.in
main/php_version.h
Matteo Beccati [Wed, 29 Oct 2014 10:26:22 +0000 (11:26 +0100)]
Fixed test to work with recent libcurl versions
Bob Weinand [Wed, 29 Oct 2014 10:28:09 +0000 (11:28 +0100)]
Enable shared builds for webhelper
Remi Collet [Wed, 29 Oct 2014 06:26:58 +0000 (07:26 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
cleanup uneeded json
Remi Collet [Wed, 29 Oct 2014 06:26:41 +0000 (07:26 +0100)]
cleanup uneeded json
Remi Collet [Wed, 29 Oct 2014 06:26:41 +0000 (07:26 +0100)]
cleanup uneeded json
Bob Weinand [Tue, 28 Oct 2014 22:07:46 +0000 (23:07 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 22:07:36 +0000 (23:07 +0100)]
Move missing zend_hash_* macros from phpdbg.h to zend_hash.h
Bob Weinand [Tue, 28 Oct 2014 22:06:50 +0000 (23:06 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 22:06:50 +0000 (23:06 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 22:06:32 +0000 (23:06 +0100)]
Removed last HAVE_JSON check
Bob Weinand [Tue, 28 Oct 2014 22:00:10 +0000 (23:00 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg_wait.c
sapi/phpdbg/phpdbg_webdata_transfer.c
Bob Weinand [Tue, 28 Oct 2014 21:44:29 +0000 (22:44 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:44:29 +0000 (22:44 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 21:33:41 +0000 (22:33 +0100)]
Fix versions & config.m4
Bob Weinand [Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)]
Merge ../phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/config.m4
Bob Weinand [Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)]
Merge ../phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/config.m4
Bob Weinand [Tue, 28 Oct 2014 21:14:35 +0000 (22:14 +0100)]
Use serialize instead of json for transfer
Bob Weinand [Tue, 28 Oct 2014 21:11:30 +0000 (22:11 +0100)]
Add webhelper in config.w32
Bob Weinand [Tue, 28 Oct 2014 20:15:47 +0000 (21:15 +0100)]
Merge php-src into phpdbg
Conflicts:
config.m4
Remi Collet [Tue, 28 Oct 2014 18:13:27 +0000 (19:13 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix phpdbg build when src tree != build tree
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree
Bob Weinand [Tue, 28 Oct 2014 16:43:15 +0000 (17:43 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Tue, 28 Oct 2014 16:42:38 +0000 (17:42 +0100)]
Merge ../phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 16:40:27 +0000 (17:40 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
configure.in
main/php_version.h
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_prompt.c
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Anatol Belski [Tue, 28 Oct 2014 16:23:40 +0000 (17:23 +0100)]
rework fix to php_com_do_invoke_byref,
fix crashing function with void arguments
Anatol Belski [Tue, 28 Oct 2014 16:06:37 +0000 (17:06 +0100)]
fix possible zero deref
Anatol Belski [Tue, 28 Oct 2014 15:52:49 +0000 (16:52 +0100)]
fix error code upcast on x64
Anatol Belski [Tue, 28 Oct 2014 15:37:04 +0000 (16:37 +0100)]
several fixes to com_dotnet for x64
Anatol Belski [Tue, 28 Oct 2014 15:10:27 +0000 (16:10 +0100)]
exclude the 32 bit only test
Anatol Belski [Tue, 28 Oct 2014 15:09:17 +0000 (16:09 +0100)]
initialize the input arg lengths
Anatol Belski [Tue, 28 Oct 2014 09:43:58 +0000 (10:43 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 28 Oct 2014 09:43:10 +0000 (10:43 +0100)]
convert API for size_t where zend_string is used under the hood
Anatol Belski [Mon, 27 Oct 2014 18:51:14 +0000 (19:51 +0100)]
fix signature, zend_string is used for function name
Anatol Belski [Mon, 27 Oct 2014 18:36:29 +0000 (19:36 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 18:23:03 +0000 (19:23 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 17:57:51 +0000 (18:57 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:49:15 +0000 (18:49 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 17:46:46 +0000 (18:46 +0100)]
fix datatype mismatch warns
Anatol Belski [Mon, 27 Oct 2014 17:42:45 +0000 (18:42 +0100)]
fix datatype mismatch
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Julien Pauli [Tue, 28 Oct 2014 15:00:19 +0000 (16:00 +0100)]
5.6.4 now
Julien Pauli [Tue, 28 Oct 2014 14:01:53 +0000 (15:01 +0100)]
PHP 5.5.20 now
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Xinchen Hui [Tue, 28 Oct 2014 09:40:54 +0000 (17:40 +0800)]
Addtion fix for bug #68252 , forget static variable hanlding
Xinchen Hui [Tue, 28 Oct 2014 09:36:03 +0000 (17:36 +0800)]
Fixed bug #68252 (segfault in Zend/zend_hash.c in function _zend_hash_del_el)
Don't leave a UNDEF gap in function_table