]> granicus.if.org Git - php/log
php
10 years agoSimplify php_implode(). Fill the resulting string in direct order.
Dmitry Stogov [Tue, 23 Jun 2015 09:57:36 +0000 (12:57 +0300)]
Simplify php_implode(). Fill the resulting string in direct order.

10 years agobump API version to 6.8
George Wang [Tue, 23 Jun 2015 03:35:21 +0000 (23:35 -0400)]
bump API version to 6.8

10 years agoDrop duplicate object-to-type notices
Nikita Popov [Mon, 22 Jun 2015 14:24:11 +0000 (16:24 +0200)]
Drop duplicate object-to-type notices

We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Mon, 22 Jun 2015 14:07:25 +0000 (17:07 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Drop superfluous __toString handling code

10 years agoAdded comments
Dmitry Stogov [Mon, 22 Jun 2015 13:39:07 +0000 (16:39 +0300)]
Added comments

10 years agoDrop superfluous __toString handling code
Nikita Popov [Mon, 22 Jun 2015 13:33:41 +0000 (15:33 +0200)]
Drop superfluous __toString handling code

This is already covered by the cast_object invokation above it. We
do not use this kind of fallback in any other casting code anymore.

10 years agoThis macro is defined in zend_virtual_cwd.h, avoid redef
Kalle Sommer Nielsen [Mon, 22 Jun 2015 12:02:04 +0000 (14:02 +0200)]
This macro is defined in zend_virtual_cwd.h, avoid redef

10 years agoSilence the "1 file(s) copied" notice (from copying the manifest file)
Kalle Sommer Nielsen [Mon, 22 Jun 2015 11:56:35 +0000 (13:56 +0200)]
Silence the "1 file(s) copied" notice (from copying the manifest file)

10 years agoMerge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Mon, 22 Jun 2015 11:39:17 +0000 (13:39 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

10 years agoFix typo + DSP reference
Kalle Sommer Nielsen [Mon, 22 Jun 2015 11:30:12 +0000 (13:30 +0200)]
Fix typo + DSP reference

10 years agoRemove these old references to the DSP files we don't use anymore
Kalle Sommer Nielsen [Mon, 22 Jun 2015 11:29:42 +0000 (13:29 +0200)]
Remove these old references to the DSP files we don't use anymore

10 years agoAlso try __has_builtin() where builtins are used
Bob Weinand [Mon, 22 Jun 2015 11:24:39 +0000 (13:24 +0200)]
Also try __has_builtin() where builtins are used

10 years agoAdd phpdbg userland API to fetch oplog
Bob Weinand [Mon, 22 Jun 2015 10:56:29 +0000 (12:56 +0200)]
Add phpdbg userland API to fetch oplog
We may want to add some opcode info later, so that "opcodes" mode is more helpful

10 years agoAvoid overhead in RELEASE build.
Dmitry Stogov [Mon, 22 Jun 2015 10:08:33 +0000 (13:08 +0300)]
Avoid overhead in RELEASE build.

10 years agoFixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).
Dmitry Stogov [Mon, 22 Jun 2015 09:53:52 +0000 (12:53 +0300)]
Fixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).
compare_function() now has to be compatible with binary_op_type (use fastcall convention).
Introduced new zval_compare_function() to be used as zval comparison callback instead of compare_function().

10 years agoFixed bug #69897 (segfault when manually constructing SQLite3Result)
Kalle Sommer Nielsen [Mon, 22 Jun 2015 09:12:23 +0000 (11:12 +0200)]
Fixed bug #69897 (segfault when manually constructing SQLite3Result)

10 years agoRevert "Fix arginfo for built-in engine functions"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:57 +0000 (11:44 +0300)]
Revert "Fix arginfo for built-in engine functions"

This reverts commit d2356541d0386e3f0b6d593e2cc046ced68ff050.

10 years agoRevert "Fix set_error_handler() arginfo"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:49 +0000 (11:44 +0300)]
Revert "Fix set_error_handler() arginfo"

This reverts commit b5240280b089acad03616987cee4bb76d94c8c56.

10 years agoRevert "And actually use this new arginfo data"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:39 +0000 (11:44 +0300)]
Revert "And actually use this new arginfo data"

