]>
granicus.if.org Git - php/log
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
Remi Collet [Tue, 28 Oct 2014 07:51:22 +0000 (08:51 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Ensure we have enough input data before parsing date
Remi Collet [Tue, 28 Oct 2014 07:50:48 +0000 (08:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Ensure we have enough input data before parsing date
Remi Collet [Tue, 28 Oct 2014 07:48:22 +0000 (08:48 +0100)]
Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=
ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
Stanislav Malyshev [Tue, 28 Oct 2014 02:10:43 +0000 (19:10 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #68095 - invalid read in php_getopt()
Stanislav Malyshev [Tue, 28 Oct 2014 02:07:32 +0000 (19:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #68095 - invalid read in php_getopt()
Stanislav Malyshev [Tue, 28 Oct 2014 02:04:46 +0000 (19:04 -0700)]
Fix bug #68095 - invalid read in php_getopt()
It's a hacky solution and incomplete, but I don't see other way
without refactoring the whole getopt protocol.
Anatol Belski [Mon, 27 Oct 2014 16:31:38 +0000 (17:31 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:28:01 +0000 (17:28 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 16:20:24 +0000 (17:20 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:16:24 +0000 (17:16 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 16:15:26 +0000 (17:15 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 16:04:44 +0000 (17:04 +0100)]
fix datatype mismatch warning
Anatol Belski [Mon, 27 Oct 2014 16:02:52 +0000 (17:02 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 15:38:05 +0000 (16:38 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 12:20:16 +0000 (13:20 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 27 Oct 2014 12:18:09 +0000 (13:18 +0100)]
fix datatype mismatch warns
Anatol Belski [Mon, 27 Oct 2014 12:17:37 +0000 (13:17 +0100)]
catch up with zend_html_puts
Anatol Belski [Mon, 27 Oct 2014 12:15:47 +0000 (13:15 +0100)]
fix datatype mismatches and warns
Anatol Belski [Mon, 27 Oct 2014 12:08:21 +0000 (13:08 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:27:57 +0000 (12:27 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:21:00 +0000 (12:21 +0100)]
fix datatype mismatches and warnings
Anatol Belski [Mon, 27 Oct 2014 11:08:57 +0000 (12:08 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 11:07:44 +0000 (12:07 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 11:03:05 +0000 (12:03 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 11:00:25 +0000 (12:00 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 27 Oct 2014 10:52:17 +0000 (11:52 +0100)]
fix datatype mismatch warnings
Anatol Belski [Mon, 27 Oct 2014 10:50:49 +0000 (11:50 +0100)]
fix datatype mismatches
Bob Weinand [Mon, 27 Oct 2014 13:32:58 +0000 (14:32 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg_bp.c
Bob Weinand [Mon, 27 Oct 2014 13:07:26 +0000 (14:07 +0100)]
Merge phpdbg into PHP-5.6