]>
granicus.if.org Git - php/log
Johannes Schlüter [Sat, 27 Sep 2014 00:18:54 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Sat, 27 Sep 2014 00:18:29 +0000 (02:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 27 Sep 2014 00:17:52 +0000 (02:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sat, 27 Sep 2014 00:17:26 +0000 (02:17 +0200)]
This test should pass
Derick Rethans [Fri, 26 Sep 2014 15:27:09 +0000 (16:27 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Fri, 26 Sep 2014 15:27:05 +0000 (16:27 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 26 Sep 2014 15:27:00 +0000 (16:27 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 26 Sep 2014 15:26:59 +0000 (16:26 +0100)]
- Updated to version 2014.8 (2014h)
Stanislav Malyshev [Fri, 26 Sep 2014 08:02:38 +0000 (01:02 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Stanislav Malyshev [Fri, 26 Sep 2014 08:01:39 +0000 (01:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Stanislav Malyshev [Fri, 26 Sep 2014 08:00:20 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Conflicts:
ext/openssl/xp_ssl.c
Stanislav Malyshev [Fri, 26 Sep 2014 07:56:39 +0000 (00:56 -0700)]
fix date
Stanislav Malyshev [Fri, 26 Sep 2014 07:55:49 +0000 (00:55 -0700)]
update NEWS
Stanislav Malyshev [Fri, 26 Sep 2014 07:44:24 +0000 (00:44 -0700)]
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Remi Collet [Fri, 26 Sep 2014 07:28:02 +0000 (09:28 +0200)]
Fixed bug #68103 Dupplicate entry in Reflection (merged)
Remi Collet [Fri, 26 Sep 2014 07:07:12 +0000 (09:07 +0200)]
NEWS
Remi Collet [Fri, 26 Sep 2014 07:06:51 +0000 (09:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #68103 Dupplicate entry in Reflection
Remi Collet [Fri, 26 Sep 2014 07:06:12 +0000 (09:06 +0200)]
NEWS
Remi Collet [Fri, 26 Sep 2014 06:56:42 +0000 (08:56 +0200)]
Fixed bug #68103 Dupplicate entry in Reflection
$ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());'
Array
(
[0] => Threaded
[1] => stackable
[2] => Thread
[3] => Worker
[4] => Mutex
[5] => Cond
[6] => Collectable
[7] => Pool
)
In getClasses() output, it is possible to compare key (ex "stackable")
with $obj->name (ex "Threaded") to detect class alias.
...
[Threaded] => ReflectionClass Object
(
[name] => Threaded
)
[stackable] => ReflectionClass Object
(
[name] => Threaded
)
...
Dmitry Stogov [Thu, 25 Sep 2014 21:37:33 +0000 (01:37 +0400)]
Fixed optimizer bug
Anatol Belski [Thu, 25 Sep 2014 18:28:34 +0000 (20:28 +0200)]
fix C89 compat
krakjoe [Thu, 25 Sep 2014 15:31:39 +0000 (16:31 +0100)]
fix indentation
krakjoe [Thu, 25 Sep 2014 15:15:02 +0000 (16:15 +0100)]
fix zts build
Dmitry Stogov [Thu, 25 Sep 2014 13:00:17 +0000 (17:00 +0400)]
Use macro
Dmitry Stogov [Thu, 25 Sep 2014 09:42:46 +0000 (13:42 +0400)]
Optimized (PRE|POST)_(INC|DEC) handlers. Moved proxy object handling into helper function.
Dmitry Stogov [Wed, 24 Sep 2014 16:31:22 +0000 (20:31 +0400)]
Fixed C++ incompatibility
Ferenc Kovacs [Wed, 24 Sep 2014 11:42:32 +0000 (13:42 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update the certificate used for the test, as it expired recently
Ferenc Kovacs [Wed, 24 Sep 2014 11:40:52 +0000 (13:40 +0200)]
update the certificate used for the test, as it expired recently
Dmitry Stogov [Wed, 24 Sep 2014 11:39:54 +0000 (15:39 +0400)]
Fixed immutable arrays support
Nikita Popov [Wed, 24 Sep 2014 09:58:13 +0000 (11:58 +0200)]
Fix counting of "R:" references in serialize()
Nikita Popov [Wed, 24 Sep 2014 09:26:09 +0000 (11:26 +0200)]
Remove dead code
Nikita Popov [Tue, 23 Sep 2014 19:36:45 +0000 (21:36 +0200)]
Test use($this) being an error
Nikita Popov [Tue, 23 Sep 2014 19:19:11 +0000 (21:19 +0200)]
Move list() condition into assign_znode
The condition in compile_foreach was using ->attr instead of ->kind
and as such never passed. It only worked because assign_znode already
supported this case by indirecting via zend_compile_assign. Now it
implements it with a direct call.
Remi Collet [Wed, 24 Sep 2014 08:42:31 +0000 (10:42 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
typo
Remi Collet [Wed, 24 Sep 2014 08:42:20 +0000 (10:42 +0200)]
typo
Remi Collet [Wed, 24 Sep 2014 08:36:58 +0000 (10:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
Remi Collet [Wed, 24 Sep 2014 08:36:29 +0000 (10:36 +0200)]
NEWS
Remi Collet [Wed, 24 Sep 2014 08:34:55 +0000 (10:34 +0200)]
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
Dmitry Stogov [Wed, 24 Sep 2014 08:20:46 +0000 (12:20 +0400)]
Avoid double checks
Ferenc Kovacs [Wed, 24 Sep 2014 07:41:02 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
the order of the blocks should be Core, then exts in alphabetical order
add missing NEWS entry for the phpdbg compilation fix
Ferenc Kovacs [Wed, 24 Sep 2014 07:40:52 +0000 (09:40 +0200)]
the order of the blocks should be Core, then exts in alphabetical order
Ferenc Kovacs [Wed, 24 Sep 2014 07:39:14 +0000 (09:39 +0200)]
add missing NEWS entry for the phpdbg compilation fix
Ferenc Kovacs [Wed, 24 Sep 2014 07:10:31 +0000 (09:10 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS entry for #68088
Ferenc Kovacs [Wed, 24 Sep 2014 07:09:34 +0000 (09:09 +0200)]
add NEWS entry for #68088
Dmitry Stogov [Tue, 23 Sep 2014 21:57:40 +0000 (01:57 +0400)]
Make QM_ASSIGN, JMP_SET and CAST return IS_TMP_VAR.
Dmitry Stogov [Tue, 23 Sep 2014 19:27:20 +0000 (23:27 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Drop unused result argument
Fix ct binding for cuf/cufa functions
Fix detection of write to built-in function for references
Test use of string names with \ prefix
Add zend_add_literal_string
Drop dead code
Dmitry Stogov [Tue, 23 Sep 2014 19:26:39 +0000 (23:26 +0400)]
Removed useless helper
Nikita Popov [Tue, 23 Sep 2014 19:04:30 +0000 (21:04 +0200)]
Drop unused result argument
Nikita Popov [Tue, 23 Sep 2014 19:02:32 +0000 (21:02 +0200)]
Fix ct binding for cuf/cufa functions
It was checking against the wrong AST kind, so the binding was
never actually done.
Nikita Popov [Tue, 23 Sep 2014 18:42:22 +0000 (20:42 +0200)]
Fix detection of write to built-in function for references
Nikita Popov [Tue, 23 Sep 2014 18:35:32 +0000 (20:35 +0200)]
Test use of string names with \ prefix
And drop piece of dead code
Nikita Popov [Tue, 23 Sep 2014 18:21:28 +0000 (20:21 +0200)]
Add zend_add_literal_string
And simplify additional of special literals based on it.
Nikita Popov [Tue, 23 Sep 2014 17:32:02 +0000 (19:32 +0200)]
Drop dead code
Dmitry Stogov [Tue, 23 Sep 2014 13:21:29 +0000 (17:21 +0400)]
Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.
Removed ZEND_SWITCH_FREE opcode (ZEND_FREE used instead).
Tjerk Meesters [Tue, 23 Sep 2014 10:12:12 +0000 (18:12 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed typo
Tjerk Meesters [Tue, 23 Sep 2014 10:10:32 +0000 (18:10 +0800)]
PR 837: Fixed typo in php.ini-development and php.ini-production
Fixed typo in comment for 'mbstring.detect_order'
Dmitry Stogov [Tue, 23 Sep 2014 08:35:42 +0000 (12:35 +0400)]
Allocate copies of internal functions inherited in user classes at CG(arena), instead of permanent heap (malloc).
Dmitry Stogov [Tue, 23 Sep 2014 08:35:16 +0000 (12:35 +0400)]
Make internal function names to be interned strings
Xinchen Hui [Tue, 23 Sep 2014 05:50:00 +0000 (13:50 +0800)]
It is not likely a string
Sebastian Zartner [Tue, 23 Sep 2014 05:45:03 +0000 (07:45 +0200)]
Fixed typo
Xinchen Hui [Tue, 23 Sep 2014 04:56:59 +0000 (12:56 +0800)]
Simply make_printable_zval
it's possible to remove make_printable_zval at all
but it will be a API break
Nikita Popov [Mon, 22 Sep 2014 22:57:00 +0000 (00:57 +0200)]
Test a few more error conditions in the compiler
Nikita Popov [Mon, 22 Sep 2014 22:40:17 +0000 (00:40 +0200)]
Test error conditions for ct class const refs
And fix a bug found while doing so...
Nikita Popov [Mon, 22 Sep 2014 22:31:38 +0000 (00:31 +0200)]
Test some additional cases for constexpr evaluation
Nikita Popov [Sun, 21 Sep 2014 21:42:55 +0000 (23:42 +0200)]
Fix tests/serialize/bug64146.phpt
The var hash now retains a reference to its elements, to ensure
that addresses are not reused.
Furthermore the var hash now only stores objects and references
and directly uses their pointer as key, thus making serialization
about two times faster.
Nikita Popov [Mon, 22 Sep 2014 21:39:07 +0000 (23:39 +0200)]
Remove zend_dynamic_array
This was introduced back in 2000 to test a new hashtable
implementation and is no longer used.
Nikita Popov [Mon, 22 Sep 2014 21:21:59 +0000 (23:21 +0200)]
Remove static allocator
We didn't even compile this file anymore
Dmitry Stogov [Mon, 22 Sep 2014 21:04:47 +0000 (01:04 +0400)]
Fixed typo
Nikita Popov [Mon, 22 Sep 2014 16:34:09 +0000 (18:34 +0200)]
Fix list() destructuring to special variables
Nikita Popov [Sun, 21 Sep 2014 22:47:03 +0000 (00:47 +0200)]
Remove php_varname_check
This is a leftover from PHP < 5.4.
Also removed the php_create_empty_class declaration, which no longer
exists.
Dmitry Stogov [Mon, 22 Sep 2014 13:52:38 +0000 (17:52 +0400)]
Avoid useless reference counting
Dmitry Stogov [Mon, 22 Sep 2014 12:17:35 +0000 (16:17 +0400)]
Specialization (only IS_VAR ad IS_CV operands may be references)
Dmitry Stogov [Mon, 22 Sep 2014 10:41:44 +0000 (14:41 +0400)]
Optimized unset()
Dmitry Stogov [Mon, 22 Sep 2014 09:18:49 +0000 (13:18 +0400)]
Make error paths to be UNEXPECTED
Dmitry Stogov [Mon, 22 Sep 2014 08:47:10 +0000 (12:47 +0400)]
Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
Anatol Belski [Mon, 22 Sep 2014 07:37:40 +0000 (09:37 +0200)]
added a comment
Anatol Belski [Mon, 22 Sep 2014 06:53:15 +0000 (08:53 +0200)]
fix the REPARSE_DATA_BUFFER struct def
Anatol Belski [Sun, 21 Sep 2014 18:54:14 +0000 (20:54 +0200)]
simplify the condition
Nikita Popov [Sun, 21 Sep 2014 21:56:09 +0000 (23:56 +0200)]
Fix two memory errors by interning earlier
Nikita Popov [Sun, 21 Sep 2014 18:47:07 +0000 (20:47 +0200)]
Add smart_str_append for appending zend_strings
Also replaces usages in Zend/ and ext/standard
Nikita Popov [Sun, 21 Sep 2014 18:28:44 +0000 (20:28 +0200)]
Rename smart_str_append to smart_str_append_smart_str
It's used only rarely and I'm running out of append names...
Nikita Popov [Sat, 20 Sep 2014 22:21:41 +0000 (00:21 +0200)]
Use smart_str for exception stack traces
Nikita Popov [Sat, 20 Sep 2014 21:27:10 +0000 (23:27 +0200)]
Use smart_str in get_function_declaration
Instead of custom smart string implementation
Nikita Popov [Sat, 20 Sep 2014 20:42:02 +0000 (22:42 +0200)]
Move smart_str implementation into Zend/
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
Andrea Faulds [Sat, 20 Sep 2014 23:47:46 +0000 (00:47 +0100)]
Merge branch 'master' of git.php.net:php-src
Andrea Faulds [Sat, 20 Sep 2014 23:47:25 +0000 (00:47 +0100)]
UPGRADING for Integer Semantics
Ard Biesheuvel [Sat, 20 Sep 2014 23:42:31 +0000 (16:42 -0700)]
Merge branch 'PHP-5.6'
Ard Biesheuvel [Sat, 20 Sep 2014 23:42:12 +0000 (16:42 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
Ard Biesheuvel [Sat, 20 Sep 2014 23:40:02 +0000 (16:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Sat, 20 Sep 2014 23:32:31 +0000 (16:32 -0700)]
Fixed bug #66242 (don't assume char is signed)
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Andrea Faulds [Sat, 20 Sep 2014 23:29:48 +0000 (00:29 +0100)]
Merge branch 'master' into integer_semantics
Nikita Popov [Sat, 20 Sep 2014 19:58:06 +0000 (21:58 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Nikita Popov [Sat, 20 Sep 2014 19:47:16 +0000 (21:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 20 Sep 2014 19:46:25 +0000 (21:46 +0200)]
Fixed bug #67633
Anatol Belski [Sat, 20 Sep 2014 18:58:00 +0000 (20:58 +0200)]
fixed copying of the struct as it's not being modified
in the subsequent function call
Anatol Belski [Sat, 20 Sep 2014 18:05:27 +0000 (20:05 +0200)]
avoid strlen usage in loop
Anatol Belski [Sat, 20 Sep 2014 17:46:44 +0000 (19:46 +0200)]
Merge branch 'pull-request/805'
* pull-request/805:
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Florian MARGAINE [Sat, 20 Sep 2014 16:27:09 +0000 (18:27 +0200)]
Removes accidentally added files.
Florian MARGAINE [Sat, 20 Sep 2014 16:24:38 +0000 (18:24 +0200)]
Reverts some unwanted changes
Anatol Belski [Sat, 20 Sep 2014 13:46:19 +0000 (15:46 +0200)]
refixed printf fmt, used portable macros