This reverts commit 932c95fb3106d0f3fd742e3f2a01f749f6d69182.

10 years agoRevert "Fix each() arginfo"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:29 +0000 (11:44 +0300)]
Revert "Fix each() arginfo"

This reverts commit 19fd124bcf2380f8e928795d1fe1900a02635298.

10 years agoRevert "Fix genarginfo to respect by-ref passing"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:13 +0000 (11:44 +0300)]
Revert "Fix genarginfo to respect by-ref passing"

This reverts commit db6990a91b2ca931074b29886c7f7819b14bb021.

10 years agoRevert "Several return type fixes, still not completed... Incomplete prototypes :-/"
Dmitry Stogov [Mon, 22 Jun 2015 08:44:01 +0000 (11:44 +0300)]
Revert "Several return type fixes, still not completed... Incomplete prototypes :-/"

This reverts commit 851b95fc4911bcd0c88810a91367f2294ea5b6c1.

10 years agoSeveral return type fixes, still not completed... Incomplete prototypes :-/
Bob Weinand [Mon, 22 Jun 2015 08:36:42 +0000 (10:36 +0200)]
Several return type fixes, still not completed... Incomplete prototypes :-/

10 years agoFix genarginfo to respect by-ref passing
Bob Weinand [Mon, 22 Jun 2015 08:17:35 +0000 (10:17 +0200)]
Fix genarginfo to respect by-ref passing

10 years agoFix each() arginfo
Bob Weinand [Mon, 22 Jun 2015 08:03:14 +0000 (10:03 +0200)]
Fix each() arginfo

10 years agoAnd actually use this new arginfo data
Rasmus Lerdorf [Mon, 22 Jun 2015 04:12:48 +0000 (00:12 -0400)]
And actually use this new arginfo data

10 years agoFix set_error_handler() arginfo
Rasmus Lerdorf [Mon, 22 Jun 2015 03:48:00 +0000 (23:48 -0400)]
Fix set_error_handler() arginfo

10 years agoFix arginfo for built-in engine functions
Rasmus Lerdorf [Mon, 22 Jun 2015 01:49:07 +0000 (21:49 -0400)]
Fix arginfo for built-in engine functions

10 years agoFix accidental function related flag value reuse
Bob Weinand [Sun, 21 Jun 2015 23:36:17 +0000 (01:36 +0200)]
Fix accidental function related flag value reuse

10 years agoFix bad run_time_cache with Closure::call()
Bob Weinand [Sun, 21 Jun 2015 14:39:28 +0000 (16:39 +0200)]
Fix bad run_time_cache with Closure::call()
This also fixes a memory "leak" (memory is allocated on unbounded arena without limits) on each new Closure instantiation.
Closures with same scope now all share the same run_time_cache (as long as it is arena allocated)

10 years agoFix bug #68546 (json_decode cannot access property started with \0)
Jakub Zelenka [Sun, 21 Jun 2015 14:30:33 +0000 (15:30 +0100)]
Fix bug #68546 (json_decode cannot access property started with \0)

10 years agoFix segfault with scalar passed to typehint with not loaded class
Bob Weinand [Sat, 20 Jun 2015 23:35:22 +0000 (01:35 +0200)]
Fix segfault with scalar passed to typehint with not loaded class

10 years agoLoad/restore VM stack before unfinished generator cleanup
Nikita Popov [Sat, 20 Jun 2015 17:09:07 +0000 (19:09 +0200)]
Load/restore VM stack before unfinished generator cleanup

10 years agoFix bad test (oops)
Bob Weinand [Sat, 20 Jun 2015 16:59:41 +0000 (18:59 +0200)]
Fix bad test (oops)

10 years agoAdd test for previous commit
Nikita Popov [Sat, 20 Jun 2015 16:38:46 +0000 (18:38 +0200)]
Add test for previous commit

10 years agoFix generator memory leak
Nikita Popov [Sat, 20 Jun 2015 16:35:27 +0000 (18:35 +0200)]
Fix generator memory leak

Make sure HANDLE_EXCEPTION and generator unwinds stay in sync in
the future by extracting a common function.

