]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 3 May 2014 08:49:10 +0000 (10:49 +0200)]
Fix SXE->string cast for __toString in inheriting class
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
Nikita Popov [Fri, 2 May 2014 15:01:36 +0000 (17:01 +0200)]
Add STR_ALLOCA_* API, use in get_method and verify_arg
This avoid unnecessary allocations when using dynamic method
dispatch and class typehints.
Probably there are other places where this should be done as well,
those just stood out for my usage.
Xinchen Hui [Sat, 3 May 2014 08:06:27 +0000 (16:06 +0800)]
Make they are in the same style of Z_ISREF
Xinchen Hui [Sat, 3 May 2014 07:58:09 +0000 (15:58 +0800)]
Refactor XML (incompleted)
Nikita Popov [Thu, 1 May 2014 06:55:59 +0000 (08:55 +0200)]
Avoid superflous allocations in convert_to_string
Taken from zval_get_string.
Nikita Popov [Wed, 30 Apr 2014 18:48:02 +0000 (20:48 +0200)]
zend_stack_top() now returns pointer directly
Nikita Popov [Wed, 30 Apr 2014 18:28:02 +0000 (20:28 +0200)]
Don't allocate zend_stack elements individually
Instead allocate a vector of elements. Size must now be specified
on initialization rather than on push.
Nikita Popov [Sat, 26 Apr 2014 11:56:19 +0000 (13:56 +0200)]
Fix php-cgi -m
Nikita Popov [Sat, 26 Apr 2014 11:17:26 +0000 (13:17 +0200)]
Comment out cast_object for IS_NULL
Dmitry Stogov [Wed, 30 Apr 2014 21:24:38 +0000 (01:24 +0400)]
JMPZ/JMPNZ/JMPZNZ optimization
Dmitry Stogov [Wed, 30 Apr 2014 14:32:42 +0000 (18:32 +0400)]
Split IS_BOOL into IS_FALSE and IS_TRUE
Dmitry Stogov [Wed, 30 Apr 2014 07:23:19 +0000 (11:23 +0400)]
Optimized JMPZNZ to avoid multiplication at runtime (may be it makes sense to use relative addresses everywere it'll lead to Position Independent Code)
Dmitry Stogov [Tue, 29 Apr 2014 06:54:59 +0000 (10:54 +0400)]
Changed order of types
Nikita Popov [Sat, 26 Apr 2014 09:26:37 +0000 (11:26 +0200)]
Fix leak I introduced
Nikita Popov [Sat, 26 Apr 2014 08:40:12 +0000 (10:40 +0200)]
Fix by-reference argument unpacking
Nikita Popov [Fri, 25 Apr 2014 14:36:29 +0000 (16:36 +0200)]
Add dst parameter to convert_object_to_type macro
Avoids a ZVAL_DUP in the zval_get_* functions.
Also improve object-to-array cast a bit by initializing the array
with correct number of elements and not doing a alloc-init-free
cycle when convert_object_to_type succeeds.
Nikita Popov [Fri, 25 Apr 2014 13:48:46 +0000 (15:48 +0200)]
Use convert_scalar_to_array only for arrays
Nikita Popov [Fri, 25 Apr 2014 13:41:23 +0000 (15:41 +0200)]
Uhm, do we really need to support that?
Nikita Popov [Fri, 25 Apr 2014 13:21:26 +0000 (15:21 +0200)]
Optimize ZEND_CAST to avoid zval copies
The scalar type casts IS_NULL, IS_BOOL, IS_LONG, IS_DOUBLE and
IS_STRING will no longer require a copy when casting.
A copy is now only made when casting to IS_ARRAY and IS_OBJECT, if
the type doesn't already match.
I tweaked the reference handling for the type-already-correct case
to DEREF the zval after that check. References require a copy anyway,
so they can go through the slow codepath.
Nikita Popov [Fri, 25 Apr 2014 12:41:12 +0000 (14:41 +0200)]
Replace more convert_to_* calls
Nikita Popov [Fri, 25 Apr 2014 11:37:07 +0000 (13:37 +0200)]
Align zval_get_long/double with zval_get_string
Nikita Popov [Fri, 25 Apr 2014 11:23:15 +0000 (13:23 +0200)]
Move more code to use zval_get_string
Nikita Popov [Fri, 25 Apr 2014 10:32:30 +0000 (12:32 +0200)]
More zend_string usage in PCRE
Avoid a few copies and zval duplications
Dmitry Stogov [Fri, 25 Apr 2014 20:32:51 +0000 (00:32 +0400)]
Merge mainstream 'master' branch into refactoring
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
Dmitry Stogov [Fri, 25 Apr 2014 07:54:10 +0000 (11:54 +0400)]
Use appropriate macros
Dmitry Stogov [Fri, 25 Apr 2014 07:29:35 +0000 (11:29 +0400)]
Use appropriate macro
Dmitry Stogov [Fri, 25 Apr 2014 07:29:18 +0000 (11:29 +0400)]
Avoid useless allocations
Stanislav Malyshev [Fri, 25 Apr 2014 07:07:12 +0000 (00:07 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
Stanislav Malyshev [Fri, 25 Apr 2014 07:00:49 +0000 (00:00 -0700)]
update NEWS
Stanislav Malyshev [Fri, 25 Apr 2014 07:00:20 +0000 (00:00 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
Stanislav Malyshev [Fri, 25 Apr 2014 07:00:01 +0000 (00:00 -0700)]
update NEWS
Stanislav Malyshev [Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
Stanislav Malyshev [Fri, 25 Apr 2014 06:58:38 +0000 (23:58 -0700)]
add a test case previously broken by a bad fix
Stanislav Malyshev [Fri, 25 Apr 2014 06:49:52 +0000 (23:49 -0700)]
Revert "Fixed bug #64604"
This reverts commit
b05c088a3abf8e4c6fb6e40418423a9e2dd3d929 .
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
Dmitry Stogov [Fri, 25 Apr 2014 04:33:37 +0000 (08:33 +0400)]
Enable PCRE JIT compiler
Xinchen Hui [Fri, 25 Apr 2014 03:45:23 +0000 (11:45 +0800)]
Fixed fetch into refcount hanlding (now 3 test fails)
Xinchen Hui [Fri, 25 Apr 2014 03:36:53 +0000 (11:36 +0800)]
Fixed bindColumn
Xinchen Hui [Fri, 25 Apr 2014 03:34:00 +0000 (11:34 +0800)]
Fixed memleak
Xinchen Hui [Fri, 25 Apr 2014 03:04:11 +0000 (11:04 +0800)]
Fixed memleak in quote
Xinchen Hui [Fri, 25 Apr 2014 03:02:19 +0000 (11:02 +0800)]
Fixed tests (object id)
Xinchen Hui [Fri, 25 Apr 2014 03:00:35 +0000 (11:00 +0800)]
Fixed reference handling in bindCloumn
Xinchen Hui [Fri, 25 Apr 2014 02:44:21 +0000 (10:44 +0800)]
Fixed register bound parameters in execute
Xinchen Hui [Fri, 25 Apr 2014 02:27:23 +0000 (10:27 +0800)]
Fixed refcount of dbh (we don't need another refcount anymore)
Dmitry Stogov [Thu, 24 Apr 2014 20:57:12 +0000 (00:57 +0400)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Dmitry Stogov [Thu, 24 Apr 2014 20:56:15 +0000 (00:56 +0400)]
Optimized constant lookup
Anatol Belski [Thu, 24 Apr 2014 18:16:29 +0000 (20:16 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch for 5.6+
updated libmagic.patch
Anatol Belski [Thu, 24 Apr 2014 18:16:06 +0000 (20:16 +0200)]
updated libmagic.patch for 5.6+
Anatol Belski [Thu, 24 Apr 2014 18:15:01 +0000 (20:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch
Anatol Belski [Thu, 24 Apr 2014 18:13:47 +0000 (20:13 +0200)]
updated libmagic.patch
Anatol Belski [Thu, 24 Apr 2014 17:53:20 +0000 (19:53 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport this piece from 5.6, related to the #66307 fix
Anatol Belski [Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Anatol Belski [Thu, 24 Apr 2014 17:50:23 +0000 (19:50 +0200)]
backport this piece from 5.6, related to the #66307 fix
Anatol Belski [Thu, 24 Apr 2014 17:36:20 +0000 (19:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #66307 Fileinfo crashes with powerpoint files
Anatol Belski [Thu, 24 Apr 2014 17:35:52 +0000 (19:35 +0200)]
updated NEWS
Anatol Belski [Thu, 24 Apr 2014 17:33:54 +0000 (19:33 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
Anatol Belski [Thu, 24 Apr 2014 17:30:34 +0000 (19:30 +0200)]
Fixed bug #66307 Fileinfo crashes with powerpoint files
Xinchen Hui [Thu, 24 Apr 2014 15:29:20 +0000 (23:29 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Dmitry Stogov [Thu, 24 Apr 2014 15:15:30 +0000 (19:15 +0400)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Dmitry Stogov [Thu, 24 Apr 2014 15:14:29 +0000 (19:14 +0400)]
Reimplement strtr()
Xinchen Hui [Thu, 24 Apr 2014 14:43:30 +0000 (22:43 +0800)]
Fixed Aggregate
Xinchen Hui [Thu, 24 Apr 2014 13:14:57 +0000 (21:14 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Xinchen Hui [Thu, 24 Apr 2014 13:14:36 +0000 (21:14 +0800)]
Various bugs fixed
Dmitry Stogov [Thu, 24 Apr 2014 11:53:20 +0000 (15:53 +0400)]
Redesigned zend_execute_data layout now EX(object), EX(scope) and EX(called_scope) arr properties of the current function execution co
ntext. They are set during zend_execute_data initialization and never changed.
Anatol Belski [Thu, 24 Apr 2014 09:07:08 +0000 (11:07 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
use a portable strndup implementation
fixed C89 compat
prepare config.w32
add parser files to dist
Anatol Belski [Thu, 24 Apr 2014 09:05:52 +0000 (11:05 +0200)]
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
Anatol Belski [Thu, 24 Apr 2014 09:01:54 +0000 (11:01 +0200)]
use a portable strndup implementation
Anatol Belski [Thu, 24 Apr 2014 09:00:36 +0000 (11:00 +0200)]
fixed C89 compat
Anatol Belski [Thu, 24 Apr 2014 08:58:30 +0000 (10:58 +0200)]
prepare config.w32
Anatol Belski [Thu, 24 Apr 2014 08:53:31 +0000 (10:53 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dll export
Anatol Belski [Thu, 24 Apr 2014 08:52:59 +0000 (10:52 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dll export
Anatol Belski [Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix dll export
Anatol Belski [Thu, 24 Apr 2014 08:51:42 +0000 (10:51 +0200)]
fix dll export
krakjoe [Thu, 24 Apr 2014 07:09:35 +0000 (08:09 +0100)]
add parser files to dist
Xinchen Hui [Thu, 24 Apr 2014 02:18:39 +0000 (10:18 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Nikita Popov [Wed, 23 Apr 2014 20:33:38 +0000 (22:33 +0200)]
Small zts fix
Nikita Popov [Wed, 23 Apr 2014 18:33:16 +0000 (20:33 +0200)]
Fix strict array comparison
Fixes Symfony test failures
Nikita Popov [Wed, 23 Apr 2014 18:05:57 +0000 (20:05 +0200)]
Port ext/hash
Unsure what to do about hash_final
Nikita Popov [Wed, 23 Apr 2014 17:05:16 +0000 (19:05 +0200)]
Allocate zend_strings with correct size
For me (32bit) sizeof(zend_string) is 20, which means that the
char[1] array at the end is padded with three bytes. Thus allocating
based on sizeof(zend_string)-1 overallocates by those 3 padding bytes.
This commit fixes the allocation size, by using XtOffsetOf.
Nikita Popov [Wed, 23 Apr 2014 16:30:24 +0000 (18:30 +0200)]
Fix ZTS build
Xinchen Hui [Wed, 23 Apr 2014 03:41:57 +0000 (11:41 +0800)]
Refactor pdo_sqlite (only compilable)
Xinchen Hui [Wed, 23 Apr 2014 02:58:08 +0000 (10:58 +0800)]
Clean up (use zend_string and foreach macros)
Stanislav Malyshev [Tue, 22 Apr 2014 23:59:11 +0000 (16:59 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix accepting ill-formed UTF-8 characters
Stanislav Malyshev [Tue, 22 Apr 2014 23:57:47 +0000 (16:57 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix accepting ill-formed UTF-8 characters
Stanislav Malyshev [Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Jakub Zelenka [Mon, 21 Apr 2014 12:02:20 +0000 (13:02 +0100)]
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Dmitry Stogov [Tue, 22 Apr 2014 22:47:41 +0000 (02:47 +0400)]
Use symbolic names instead of magic constants + optimization
Nikita Popov [Tue, 22 Apr 2014 19:33:49 +0000 (21:33 +0200)]
Initialize hash as unpacked if it contains string keys
Nikita Popov [Tue, 22 Apr 2014 17:39:13 +0000 (19:39 +0200)]
Fix zts
Nikita Popov [Tue, 22 Apr 2014 15:54:34 +0000 (17:54 +0200)]
Pass expected array size hint in INIT_ARRAY
To avoid unnecessary rehashes
Xinchen Hui [Tue, 22 Apr 2014 16:18:18 +0000 (00:18 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Xinchen Hui [Tue, 22 Apr 2014 16:17:29 +0000 (00:17 +0800)]
Refactored sqlite3 (all tests passes)
Dmitry Stogov [Tue, 22 Apr 2014 14:52:59 +0000 (18:52 +0400)]
Fixed compilaation warnings
Felipe Pena [Tue, 22 Apr 2014 13:49:18 +0000 (10:49 -0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
sapi/litespeed/lsapi_main.c: Fix bug #63228
George Wang [Fri, 12 Oct 2012 17:04:22 +0000 (13:04 -0400)]
sapi/litespeed/lsapi_main.c: Fix bug #63228
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
Dmitry Stogov [Tue, 22 Apr 2014 13:46:34 +0000 (17:46 +0400)]
Fixed compilation warnings
Xinchen Hui [Tue, 22 Apr 2014 11:10:19 +0000 (19:10 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Xinchen Hui [Tue, 22 Apr 2014 11:08:58 +0000 (19:08 +0800)]
Fixed segfault cause EG(This) is modified
Dmitry Stogov [Tue, 22 Apr 2014 10:38:00 +0000 (14:38 +0400)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Xinchen Hui [Tue, 22 Apr 2014 10:29:56 +0000 (18:29 +0800)]
USE ZEND_HASH_FOREACH_* macros
Xinchen Hui [Tue, 22 Apr 2014 10:23:47 +0000 (18:23 +0800)]
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2