]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 25 Jun 2015 15:56:14 +0000 (18:56 +0300)]
Optimize out usless conditions used by specializer
Anatol Belski [Thu, 25 Jun 2015 14:39:02 +0000 (16:39 +0200)]
update the doc in regard to the latest discussions
Anatol Belski [Thu, 25 Jun 2015 09:35:11 +0000 (11:35 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport missing rev
bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9
Anatol Belski [Thu, 25 Jun 2015 09:34:04 +0000 (11:34 +0200)]
Dmitry Stogov [Thu, 25 Jun 2015 09:02:28 +0000 (12:02 +0300)]
Better check for __builtin_constant_p() availability
Dmitry Stogov [Thu, 25 Jun 2015 08:22:21 +0000 (11:22 +0300)]
Moved test to correct place
Bob Weinand [Wed, 24 Jun 2015 22:35:52 +0000 (00:35 +0200)]
Fix paths issue when fetching .phpdbginit under Windows
Ferenc Kovacs [Wed, 24 Jun 2015 22:23:21 +0000 (00:23 +0200)]
Merge remote-tracking branch 'origin/PHP-5.6'
* origin/PHP-5.6:
5.6.12 next
Ferenc Kovacs [Wed, 24 Jun 2015 22:21:45 +0000 (00:21 +0200)]
5.6.12 next
Hannes Magnusson [Wed, 24 Jun 2015 15:24:11 +0000 (08:24 -0700)]
Typo (thanks kaplan@)
Xinchen Hui [Wed, 24 Jun 2015 13:44:31 +0000 (21:44 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Wed, 24 Jun 2015 13:35:13 +0000 (21:35 +0800)]
Micro optimization
Bob Weinand [Wed, 24 Jun 2015 13:29:26 +0000 (15:29 +0200)]
Passing a zend_string * to %s is a bad idea
Julien Pauli [Wed, 24 Jun 2015 08:45:42 +0000 (10:45 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.5.28 now - Security Only
Julien Pauli [Wed, 24 Jun 2015 08:42:41 +0000 (10:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.28 now - Security Only
Conflicts:
configure.in
main/php_version.h
Julien Pauli [Wed, 24 Jun 2015 08:41:06 +0000 (10:41 +0200)]
5.5.28 now - Security Only
Anatol Belski [Wed, 24 Jun 2015 08:21:54 +0000 (10:21 +0200)]
fix NEWS
Rasmus Lerdorf [Wed, 24 Jun 2015 03:53:23 +0000 (23:53 -0400)]
3rd arg to define() is optional
Rasmus Lerdorf [Wed, 24 Jun 2015 02:40:49 +0000 (22:40 -0400)]
Wrong arginfo on assert
(not adding types, just fixing a missing arg)
Hannes Magnusson [Wed, 24 Jun 2015 02:33:37 +0000 (19:33 -0700)]
PHP7 sounds like a good time to include signatures in announce mails
We need these posted as many places as possible to make any sense.
Hannes Magnusson [Wed, 24 Jun 2015 02:29:10 +0000 (19:29 -0700)]
space
Christoph M. Becker [Wed, 24 Jun 2015 00:04:34 +0000 (02:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Made bug44295-win.phpt locale independent
Christoph M. Becker [Tue, 23 Jun 2015 23:42:22 +0000 (01:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Made bug44295-win.phpt locale independent
Christoph M. Becker [Tue, 23 Jun 2015 23:41:33 +0000 (01:41 +0200)]
Made bug44295-win.phpt locale independent
Formerly it failed on non English installations.
Christoph M. Becker [Tue, 23 Jun 2015 23:15:44 +0000 (01:15 +0200)]
Merge branch 'master' of https://git.php.net/repository/php-src
# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src:
Fix more proto comments
prepare NEWS for next
Fix more minor mistakes in the proto comments
Avoid op_num = -1 in unfinished generator cleanup
Fix incorrect protos
Christoph M. Becker [Tue, 23 Jun 2015 22:54:20 +0000 (00:54 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:47:18 +0000 (00:47 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
Christoph M. Becker [Tue, 23 Jun 2015 22:42:24 +0000 (00:42 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:32:13 +0000 (00:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
Christoph M. Becker [Tue, 23 Jun 2015 22:31:07 +0000 (00:31 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:23:39 +0000 (00:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
Christoph M. Becker [Tue, 23 Jun 2015 22:20:32 +0000 (00:20 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 22:15:55 +0000 (00:15 +0200)]
Fixed bug #69768 (escapeshell*() doesn't cater to !)
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
Rasmus Lerdorf [Tue, 23 Jun 2015 21:46:07 +0000 (17:46 -0400)]
Fix more proto comments
Anatol Belski [Tue, 23 Jun 2015 20:25:36 +0000 (22:25 +0200)]
prepare NEWS for next
Rasmus Lerdorf [Tue, 23 Jun 2015 19:47:07 +0000 (15:47 -0400)]
Fix more minor mistakes in the proto comments
Nikita Popov [Tue, 23 Jun 2015 18:13:25 +0000 (20:13 +0200)]
Avoid op_num = -1 in unfinished generator cleanup
Also add two tests showing that the -1 substraction in the
computation of op_num is really necessary.
Rasmus Lerdorf [Tue, 23 Jun 2015 18:15:24 +0000 (14:15 -0400)]
Fix incorrect protos
Christoph M. Becker [Tue, 23 Jun 2015 17:44:22 +0000 (19:44 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 17:41:02 +0000 (19:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
Christoph M. Becker [Tue, 23 Jun 2015 17:36:59 +0000 (19:36 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 17:32:57 +0000 (19:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
Christoph M. Becker [Tue, 23 Jun 2015 17:32:18 +0000 (19:32 +0200)]
updated NEWS
Christoph M. Becker [Fri, 5 Jun 2015 12:40:03 +0000 (14:40 +0200)]
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
When advancing after empty matches, php_pcre_match_impl() as well as
php_pcre_replace_impl() always have to advance to the next code point when the
u modifier is given, instead of to the next byte.
Christoph M. Becker [Tue, 23 Jun 2015 15:34:33 +0000 (17:34 +0200)]
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:32:47 +0000 (17:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Moved NEWS entry for bug #69864 to proper category
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:30:31 +0000 (17:30 +0200)]
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:28:22 +0000 (17:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 15:27:21 +0000 (17:27 +0200)]
Moved NEWS entry for bug #69864 to proper category
Christoph M. Becker [Tue, 23 Jun 2015 14:52:14 +0000 (16:52 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 14:50:52 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69864 (Segfault in preg_replace_callback)
Christoph M. Becker [Tue, 23 Jun 2015 14:43:12 +0000 (16:43 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 14:36:35 +0000 (16:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #69864 (Segfault in preg_replace_callback)
Christoph M. Becker [Tue, 23 Jun 2015 14:24:06 +0000 (16:24 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed two errors in LDAP tests
bump API version to 6.8
bump API version to 6.8
Christoph M. Becker [Tue, 23 Jun 2015 14:22:08 +0000 (16:22 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
bump API version to 6.8
Côme Bernigaud [Tue, 23 Jun 2015 14:09:56 +0000 (16:09 +0200)]
Fixed two errors in LDAP tests
Côme Bernigaud [Tue, 23 Jun 2015 14:09:56 +0000 (16:09 +0200)]
Fixed two errors in LDAP tests
Dmitry Stogov [Tue, 23 Jun 2015 13:46:41 +0000 (16:46 +0300)]
Revert "Simplify php_implode(). Fill the resulting string in direct order."
The patch slightly improved performance of string imploding, but reduced speed of integers imploding.
This reverts commit
36d39b70443dcefeeb62d189ce67b414caf5486a .
Dmitry Stogov [Tue, 23 Jun 2015 13:27:21 +0000 (16:27 +0300)]
Encapsulate FastCGI implementation details.
Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
Dmitry Stogov [Tue, 23 Jun 2015 13:26:40 +0000 (16:26 +0300)]
Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER)
Christoph M. Becker [Tue, 23 Jun 2015 11:02:08 +0000 (13:02 +0200)]
updated NEWS
Christoph M. Becker [Tue, 23 Jun 2015 11:00:17 +0000 (13:00 +0200)]
Fixed bug #69864 (Segfault in preg_replace_callback)
When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.
Dmitry Stogov [Tue, 23 Jun 2015 09:57:36 +0000 (12:57 +0300)]
Simplify php_implode(). Fill the resulting string in direct order.
George Wang [Tue, 23 Jun 2015 03:40:34 +0000 (23:40 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Tue, 23 Jun 2015 03:39:53 +0000 (23:39 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Tue, 23 Jun 2015 03:38:38 +0000 (23:38 -0400)]
bump API version to 6.8
George Wang [Tue, 23 Jun 2015 03:38:38 +0000 (23:38 -0400)]
bump API version to 6.8
George Wang [Tue, 23 Jun 2015 03:38:38 +0000 (23:38 -0400)]
bump API version to 6.8
George Wang [Tue, 23 Jun 2015 03:35:21 +0000 (23:35 -0400)]
bump API version to 6.8
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.
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
Dmitry Stogov [Mon, 22 Jun 2015 13:39:07 +0000 (16:39 +0300)]
Added comments
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.
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
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)
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
Kalle Sommer Nielsen [Mon, 22 Jun 2015 11:30:12 +0000 (13:30 +0200)]
Fix typo + DSP reference
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
Bob Weinand [Mon, 22 Jun 2015 11:24:39 +0000 (13:24 +0200)]
Also try __has_builtin() where builtins are used
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
Dmitry Stogov [Mon, 22 Jun 2015 10:08:33 +0000 (13:08 +0300)]
Avoid overhead in RELEASE build.
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().
Kalle Sommer Nielsen [Mon, 22 Jun 2015 09:12:23 +0000 (11:12 +0200)]
Fixed bug #69897 (segfault when manually constructing SQLite3Result)
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 .
Dmitry Stogov [Mon, 22 Jun 2015 08:44:49 +0000 (11:44 +0300)]
Revert "Fix set_error_handler() arginfo"
This reverts commit
b5240280b089acad03616987cee4bb76d94c8c56 .
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 .
Dmitry Stogov [Mon, 22 Jun 2015 08:44:29 +0000 (11:44 +0300)]
Revert "Fix each() arginfo"
This reverts commit
19fd124bcf2380f8e928795d1fe1900a02635298 .
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 .
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 .
Bob Weinand [Mon, 22 Jun 2015 08:36:42 +0000 (10:36 +0200)]
Several return type fixes, still not completed... Incomplete prototypes :-/
Bob Weinand [Mon, 22 Jun 2015 08:17:35 +0000 (10:17 +0200)]
Fix genarginfo to respect by-ref passing
Bob Weinand [Mon, 22 Jun 2015 08:03:14 +0000 (10:03 +0200)]
Fix each() arginfo
Rasmus Lerdorf [Mon, 22 Jun 2015 04:12:48 +0000 (00:12 -0400)]
And actually use this new arginfo data
Rasmus Lerdorf [Mon, 22 Jun 2015 03:48:00 +0000 (23:48 -0400)]
Fix set_error_handler() arginfo
Rasmus Lerdorf [Mon, 22 Jun 2015 01:49:07 +0000 (21:49 -0400)]
Fix arginfo for built-in engine functions
Bob Weinand [Sun, 21 Jun 2015 23:36:17 +0000 (01:36 +0200)]
Fix accidental function related flag value reuse
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)
Jakub Zelenka [Sun, 21 Jun 2015 14:30:33 +0000 (15:30 +0100)]
Fix bug #68546 (json_decode cannot access property started with \0)
Bob Weinand [Sat, 20 Jun 2015 23:35:22 +0000 (01:35 +0200)]
Fix segfault with scalar passed to typehint with not loaded class
Nikita Popov [Sat, 20 Jun 2015 17:09:07 +0000 (19:09 +0200)]
Load/restore VM stack before unfinished generator cleanup