]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 11 Dec 2014 16:18:31 +0000 (19:18 +0300)]
Improved array_merge() and array_replace() (1-st array may be added using simple procedure).
Dmitry Stogov [Thu, 11 Dec 2014 12:01:06 +0000 (15:01 +0300)]
Replaced zendi_convert_to_long() with _zval_get_long_func()
Dmitry Stogov [Thu, 11 Dec 2014 10:18:40 +0000 (13:18 +0300)]
Moved zend_is_true() from zend_execute.h/zend_execute_API.c into zend_operators.h/zend_operators.c.
Splited the most expensive part of inline i_zend_is_true() into a separate zend_object_is_true().
Replaced zendi_convert_to_long() with cals to zend_is_true().
Xinchen Hui [Thu, 11 Dec 2014 08:19:33 +0000 (03:19 -0500)]
Revert "Save one xor instr"
This reverts commit
bd5c5d372916375981f76ed7800b2f4600acae05 .
Xinchen Hui [Thu, 11 Dec 2014 05:03:45 +0000 (00:03 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 11 Dec 2014 05:03:31 +0000 (00:03 -0500)]
Save one xor instr
Anatol Belski [Wed, 10 Dec 2014 12:23:15 +0000 (13:23 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move the test to the right place
Anatol Belski [Wed, 10 Dec 2014 12:22:52 +0000 (13:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move the test to the right place
Anatol Belski [Wed, 10 Dec 2014 12:19:51 +0000 (13:19 +0100)]
move the test to the right place
Anatol Belski [Wed, 10 Dec 2014 11:23:46 +0000 (12:23 +0100)]
fix TS build and C89 compat
Anatol Belski [Wed, 10 Dec 2014 10:54:31 +0000 (11:54 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68545 NULL pointer dereference in unserialize.c
Updated NEWS
Updated NEWS
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Anatol Belski [Wed, 10 Dec 2014 10:49:13 +0000 (11:49 +0100)]
updated NEWS
Anatol Belski [Wed, 10 Dec 2014 10:47:34 +0000 (11:47 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
Anatol Belski [Wed, 10 Dec 2014 10:43:33 +0000 (11:43 +0100)]
Fixed bug #68545 NULL pointer dereference in unserialize.c
Julien Pauli [Wed, 10 Dec 2014 10:24:43 +0000 (11:24 +0100)]
Updated NEWS
Julien Pauli [Wed, 10 Dec 2014 10:23:40 +0000 (11:23 +0100)]
Updated NEWS
Julien Pauli [Wed, 10 Dec 2014 10:22:46 +0000 (11:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 10 Dec 2014 10:22:28 +0000 (11:22 +0100)]
Updated NEWS
Remi Collet [Wed, 10 Dec 2014 07:19:29 +0000 (08:19 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix bug #68526 Implement POSIX Access Control List for UDS
Remi Collet [Wed, 10 Dec 2014 07:19:04 +0000 (08:19 +0100)]
NEWS
Remi Collet [Wed, 10 Dec 2014 07:15:21 +0000 (08:15 +0100)]
Fix bug #68526 Implement POSIX Access Control List for UDS
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option
Keep old behavior (chmod) if option not used or not supported.
Dmitry Stogov [Tue, 9 Dec 2014 15:07:39 +0000 (18:07 +0300)]
Improved basic zval copying primitives: ZVAL_COPY_VALUE(), ZVAL_COPY(), ZVAL_DUP()
Dmitry Stogov [Tue, 9 Dec 2014 14:07:12 +0000 (17:07 +0300)]
Wrap RETURN_VALUE_USED() with EXPECTED() or UNEXPECTED() macros according to more frequent usage patterns.
Dmitry Stogov [Tue, 9 Dec 2014 12:15:24 +0000 (15:15 +0300)]
Improved ASSIGN_<OP>, ASSIGN_DIM and UNSET_DIM
Remi Collet [Tue, 9 Dec 2014 10:25:53 +0000 (11:25 +0100)]
drop dead/unused code
Dmitry Stogov [Tue, 9 Dec 2014 09:17:55 +0000 (12:17 +0300)]
simplified code
Dmitry Stogov [Tue, 9 Dec 2014 00:05:06 +0000 (03:05 +0300)]
Move ZVAL_DEREF() and make_real_object() into slow paths.
Dmitry Stogov [Tue, 9 Dec 2014 00:03:38 +0000 (03:03 +0300)]
Pass znode_op structure by value (it fits into one word) instead of pointer to structure.
Dmitry Stogov [Mon, 8 Dec 2014 22:09:44 +0000 (01:09 +0300)]
Move checks for references into slow paths.
Dmitry Stogov [Mon, 8 Dec 2014 21:10:23 +0000 (00:10 +0300)]
Improved ASSIGN_DIM and ASSIGN_OBJ
Dmitry Stogov [Mon, 8 Dec 2014 15:40:37 +0000 (18:40 +0300)]
Fixed typo
Dmitry Stogov [Mon, 8 Dec 2014 15:11:14 +0000 (18:11 +0300)]
Move checks for references into slow paths of handlers or helpers. Remove duplicate opcode handlers.
Derick Rethans [Mon, 8 Dec 2014 11:07:00 +0000 (11:07 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Mon, 8 Dec 2014 11:06:50 +0000 (11:06 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Mon, 8 Dec 2014 11:06:41 +0000 (11:06 +0000)]
Merge branch 'day-of-week-issues' into PHP-5.5
Derick Rethans [Mon, 8 Dec 2014 11:06:12 +0000 (11:06 +0000)]
Fixed day_of_week function as it could sometimes return negative values internally.
Dmitry Stogov [Mon, 8 Dec 2014 09:25:52 +0000 (12:25 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed possible read after end of buffer and use after free.
Dmitry Stogov [Mon, 8 Dec 2014 09:24:16 +0000 (12:24 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed possible read after end of buffer and use after free.
Dmitry Stogov [Mon, 8 Dec 2014 09:20:01 +0000 (12:20 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed possible read after end of buffer and use after free.
Dmitry Stogov [Mon, 8 Dec 2014 09:18:27 +0000 (12:18 +0300)]
Fixed possible read after end of buffer and use after free.
Nikita Popov [Sun, 7 Dec 2014 21:58:14 +0000 (22:58 +0100)]
Fix arrow operator precedence
I accidentially added => as the highest-precedence operator...
Anatol Belski [Sat, 6 Dec 2014 19:51:41 +0000 (20:51 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68398 msooxml matches too many archives
Anatol Belski [Sat, 6 Dec 2014 19:51:00 +0000 (20:51 +0100)]
Fixed bug #68398 msooxml matches too many archives
Nikita Popov [Sat, 6 Dec 2014 11:37:14 +0000 (12:37 +0100)]
Fix zpp call in apache_getenv()
Nikita Popov [Wed, 22 Oct 2014 18:13:22 +0000 (20:13 +0200)]
Drop unnecessary zval containers
Anatol Belski [Sat, 6 Dec 2014 11:32:16 +0000 (12:32 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:31:55 +0000 (12:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:31:27 +0000 (12:31 +0100)]
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:18:36 +0000 (12:18 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
C89 compat
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:14:17 +0000 (12:14 +0100)]
C89 compat
Anatol Belski [Sat, 6 Dec 2014 11:09:35 +0000 (12:09 +0100)]
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:01:09 +0000 (12:01 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #65230 setting locale randomly broken
Anatol Belski [Sat, 6 Dec 2014 11:00:39 +0000 (12:00 +0100)]
updated NEWS
Anatol Belski [Sat, 6 Dec 2014 11:00:17 +0000 (12:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
Anatol Belski [Sat, 6 Dec 2014 10:59:43 +0000 (11:59 +0100)]
Fixed bug #65230 setting locale randomly broken
Matteo Beccati [Sat, 6 Dec 2014 09:24:56 +0000 (10:24 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix compilation error (ref #68424)
Matteo Beccati [Sat, 6 Dec 2014 09:24:27 +0000 (10:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix compilation error (ref #68424)
Matteo Beccati [Sat, 6 Dec 2014 09:23:56 +0000 (10:23 +0100)]
Fix compilation error (ref #68424)
Dmitry Stogov [Sat, 6 Dec 2014 00:03:48 +0000 (03:03 +0300)]
Removed useless handlers
Dmitry Stogov [Fri, 5 Dec 2014 23:14:45 +0000 (02:14 +0300)]
Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
Adam Harvey [Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert unintentional docblock change
Adam Harvey [Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert unintentional docblock change
Adam Harvey [Fri, 5 Dec 2014 21:57:46 +0000 (13:57 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert unintentional docblock change
Chris Christoff [Fri, 5 Dec 2014 20:59:46 +0000 (15:59 -0500)]
Revert unintentional docblock change
Revert unintentional docblock change
It looks like commit
dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change. I have reverted this
change in this commit.
Andrea Faulds [Fri, 5 Dec 2014 19:47:27 +0000 (19:47 +0000)]
Merge branch 'ZendEngine3'
* ZendEngine3:
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Andrea Faulds [Fri, 5 Dec 2014 13:41:38 +0000 (13:41 +0000)]
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Andrea Faulds [Fri, 5 Dec 2014 13:32:01 +0000 (13:32 +0000)]
Note macro removal in UPGRADING.INTERNALS
Andrea Faulds [Thu, 4 Dec 2014 00:55:11 +0000 (00:55 +0000)]
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Andrea Faulds [Fri, 19 Sep 2014 23:24:03 +0000 (00:24 +0100)]
Zend Engine 3
Julien Pauli [Fri, 5 Dec 2014 16:07:13 +0000 (17:07 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:06:33 +0000 (17:06 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
Julien Pauli [Fri, 5 Dec 2014 16:06:16 +0000 (17:06 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:05:37 +0000 (17:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
Julien Pauli [Fri, 5 Dec 2014 16:05:21 +0000 (17:05 +0100)]
Updated NEWS
pwolanin [Fri, 7 Nov 2014 22:18:44 +0000 (17:18 -0500)]
Start adding new attribute to control multi statements
Dmitry Stogov [Fri, 5 Dec 2014 15:23:39 +0000 (18:23 +0300)]
Get rid of few more duplicate handlers
Anatol Belski [Fri, 5 Dec 2014 14:51:53 +0000 (15:51 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
. Fixed bug #68120 Update bundled libsqlite
Anatol Belski [Fri, 5 Dec 2014 14:51:26 +0000 (15:51 +0100)]
updated NEWS
Anatol Belski [Fri, 5 Dec 2014 14:50:18 +0000 (15:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
Anatol Belski [Fri, 5 Dec 2014 14:43:53 +0000 (15:43 +0100)]
. Fixed bug #68120 Update bundled libsqlite
Dmitry Stogov [Fri, 5 Dec 2014 14:04:15 +0000 (17:04 +0300)]
Improved BOOL, BOOL_NOT and conditional jumps
Dmitry Stogov [Fri, 5 Dec 2014 12:07:49 +0000 (15:07 +0300)]
Improved ECHO and PRINT
Dmitry Stogov [Fri, 5 Dec 2014 10:45:03 +0000 (13:45 +0300)]
Get rid of duplicare FETCH_DIM_* handlers
Anatol Belski [Fri, 5 Dec 2014 10:09:27 +0000 (11:09 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #65769 localeconv() broken in TS builds
Anatol Belski [Fri, 5 Dec 2014 10:08:55 +0000 (11:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
Anatol Belski [Fri, 5 Dec 2014 10:08:32 +0000 (11:08 +0100)]
updated NEWS
Anatol Belski [Fri, 5 Dec 2014 10:06:06 +0000 (11:06 +0100)]
Fixed bug #65769 localeconv() broken in TS builds
Dmitry Stogov [Fri, 5 Dec 2014 09:40:47 +0000 (12:40 +0300)]
Get rid of duplicate handlers (where the code for IS_TMP_VAR and IS_VAR operands is the same)
Julien Pauli [Fri, 5 Dec 2014 09:18:41 +0000 (10:18 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:14:35 +0000 (10:14 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Conflicts:
ext/spl/spl_directory.c
Julien Pauli [Fri, 5 Dec 2014 09:12:35 +0000 (10:12 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:12:08 +0000 (10:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Julien Pauli [Fri, 5 Dec 2014 09:11:49 +0000 (10:11 +0100)]
Updated NEWS
Peter Cowburn [Mon, 24 Nov 2014 20:13:14 +0000 (20:13 +0000)]
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Anatol Belski [Fri, 5 Dec 2014 06:08:59 +0000 (07:08 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separators in test
Anatol Belski [Fri, 5 Dec 2014 06:08:35 +0000 (07:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separators in test
Anatol Belski [Fri, 5 Dec 2014 06:07:58 +0000 (07:07 +0100)]
fix dir separators in test
Xinchen Hui [Fri, 5 Dec 2014 04:10:31 +0000 (12:10 +0800)]
Make it const as Levi asked for
Michael Wallner [Thu, 4 Dec 2014 12:02:30 +0000 (13:02 +0100)]
Fix zend_fcall_info_arg*() to use ZVAL_COPY
As zend_fcall_info_args_clear() calls zval_ptr_dtor() we also have
to increase the refcount of refcounted zvals added as params,
like it is already done in zend_fcall_info_args_ex().