10 years agoFix potential writes into wrong memory, ensure vm_stack integrity
Bob Weinand [Sat, 20 Jun 2015 16:28:51 +0000 (18:28 +0200)]
Fix potential writes into wrong memory, ensure vm_stack integrity
Fixes also a segfault on stack frames > 1 << 18 bytes
Stack frames, when reallocated, need to be marked as top frame of current stack page

10 years agoClean up zend_hash_compare implementation
Nikita Popov [Sat, 20 Jun 2015 15:35:16 +0000 (17:35 +0200)]
Clean up zend_hash_compare implementation

Split off zend_hash_compare_impl into separate function that does
not bother with recursion protection. We had two cases where
UNPROTECT_RECURSION was missing.

10 years agoFix bug #69891
Nikita Popov [Sat, 20 Jun 2015 15:23:58 +0000 (17:23 +0200)]
Fix bug #69891

10 years agoFixed bug #69893
Nikita Popov [Sat, 20 Jun 2015 15:14:48 +0000 (17:14 +0200)]
Fixed bug #69893

10 years agoMerge branch 'PHP-5.6'
Nikita Popov [Sat, 20 Jun 2015 14:50:37 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_hash.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 20 Jun 2015 14:40:27 +0000 (16:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed bug #69892
Nikita Popov [Sat, 20 Jun 2015 14:39:23 +0000 (16:39 +0200)]
Fixed bug #69892

10 years agoAdd missing NEWS entries
Kalle Sommer Nielsen [Sat, 20 Jun 2015 13:24:51 +0000 (15:24 +0200)]
Add missing NEWS entries

10 years agoFixed bug #69889
Nikita Popov [Sat, 20 Jun 2015 13:09:58 +0000 (15:09 +0200)]
Fixed bug #69889

There is one case that requires further discussion:

$foo = "test";
var_dump($foo[0.0] ?? "default");
var_dump(isset($foo[0.0]) ? $foo[0.0] : "default");

Here the former will currently return "t", while the latter also
returns "t" and additionally throws a notice.

I think we need to revisit the behavior of invalid types for string
offset access in PHP 7, as currently there is some mismatch between
what isset() does and what the access itself supports.

10 years agoFix bug #62922
Nikita Popov [Sat, 20 Jun 2015 12:38:03 +0000 (14:38 +0200)]
Fix bug #62922

Off by one error...

10 years agoAvoid unnecessary separations in VERIFY_RETURN_TYPE
Nikita Popov [Sat, 20 Jun 2015 11:57:37 +0000 (13:57 +0200)]
Avoid unnecessary separations in VERIFY_RETURN_TYPE

10 years agoDrop unnecessary %prec
Nikita Popov [Sat, 20 Jun 2015 11:10:51 +0000 (13:10 +0200)]
Drop unnecessary %prec

Leftover from a previous implementation

10 years agoupdated NEWS
Anatol Belski [Sat, 20 Jun 2015 07:33:37 +0000 (09:33 +0200)]
updated NEWS

10 years agoadd test for bug #69838
Anatol Belski [Sat, 20 Jun 2015 07:20:26 +0000 (09:20 +0200)]
add test for bug #69838

10 years agoFix bug #69838 OPCACHE Warning Internal error: wrong size calculation
Anatol Belski [Sat, 20 Jun 2015 07:18:00 +0000 (09:18 +0200)]
Fix bug #69838 OPCACHE Warning Internal error: wrong size calculation

This chunk is pre calculated with aligned size, so should it use it
at run time.

10 years agoMicro optimization
Xinchen Hui [Sat, 20 Jun 2015 02:48:18 +0000 (10:48 +0800)]
Micro optimization

10 years agoRemove unused var
Xinchen Hui [Sat, 20 Jun 2015 02:37:53 +0000 (10:37 +0800)]
Remove unused var

10 years agoThis test should be kept
Xinchen Hui [Fri, 19 Jun 2015 15:13:23 +0000 (23:13 +0800)]
This test should be kept

10 years agoBetter way to fix (Fix bug #69871 (short-circuiting failure with smart_branch))
Xinchen Hui [Fri, 19 Jun 2015 15:05:35 +0000 (23:05 +0800)]
Better way to fix (Fix bug #69871 (short-circuiting failure with smart_branch))

10 years agoRevert "Fix bug #69871 (short-circuiting failure with smart_branch)"
Xinchen Hui [Fri, 19 Jun 2015 15:03:23 +0000 (23:03 +0800)]
Revert "Fix bug #69871 (short-circuiting failure with smart_branch)"

This reverts commit fae6bedea5e094a1f6ddbd1a4453eaea340d1855.

10 years agoImprove strtr (Fixed a bug which the lenth check doesn't work at all)
Xinchen Hui [Fri, 19 Jun 2015 14:59:31 +0000 (22:59 +0800)]
Improve strtr (Fixed a bug which the lenth check doesn't work at all)

10 years agoRemove the references to imageps*() after the T1Lib removal (Noticed by Ferenc)
Kalle Sommer Nielsen [Fri, 19 Jun 2015 12:55:10 +0000 (14:55 +0200)]
Remove the references to imageps*() after the T1Lib removal (Noticed by Ferenc)

10 years agoFixed Bug #69883 (Compilation failed on PCRE)
Xinchen Hui [Fri, 19 Jun 2015 12:33:14 +0000 (20:33 +0800)]
Fixed Bug #69883 (Compilation failed on PCRE)

10 years agomore precise way to destroy iterator object
Anatol Belski [Fri, 19 Jun 2015 12:23:32 +0000 (14:23 +0200)]
more precise way to destroy iterator object

which also fixes the iterator_to_array test

10 years agoupdated NEWS
Anatol Belski [Fri, 19 Jun 2015 10:48:14 +0000 (12:48 +0200)]
updated NEWS

10 years agoadded test for bug #69846
Anatol Belski [Fri, 19 Jun 2015 10:46:19 +0000 (12:46 +0200)]
added test for bug #69846

10 years agobetter approach to fix bug #69846
Anatol Belski [Fri, 19 Jun 2015 09:22:12 +0000 (11:22 +0200)]
better approach to fix bug #69846

don't destroy the current iterator object too early

10 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 19 Jun 2015 01:57:48 +0000 (09:57 +0800)]
Merge branch 'master' of git.php.net:php-src

10 years agoMicro optimizations for pcre
Xinchen Hui [Fri, 19 Jun 2015 01:56:42 +0000 (09:56 +0800)]
Micro optimizations for pcre

10 years agoFix memory leak (double copy) in SplPriorityQueue
Bob Weinand [Fri, 19 Jun 2015 01:42:52 +0000 (03:42 +0200)]
Fix memory leak (double copy) in SplPriorityQueue

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Fri, 19 Jun 2015 01:36:27 +0000 (09:36 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 19 Jun 2015 01:35:52 +0000 (09:35 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5
Xinchen Hui [Fri, 19 Jun 2015 01:35:28 +0000 (09:35 +0800)]
Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Thu, 18 Jun 2015 20:05:07 +0000 (22:05 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs

10 years agoupdate NEWS
Anatol Belski [Thu, 18 Jun 2015 20:04:55 +0000 (22:04 +0200)]
update NEWS

10 years agoupdate NEWS
Anatol Belski [Thu, 18 Jun 2015 20:04:03 +0000 (22:04 +0200)]
update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Thu, 18 Jun 2015 20:03:28 +0000 (22:03 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs

10 years agoupdated NEWS
Anatol Belski [Thu, 18 Jun 2015 20:02:37 +0000 (22:02 +0200)]
updated NEWS

10 years agofixes bug #69835: phpinfo() does not report many Windows SKUs
Christian Wenz [Mon, 15 Jun 2015 13:12:40 +0000 (15:12 +0200)]
fixes bug #69835: phpinfo() does not report many Windows SKUs

10 years agopartial fix to bug #69846
Anatol Belski [Thu, 18 Jun 2015 18:17:04 +0000 (20:17 +0200)]
partial fix to bug #69846

10 years agoRemove excess variable in mail.c (5.5 branch)
Sophia Nepochataya [Thu, 18 Jun 2015 17:06:08 +0000 (20:06 +0300)]
Remove excess variable in mail.c (5.5 branch)

10 years agoMinor updates to EXTENSIONS for removed SAPIS etc that I remembered off my head,...
Kalle Sommer Nielsen [Thu, 18 Jun 2015 15:22:22 +0000 (17:22 +0200)]
Minor updates to EXTENSIONS for removed SAPIS etc that I remembered off my head, also add Côme as a maintainer for ldap as per request[1].

[1] http://news.php.net/php.internals/86747

10 years agoadd a freshly built pear/install-pear-nozlib.phar. created from the current stable...
Ferenc Kovacs [Tue, 16 Jun 2015 15:59:27 +0000 (17:59 +0200)]
add a freshly built pear/install-pear-nozlib.phar. created from the current stable branch of pear-core and using the trunk from PHP_Archive where the ereg_ calls are removed already

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Thu, 18 Jun 2015 14:36:46 +0000 (17:36 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #69689 (Align PCRE_MINOR with current version)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Thu, 18 Jun 2015 14:35:54 +0000 (17:35 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69689 (Align PCRE_MINOR with current version)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Thu, 18 Jun 2015 14:34:53 +0000 (17:34 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)

10 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Thu, 18 Jun 2015 14:30:01 +0000 (22:30 +0800)]
Merge branch 'master' of git.php.net:php-src

10 years agoFixed bug #69689 (Align PCRE_MINOR with current version)
Lior Kaplan [Thu, 18 Jun 2015 14:30:21 +0000 (17:30 +0300)]
Fixed bug #69689 (Align PCRE_MINOR with current version)

10 years agoFixed bug #69872 (uninitialised value in strtr with array)
Xinchen Hui [Thu, 18 Jun 2015 14:28:29 +0000 (22:28 +0800)]
Fixed bug #69872 (uninitialised value in strtr with array)

10 years agoFix bug #69871 (short-circuiting failure with smart_branch)
Bob Weinand [Thu, 18 Jun 2015 13:58:46 +0000 (15:58 +0200)]
Fix bug #69871 (short-circuiting failure with smart_branch)

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Thu, 18 Jun 2015 13:57:04 +0000 (16:57 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add CVE to bugs #69545, #69646 and #69667

10 years agoAdd CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 13:56:06 +0000 (16:56 +0300)]
Add CVE to bugs #69545, #69646 and #69667

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Thu, 18 Jun 2015 13:52:51 +0000 (16:52 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add CVE to bugs #69545, #69646 and #69667

10 years agoAdd CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 13:51:20 +0000 (16:51 +0300)]
Add CVE to bugs #69545, #69646 and #69667

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Thu, 18 Jun 2015 12:50:11 +0000 (15:50 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add CVE to bugs #69545, #69646 and #69667

10 years agoAdd CVE to bugs #69545, #69646 and #69667
Lior Kaplan [Thu, 18 Jun 2015 12:45:10 +0000 (15:45 +0300)]
Add CVE to bugs #69545, #69646 and #69667

10 years agoUpdate NEWS
Xinchen Hui [Thu, 18 Jun 2015 11:59:15 +0000 (19:59 +0800)]
Update NEWS

10 years agoFixed Conditional jump or move depends on uninitialised value(s)
Xinchen Hui [Thu, 18 Jun 2015 11:56:08 +0000 (19:56 +0800)]
Fixed Conditional jump or move depends on uninitialised value(s)

reproduced by Bug #69868's test script

10 years agoFixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting)
Xinchen Hui [Thu, 18 Jun 2015 11:53:26 +0000 (19:53 +0800)]
Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting)

10 years agoFixed typo
Xinchen Hui [Thu, 18 Jun 2015 05:22:39 +0000 (13:22 +0800)]
Fixed typo

10 years agoSeems UPGRADING is not merged...
Xinchen Hui [Thu, 18 Jun 2015 05:12:01 +0000 (13:12 +0800)]
Seems UPGRADING is not merged...

10 years agoAdd tests with invalid Error construction params
Aaron Piotrowski [Thu, 18 Jun 2015 00:49:02 +0000 (19:49 -0500)]
Add tests with invalid Error construction params

10 years agoFix bug when constructing an Error with invalid params
Aaron Piotrowski [Thu, 18 Jun 2015 00:48:17 +0000 (19:48 -0500)]
Fix bug when constructing an Error with invalid params

10 years agocleanup unused var
Anatol Belski [Wed, 17 Jun 2015 22:53:23 +0000 (00:53 +0200)]
cleanup unused var