1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Commit Graph

8535 Commits

Author SHA1 Message Date
Dmitry Stogov 3e131b41b2 Fixed memory leaks 2014-05-15 16:18:19 +04:00
Dmitry Stogov 281663f75d Removed support for old-style resource destructors (only ext/soap used it) 2014-05-15 10:57:03 +04:00
Dmitry Stogov c446e57588 ext/soap support for phpng (incomplete - just compilable) 2014-05-15 02:44:47 +04:00
Anatol Belski f089d63ddd C89 compat 2014-05-13 14:04:53 +02:00
Dmitry Stogov 88421c6a04 Added comment 2014-05-13 10:22:21 +04:00
Xinchen Hui 075a6ced0a Save one type checking if the type is already string 2014-05-13 14:05:28 +08:00
Tjerk Meesters e7b50a8ee9 Convert to unpacked before deleting elements
Return FAILURE immediately if a string index removal is attempted.

Moved condition higher up
2014-05-13 11:58:28 +08:00
Nikita Popov 8904f72d7c Fix spl_directory cast_object, reenable error 2014-05-12 20:44:30 +02:00
Dmitry Stogov c6c9d1414c Removed error message that breaks phar 2014-05-12 14:03:10 +04:00
Dmitry Stogov f089be8291 Fixed wrong buffer length (added place for terminating zero) 2014-05-12 11:17:12 +04:00
Xinchen Hui 2402d6cbbc Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
Xinchen Hui 88c550a799 Added vstrpprintf strpprintf to avoid duplicate string
(the function name maybe improvement)
2014-05-10 00:21:49 +08:00
Nikita Popov 9343f874cd Fix identical comparison of arrays with references
Also commit a test I forgot.
2014-05-09 15:46:43 +02:00
Dmitry Stogov fa7008bb24 Fixed resource destruction 2014-05-08 02:48:31 +04:00
Dmitry Stogov 0c6a6f0fba Re-applyed Bob's patch with minor fixes 2014-05-07 15:03:56 +04:00
Dmitry Stogov 4ecc527976 Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first). 2014-05-07 03:26:13 +04:00
Nikita Popov 4d8c59f0da Fix parse_method_params 2014-05-06 21:56:01 +02:00
Nikita Popov ccc2c8ae16 Fix error message in parse_method_params 2014-05-06 20:32:49 +02:00
Nikita Popov 80f8d20b72 Remove dead code from ZEND_THROW
The IS_CONST case always throws an E_ERROR two lines above that,
so no need to handle it further.
2014-05-06 20:02:26 +02:00
Nikita Popov 767b5eea7e Fix throw by reference
Reported by Timm Friebe
2014-05-06 20:01:19 +02:00
Nikita Popov 409e9134ac Sync zend_is_true with convert_to_boolean (fixes GMP test) 2014-05-06 19:03:48 +02:00
Nikita Popov 6e87a0857d Fix ZTS build 2014-05-06 19:03:48 +02:00
Bob Weinand 628646ec93 Removed now superfluous #define IS_CONSTANT_ARRAY_EX 2014-05-06 18:16:12 +02:00
Bob Weinand f3c1881f1d Re-added fix for bug #66015 and adapted for phpng branch 2014-05-06 14:59:03 +02:00
Hannes Magnusson 0ebf0c02a0 Fix argument, cur_method_ref->class_name is a zend_string 2014-05-05 21:45:33 -07:00
Dmitry Stogov 1fa4dcac87 Added comment with problem description and two soltions 2014-05-06 04:35:29 +04:00
Dmitry Stogov 28a8135331 Restored original EG(scope) behavior when call object methods 2014-05-06 02:04:05 +04:00
Nikita Popov 211d32c814 Initialize CG(one_time_string) in ZTS as well 2014-05-05 22:21:57 +02:00
Dmitry Stogov cd4b4dfc4d Merge branch 'master' into refactoring2
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
2014-05-05 13:02:43 +04:00
Dmitry Stogov 83d45d0a04 GC checks during argument release don't make sense 2014-05-05 12:40:16 +04:00
Xinchen Hui bea30846bb Refactor Zip (1 test failed) 2014-05-05 10:49:27 +08:00
Nikita Popov b30c7fe263 Port JSON 2014-05-05 01:00:59 +02:00
Anatol Belski 149568f4da Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed ZEND_DEBUG usage
2014-05-05 00:51:40 +02:00
Anatol Belski 0d5121a3c7 fixed ZEND_DEBUG usage 2014-05-05 00:50:51 +02:00
Nikita Popov 42d4adabbd 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.
2014-05-03 11:29:08 +02:00
Nikita Popov 65f488ece3 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.
2014-05-03 10:43:45 +02:00
Xinchen Hui d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Nikita Popov 46bcaf1b28 Merge branch 'PHP-5.6' 2014-05-02 12:52:44 +02:00
Nikita Popov 69b5ee61d0 Fixed bug #67169: []= after_array_splice incorrect
This fixes a regression I introduced in beta 1.
2014-05-02 12:49:51 +02:00
Nikita Popov d820ea9f5e Avoid superflous allocations in convert_to_string
Taken from zval_get_string.
2014-05-01 09:08:30 +02:00
Nikita Popov e0247de147 zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
Nikita Popov 5a03efe279 Don't allocate zend_stack elements individually
Instead allocate a vector of elements. Size must now be specified
on initialization rather than on push.
2014-05-01 09:08:29 +02:00
Nikita Popov 2c24cdb4a3 Comment out cast_object for IS_NULL 2014-05-01 00:25:23 +02:00
Dmitry Stogov 52e79186b2 JMPZ/JMPNZ/JMPZNZ optimization 2014-05-01 01:24:38 +04:00
Dmitry Stogov 17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov 6a911e833f Optimized JMPZNZ to avoid multiplication at runtime (may be it makes sense to use relative addresses everywere it'll lead to Position Independent Code) 2014-04-30 11:23:19 +04:00
Dmitry Stogov 8a8df2ce68 Changed order of types 2014-04-29 10:54:59 +04:00
Nikita Popov 4cd97b3ebd Fix by-reference argument unpacking 2014-04-26 10:40:12 +02:00
Nikita Popov 5db9312ec8 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.
2014-04-25 23:21:05 +02:00
Nikita Popov 778946b3b6 Use convert_scalar_to_array only for arrays 2014-04-25 23:21:05 +02:00