Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Avoid useless merge | Dmitry Stogov | 2014-06-04 | 1 | -6/+1 | |
| | | ||||||
* | | Use new zend_hash API | Dmitry Stogov | 2014-05-27 | 1 | -17/+11 | |
| | | ||||||
* | | Fixed apply_func_arg_t, and it's better not using cast (compiler friendly) | Xinchen Hui | 2014-05-25 | 1 | -5/+7 | |
| | | ||||||
* | | Fixed apply_func_t (they should be broken before) | Xinchen Hui | 2014-05-25 | 1 | -3/+11 | |
| | | ||||||
* | | Fixed memory leaks | Dmitry Stogov | 2014-05-15 | 1 | -1/+1 | |
| | | ||||||
* | | ext/soap support for phpng (incomplete - just compilable) | Dmitry Stogov | 2014-05-15 | 1 | -0/+14 | |
| | | ||||||
* | | Save one type checking if the type is already string | Xinchen Hui | 2014-05-13 | 1 | -2/+2 | |
| | | ||||||
* | | Fixed wrong buffer length (added place for terminating zero) | Dmitry Stogov | 2014-05-12 | 1 | -2/+2 | |
| | | ||||||
* | | Re-applyed Bob's patch with minor fixes | Dmitry Stogov | 2014-05-07 | 1 | -1/+0 | |
| | | ||||||
* | | Reverted Bob's patch (it breaks many tests when run with opcache and needs ↵ | Dmitry Stogov | 2014-05-07 | 1 | -0/+1 | |
| | | | | | | | | to be fixed first). | |||||
* | | Fix parse_method_params | Nikita Popov | 2014-05-06 | 1 | -1/+6 | |
| | | ||||||
* | | Fix error message in parse_method_params | Nikita Popov | 2014-05-06 | 1 | -1/+1 | |
| | | ||||||
* | | Re-added fix for bug #66015 and adapted for phpng branch | Bob Weinand | 2014-05-06 | 1 | -1/+0 | |
| | | ||||||
* | | Refactor Zip (1 test failed) | Xinchen Hui | 2014-05-05 | 1 | -2/+9 | |
| | | ||||||
* | | Split IS_BOOL into IS_FALSE and IS_TRUE | Dmitry Stogov | 2014-04-30 | 1 | -9/+21 | |
| | | ||||||
* | | Merge mainstream 'master' branch into refactoring | Dmitry Stogov | 2014-04-26 | 1 | -4/+15 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * \ | Merge branch 'PHP-5.6' | Bob Weinand | 2014-04-11 | 1 | -3/+3 | |
| |\ \ | | |/ | ||||||
| | * | Removed useless void* parameter and replaced with zend_bool on ↵ | Bob Weinand | 2014-04-11 | 1 | -3/+3 | |
| | | | | | | | | | | | | zval_update_constant* functions | |||||
| * | | Merge branch 'PHP-5.6' | Bob Weinand | 2014-04-11 | 1 | -1/+0 | |
| |\ \ | | |/ | ||||||
| | * | Fix bug #66015 by reverting "Removed operations on constant arrays." | Bob Weinand | 2014-04-11 | 1 | -1/+0 | |
| | | | ||||||
| * | | Merge branch 'PHP-5.6' | Sara Golemon | 2014-02-17 | 1 | -1/+12 | |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.6: Add __debugInfo() magic method | |||||
| | * | Add __debugInfo() magic method | Sara Golemon | 2014-02-17 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class Foo { private $val = 'Random, meaningless data'; public function count() { return 42; } public function __debugInfo() { return ['count' => $this->count()]; } } $f = new Foo; var_dump($f); | |||||
* | | | Fixed compilation warnings | Dmitry Stogov | 2014-04-22 | 1 | -7/+3 | |
| | | | ||||||
* | | | Use zval_get_string in a few more places | Nikita Popov | 2014-04-21 | 1 | -6/+1 | |
| | | | ||||||
* | | | Use alloca() for temporary allocation | Dmitry Stogov | 2014-04-21 | 1 | -7/+13 | |
| | | | ||||||
* | | | Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of ↵ | Dmitry Stogov | 2014-04-18 | 1 | -49/+21 | |
| | | | | | | | | | | | | zend_hash_move_forward() and family. | |||||
* | | | Moved zend_literal->cache_slot right into zval. | Dmitry Stogov | 2014-04-17 | 1 | -13/+13 | |
| | | | | | | | | | | | | | | | | | | | | | It should be accessed using Z_CACHE_SLOT() macro. zend_literal structure is removed. API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly. Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL. | |||||
* | | | Cleanup (2-nd round) | Dmitry Stogov | 2014-04-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Cleanup (1-st round) | Dmitry Stogov | 2014-04-15 | 1 | -27/+12 | |
| | | | ||||||
* | | | Fixed zend_object_get_t in simpleXML | Xinchen Hui | 2014-04-15 | 1 | -2/+4 | |
| | | | ||||||
* | | | Fix ZTS build | Nikita Popov | 2014-04-09 | 1 | -11/+7 | |
| | | | | | | | | | | | | | | | This only makes it compile, it doesn't actually work, presumably because interned strings are assumed in some places. | |||||
* | | | Fixed destruction of objects and iterators on unclean request shutdown and ↵ | Dmitry Stogov | 2014-04-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | GC (few cases are still unfixed). Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves. | |||||
* | | | Constant duplication optimization | Dmitry Stogov | 2014-04-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | Argument receiving optimization | |||||
* | | | Various VM optimizations | Dmitry Stogov | 2014-04-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), ↵ | Dmitry Stogov | 2014-04-03 | 1 | -6/+6 | |
| | | | | | | | | | | | | candidate for GC, etc) | |||||
* | | | Use STR_COPY() instead of STR_DUP() where possible | Dmitry Stogov | 2014-04-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Refactor session (incompleted) | Xinchen Hui | 2014-03-28 | 1 | -1/+3 | |
| | | | ||||||
* | | | Refactored data structures to keep zend_object* instead of a whole zval in ↵ | Dmitry Stogov | 2014-03-28 | 1 | -47/+43 | |
| | | | | | | | | | | | | some places | |||||
* | | | Cleanup | Dmitry Stogov | 2014-03-27 | 1 | -2/+2 | |
| | | | ||||||
* | | | Use ZVAL_DEREF() macro | Dmitry Stogov | 2014-03-27 | 1 | -19/+5 | |
| | | | ||||||
* | | | Replaced (Z_TYPE(x) == IS_REFERENCE) with (Z_ISREF(x)) | Dmitry Stogov | 2014-03-27 | 1 | -4/+4 | |
| | | | ||||||
* | | | Refactored IS_INDIRECT usage for CV and object properties to support ↵ | Dmitry Stogov | 2014-03-26 | 1 | -2/+65 | |
| | | | | | | | | | | | | HashTable resizing | |||||
* | | | More accurate zval comparison | Dmitry Stogov | 2014-03-19 | 1 | -1/+26 | |
| | | | ||||||
* | | | Fixed passing arguments by reference from internal functions | Dmitry Stogov | 2014-03-11 | 1 | -1/+6 | |
| | | | ||||||
* | | | Forgot to remove unused codes | Xinchen Hui | 2014-03-07 | 1 | -6/+0 | |
| | | | ||||||
* | | | Refactor reference handling | Xinchen Hui | 2014-03-07 | 1 | -20/+27 | |
| | | | ||||||
* | | | Fixed support for references | Dmitry Stogov | 2014-03-07 | 1 | -0/+6 | |
| | | | ||||||
* | | | Invalid free of args("+") | Xinchen Hui | 2014-03-05 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 | Xinchen Hui | 2014-03-05 | 1 | -1/+3 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ext/standard/array.c | |||||
| * | | | Handle interned strings as non-refcounted scalars | Dmitry Stogov | 2014-03-05 | 1 | -1/+3 | |
| | | | |