]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 28 Nov 2014 16:45:39 +0000 (19:45 +0300)]
Avoid useless dereferences
Dmitry Stogov [Fri, 28 Nov 2014 13:50:35 +0000 (16:50 +0300)]
Removed useless check
Julien Pauli [Fri, 28 Nov 2014 12:36:16 +0000 (13:36 +0100)]
updated NEWS
Julien Pauli [Fri, 28 Nov 2014 12:31:53 +0000 (13:31 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
Conflicts:
Zend/zend_compile.c
Julien Pauli [Fri, 28 Nov 2014 12:27:46 +0000 (13:27 +0100)]
updated NEWS
Julien Pauli [Fri, 28 Nov 2014 12:26:53 +0000 (13:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
Julien Pauli [Fri, 28 Nov 2014 12:26:20 +0000 (13:26 +0100)]
updated NEWS
Julien Pauli [Wed, 29 Oct 2014 13:35:51 +0000 (14:35 +0100)]
Fix #65419 - Inside trait, self::class != __CLASS__
Anatol Belski [Fri, 28 Nov 2014 11:25:08 +0000 (12:25 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
Anatol Belski [Fri, 28 Nov 2014 11:24:32 +0000 (12:24 +0100)]
disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
Anatol Belski [Fri, 28 Nov 2014 09:17:22 +0000 (10:17 +0100)]
Fixed bug #68225 unpack and X format code
This is done by reverting some parts to the state of pre 7, whereby
that means all the size_t potential isn't exhausted. This might be
a subject of the subsequent fix, the functionality can be ensured
with the supplied test.
Dmitry Stogov [Fri, 28 Nov 2014 08:11:33 +0000 (11:11 +0300)]
Rename EX_VAR_2() into ZEND_CALL_VAR() and EX_VAR_NUM_2() into ZEND_CALL_VAR_NUM().
Dmitry Stogov [Fri, 28 Nov 2014 07:33:03 +0000 (10:33 +0300)]
Pack EX(frame_info) into EX(This).u1.v.reserved. Rename "frame"kind" into "call_kind" and VM_FRAME_... into ZEND_CALL_...
Dmitry Stogov [Fri, 28 Nov 2014 07:28:49 +0000 (10:28 +0300)]
Pack EX(num_args) into EX(This).u2.num_args
Dmitry Stogov [Fri, 28 Nov 2014 07:21:18 +0000 (10:21 +0300)]
Get rid of EX(scope). In most cases we use EG(scope) anyway. EX(scope) was used to switch EG(scope) back after call, but it's possibleto use EX(func)->common.scope instead.
Anatol Belski [Thu, 27 Nov 2014 12:40:34 +0000 (13:40 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
refactored the mbstring config.w32
Fixed bug #68504 --with-libmbfl configure option not present on Windows
Anatol Belski [Thu, 27 Nov 2014 12:40:07 +0000 (13:40 +0100)]
updated NEWS
Anatol Belski [Thu, 27 Nov 2014 12:39:23 +0000 (13:39 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
refactored the mbstring config.w32
Fixed bug #68504 --with-libmbfl configure option not present on Windows
Anatol Belski [Thu, 27 Nov 2014 12:37:00 +0000 (13:37 +0100)]
refactored the mbstring config.w32
Julien Pauli [Thu, 27 Nov 2014 10:40:48 +0000 (11:40 +0100)]
Update NEWS
Julien Pauli [Thu, 27 Nov 2014 10:22:23 +0000 (11:22 +0100)]
Merge branch 'pull-request/826'
* pull-request/826:
New label length test
Fix ext/filter/tests/033.phpt
Fix filter_list test
FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL
Dmitry Stogov [Thu, 27 Nov 2014 09:52:31 +0000 (12:52 +0300)]
Fixed compilation warnings
Anatol Belski [Thu, 27 Nov 2014 08:14:47 +0000 (09:14 +0100)]
Fixed bug #68504 --with-libmbfl configure option not present on Windows
Dmitry Stogov [Thu, 27 Nov 2014 06:56:43 +0000 (09:56 +0300)]
Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead.
Ferenc Kovacs [Wed, 26 Nov 2014 23:13:33 +0000 (00:13 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Ferenc Kovacs [Wed, 26 Nov 2014 23:13:11 +0000 (00:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 26 Nov 2014 23:08:40 +0000 (00:08 +0100)]
the darwin specific test fails for me with the same output which is the expected for the original test
I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on
qa.php.net/reports and on google which do see this test failing on mac.
if this change causes you to have this test failing on Mac, please drop me a mail so we can improve
the current test so it passes for everybody.
Ferenc Kovacs [Wed, 26 Nov 2014 22:15:51 +0000 (23:15 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
#68446 is fixed
Ferenc Kovacs [Wed, 26 Nov 2014 22:12:49 +0000 (23:12 +0100)]
#68446 is fixed
Dmitry Stogov [Wed, 26 Nov 2014 19:44:58 +0000 (22:44 +0300)]
Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region.
Ferenc Kovacs [Wed, 26 Nov 2014 18:14:10 +0000 (19:14 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
remove the NEWS entries for the reverted stuff
Ferenc Kovacs [Wed, 26 Nov 2014 18:13:46 +0000 (19:13 +0100)]
remove the NEWS entries for the reverted stuff
Ferenc Kovacs [Wed, 26 Nov 2014 17:42:53 +0000 (18:42 +0100)]
Merge branch 'PHP-5.6'
merge phpdbg commits from PHP-5.6 but keep the phpdbg unchanged in master
Ferenc Kovacs [Wed, 26 Nov 2014 17:41:50 +0000 (18:41 +0100)]
typo fix
Ferenc Kovacs [Wed, 26 Nov 2014 17:38:36 +0000 (18:38 +0100)]
go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol)
Julien Pauli [Wed, 26 Nov 2014 10:31:58 +0000 (11:31 +0100)]
5.5.21 now
Ferenc Kovacs [Wed, 26 Nov 2014 09:24:18 +0000 (10:24 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
PHP-5.6.5 is next
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 26 Nov 2014 09:21:37 +0000 (10:21 +0100)]
PHP-5.6.5 is next
Anatol Belski [Wed, 26 Nov 2014 07:35:29 +0000 (08:35 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated lib versions
updated lib versions
Anatol Belski [Wed, 26 Nov 2014 07:35:00 +0000 (08:35 +0100)]
updated lib versions
Anatol Belski [Wed, 26 Nov 2014 07:33:32 +0000 (08:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated lib versions
Anatol Belski [Wed, 26 Nov 2014 07:33:06 +0000 (08:33 +0100)]
updated lib versions
Anatol Belski [Tue, 25 Nov 2014 17:16:55 +0000 (18:16 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
Anatol Belski [Tue, 25 Nov 2014 17:16:26 +0000 (18:16 +0100)]
fix dir separator in test
Anatol Belski [Tue, 25 Nov 2014 16:58:20 +0000 (17:58 +0100)]
fix TS build
Anatol Belski [Tue, 25 Nov 2014 16:57:51 +0000 (17:57 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix TS build
Anatol Belski [Tue, 25 Nov 2014 16:56:28 +0000 (17:56 +0100)]
fix TS build
Dmitry Stogov [Tue, 25 Nov 2014 15:12:30 +0000 (18:12 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Better fix for bug #68446
Dmitry Stogov [Tue, 25 Nov 2014 15:09:08 +0000 (18:09 +0300)]
Better fix for bug #68446
Dmitry Stogov [Tue, 25 Nov 2014 12:40:08 +0000 (15:40 +0300)]
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
This reverts commit
38229d13d14bb0bda736d52a9a4f25c121445692 , reversing
changes made to
77f172725a37c8ddee750bf6970529a1570fbc86 .
Bob Weinand [Tue, 25 Nov 2014 12:05:36 +0000 (13:05 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
Zend/zend_compile.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Bob Weinand [Tue, 25 Nov 2014 11:27:17 +0000 (12:27 +0100)]
Revert NEWS and set test to XFAIL
Bob Weinand [Tue, 25 Nov 2014 11:24:29 +0000 (12:24 +0100)]
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
This reverts commit
5ef138b0c7c4e9532e205f45c18a72aa1d279c24 .
Dmitry Stogov [Tue, 25 Nov 2014 11:17:21 +0000 (14:17 +0300)]
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Dmitry Stogov [Tue, 25 Nov 2014 10:05:35 +0000 (13:05 +0300)]
Use inline version of zval_ptr_dtor()
Dmitry Stogov [Tue, 25 Nov 2014 09:58:29 +0000 (12:58 +0300)]
Added new optimized zend_array_destroy() function
Dmitry Stogov [Tue, 25 Nov 2014 09:37:46 +0000 (12:37 +0300)]
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
krakjoe [Tue, 25 Nov 2014 08:37:02 +0000 (08:37 +0000)]
Merge branch 'master' of https://github.com/php/php-src
krakjoe [Tue, 25 Nov 2014 08:36:30 +0000 (08:36 +0000)]
fix REGISTER_NS_*_CONSTANT macros
Dmitry Stogov [Tue, 25 Nov 2014 08:33:57 +0000 (11:33 +0300)]
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Dmitry Stogov [Mon, 24 Nov 2014 22:22:59 +0000 (01:22 +0300)]
Use specialized destructors when types of zvals are known.
Stanislav Malyshev [Mon, 24 Nov 2014 20:27:04 +0000 (12:27 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move tests into proper place
Stanislav Malyshev [Mon, 24 Nov 2014 20:26:50 +0000 (12:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move tests into proper place
Stanislav Malyshev [Mon, 24 Nov 2014 20:26:20 +0000 (12:26 -0800)]
move tests into proper place
Dmitry Stogov [Mon, 24 Nov 2014 20:19:24 +0000 (23:19 +0300)]
Improved assignment to object property
Dmitry Stogov [Mon, 24 Nov 2014 17:33:27 +0000 (20:33 +0300)]
Reuse zend_assign_to_variable() in zend_std_write_property()
Popa Adrian Marius [Mon, 24 Nov 2014 16:40:20 +0000 (18:40 +0200)]
cleanup comments from svn/cvs era
Anatol Belski [Mon, 24 Nov 2014 15:27:43 +0000 (16:27 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
fork test for windows
update for LiteSpeed
update for LiteSpeed
Anatol Belski [Mon, 24 Nov 2014 15:25:38 +0000 (16:25 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in test
fork test for windows
update for LiteSpeed
Anatol Belski [Mon, 24 Nov 2014 15:14:17 +0000 (16:14 +0100)]
fix dir separator in test
Anatol Belski [Mon, 24 Nov 2014 15:09:26 +0000 (16:09 +0100)]
fork test for windows
Dmitry Stogov [Mon, 24 Nov 2014 14:20:49 +0000 (17:20 +0300)]
Use inline version of the function in the loop
Dmitry Stogov [Mon, 24 Nov 2014 12:46:34 +0000 (15:46 +0300)]
Micro optimization
Remi Collet [Mon, 24 Nov 2014 08:38:36 +0000 (09:38 +0100)]
FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+ IPv4-mapped)
Sobak [Mon, 28 Jul 2014 13:18:48 +0000 (15:18 +0200)]
Remove no longer used scripts
Stanislav Malyshev [Mon, 24 Nov 2014 02:03:24 +0000 (18:03 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 02:05:49 +0000 (18:05 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 02:05:26 +0000 (18:05 -0800)]
update for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 02:03:07 +0000 (18:03 -0800)]
update for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 01:53:00 +0000 (17:53 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
tests image gd
xmlwriter_full_end_element tests
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:50 +0000 (17:52 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
tests image gd
xmlwriter_full_end_element tests
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:43 +0000 (17:52 -0800)]
Merge branch 'pull-request/757' into PHP-5.5
* pull-request/757:
xmlwriter_full_end_element tests
Tests for writeAttributeNS and xmlwriter_write_attribute_ns
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:08 +0000 (17:52 -0800)]
Merge branch 'pull-request/782' into PHP-5.5
* pull-request/782:
tests image gd
Stanislav Malyshev [Mon, 24 Nov 2014 01:48:49 +0000 (17:48 -0800)]
Merge branch 'pull-request/752'
* pull-request/752:
Updated NEWS regarding LiteSpeed SAPI
Stanislav Malyshev [Mon, 24 Nov 2014 01:26:35 +0000 (17:26 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
test to function addcslashes
test
Test PHP Init Fail Without Params
Add my information to this test
Add a test for the exception cases of readline_read_history
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
teste basico da funcao timezone_version_get
Stanislav Malyshev [Mon, 24 Nov 2014 01:26:28 +0000 (17:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add my information to this test
Add a test for the exception cases of readline_read_history
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
teste basico da funcao timezone_version_get
Stanislav Malyshev [Mon, 24 Nov 2014 01:23:34 +0000 (17:23 -0800)]
Merge branch 'pull-request/854' into PHP-5.5
* pull-request/854:
teste basico da funcao timezone_version_get
Stanislav Malyshev [Mon, 24 Nov 2014 01:22:54 +0000 (17:22 -0800)]
Merge branch 'pull-request/855' into PHP-5.5
* pull-request/855:
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
Stanislav Malyshev [Mon, 24 Nov 2014 01:22:02 +0000 (17:22 -0800)]
Merge branch 'pull-request/856' into PHP-5.5
* pull-request/856:
Add my information to this test
Add a test for the exception cases of readline_read_history
Stanislav Malyshev [Mon, 24 Nov 2014 01:21:29 +0000 (17:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Test PHP Init Fail Without Params
Stanislav Malyshev [Mon, 24 Nov 2014 01:21:20 +0000 (17:21 -0800)]
Merge branch 'pull-request/863' into PHP-5.5
* pull-request/863:
Test PHP Init Fail Without Params
marcosptf [Fri, 24 Oct 2014 17:11:17 +0000 (15:11 -0200)]
test to function addcslashes
test to function bin2hex
marcosptf [Fri, 24 Oct 2014 17:08:27 +0000 (15:08 -0200)]
test
Stanislav Malyshev [Mon, 24 Nov 2014 01:14:46 +0000 (17:14 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update CODING_STANDARDS
Stanislav Malyshev [Mon, 24 Nov 2014 01:14:39 +0000 (17:14 -0800)]
Merge branch 'pull-request/811'
* pull-request/811:
Update CODING_STANDARDS
Archil Imnadze [Mon, 8 Sep 2014 09:13:34 +0000 (13:13 +0400)]
Update CODING_STANDARDS
Stanislav Malyshev [Mon, 24 Nov 2014 01:13:12 +0000 (17:13 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Correct two zlib tests to use a string, not a const
Stanislav Malyshev [Mon, 24 Nov 2014 01:13:03 +0000 (17:13 -0800)]
Merge branch 'pull-request/817'
* pull-request/817:
Correct two zlib tests to use a string, not a const
Stanislav Malyshev [Mon, 24 Nov 2014 01:12:52 +0000 (17:12 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct two zlib tests to use a string, not a const
Tim Siebels [Fri, 12 Sep 2014 13:04:32 +0000 (15:04 +0200)]
Correct two zlib tests to use a string, not a const