summaryrefslogtreecommitdiff
path: root/main/php_variables.c
Commit message (Collapse)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-63/+63
|
* fix datatype mismatchAnatol Belski2014-10-271-2/+2
|
* Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | 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.
* s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
|
* Merge branch 'PHP-5.6'Michael Wallner2014-09-091-5/+7
|\ | | | | | | | | | | * PHP-5.6: duplicate value's string for the SAPI filter Fine tuned the order of adding request variables.
| * duplicate value's string for the SAPI filterMichael Wallner2014-09-091-5/+7
| | | | | | | | reported by sesser; tyrael, do you take care of the bug/NEWS?
* | master renames phase 3Anatol Belski2014-08-251-8/+8
| |
* | master renames phase 1Anatol Belski2014-08-251-15/+15
| |
* | yet more fixes to zppAnatol Belski2014-08-201-1/+1
| |
* | mostly fixes to spl, but also some otherAnatol Belski2014-08-171-1/+1
| |
* | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-11/+11
| |
* | Merge branch 'call-frame' into phpngDmitry Stogov2014-07-071-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * call-frame: Simplify call-frame handling Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data) Use values from current_execute_data instead of globals where possible Removed EG(called_scope) and use corresponding value from EG(current_execute_data) Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something. Removed EG(opline_ptr) and use corresponding value from EG(current_execute_data) Removed EG(active_op_array) and use corresponding value from EG(current_execute_data) Uinified call frame handling for user and internal functions. Now EG(current_execute_data) always point to the call frame of the currently executed function. Fixed cleanup of incompleytely passed parameters Prohibited parameter redefinition Fixed support for extra arguments in conjunction with variadiv argument. Use compile time flags to check if we call constructor and result of ZEND_NEW is used or not. Fixed uninitialized variables Optimization Changed zend_execute_data layout to reduce memory overhead Help C compilet to do the better job optimizing target code Use fast comparison for (func->type == ZEND_USER_FUNCTION || func->type == ZEND_EVAL_CODE) Keep extra args in the same VM stack segment (after all CV and TMP vars) Refactoring: merge call_frame and end_execute_data into single data structure. Keep only single copy of each argument on VM stack (previously ZE kept two copies of each arguments for user functions) Refactoring: use call_frames instead of call_slots Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| * | Removed EG(active_symbol_table) and use corresponding value from ↵Dmitry Stogov2014-07-041-2/+1
| | | | | | | | | | | | EG(current_execute_data)
* | | Fixed segfault if empty POSTXinchen Hui2014-07-031-4/+2
|/ /
* | Prefer the macro we definedXinchen Hui2014-05-071-11/+7
| |
* | Refactored filterXinchen Hui2014-05-071-4/+5
| |
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'Anatol Belski2014-04-241-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: fix dll export
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-241-1/+1
| | |\ | | | | | | | | | | | | | | | | * PHP-5.5: fix dll export
| | | * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-241-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix dll export
| | | | * fix dll exportAnatol Belski2014-04-241-1/+1
| | | | |
| * | | | Merge branch 'PHP-5.6'Bob Weinand2014-04-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-04-121-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-121-1/+1
| | | |\ \ | | | | |/
| | | | * Made usage of php_hash_environment useful by updating instead of just adding ↵Bob Weinand2014-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | argc
| | | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
| | | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
* | | | | Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), ↵Dmitry Stogov2014-04-031-5/+3
| | | | | | | | | | | | | | | | | | | | candidate for GC, etc)
* | | | | Refactored IS_INDIRECT usage for CV and object properties to support ↵Dmitry Stogov2014-03-261-5/+14
| | | | | | | | | | | | | | | | | | | | HashTable resizing
* | | | | Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*Dmitry Stogov2014-03-171-2/+4
| | | | |
* | | | | Fixed variable name registerXinchen Hui2014-03-051-1/+1
| | | | |
* | | | | Refacting smart_strXinchen Hui2014-02-181-7/+7
| | | | |
* | | | | Use better data structures (incomplete)Dmitry Stogov2014-02-171-16/+12
| | | | |
* | | | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-210/+123
|/ / / /
* | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ \ \ | |/ / /
| * | | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| * | | Add E_DEPRECATED when populating $HTTP_RAW_POST_DATAMichael Wallner2013-12-301-1/+0
|/ / /
* | | better way to fix PRIu64 availability on windowsAnatol Belski2013-09-181-4/+3
| | |
* | | fix build - PRIu64 vs %I64uAnatol Belski2013-09-171-0/+4
| | |
* | | Merge branch 'slim-postdata'Michael Wallner2013-09-171-28/+100
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * slim-postdata: slim post data add NEWS entry; add simple test more precise condition make this work in vc11 too Use int64_t and atoll() after discussion with johannes ws Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
| * | slim post dataMichael Wallner2013-08-271-28/+100
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | uninitialized' warnings.
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
| * MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical ↵Xinchen Hui2012-03-021-1/+1
| | | | | | | | vars)
| * Improved max_input_vars directive to check nested variablesDmitry Stogov2012-02-141-20/+15
| |
| * Fixed memory leaksDmitry Stogov2012-02-021-15/+15
| |
| * fix UMR in php_register_variable_ex, reported by Stefan EsserStanislav Malyshev2012-02-011-0/+3
| |
| * Changed: restoring REQUEST_TIME as a long, introducing REQUEST_TIME_FLOAT ↵Patrick Allaert2012-01-061-4/+7
| | | | | | | | instead as discussed on the ML
| * - Year++Felipe Pena2012-01-011-1/+1
| |
View Lorry Controller Status