summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix assertion in Exception::getMessage() if $message is a refNikita Popov2019-02-251-12/+24
| | | | And same for other properties. Encountered in Symfony.
* Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-06-241-1/+1
|\
| * Fixed bug #76502Nikita Popov2018-06-241-1/+1
| |
| * year++Xinchen Hui2018-01-021-1/+1
| |
* | year++Xinchen Hui2018-01-021-1/+1
| |
* | further sync for vim mode linesAnatol Belski2017-07-041-0/+2
| |
* | Interned strings unification for TS/NTSAnatol Belski2017-03-041-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | Hereby, interned strings are supported in thread safe PHP. The patch implements two types of interned strings - interning per process, strings are not freed till process end - interning per request, strings are freed at request end There is no runtime interning. With Opcache, all the permanent iterned strings are copied into SHM on startup, additional copying into SHM might happen on demand.
* | rework fd521a22 to simplify for master, see github #2356Anatol Belski2017-02-071-5/+1
| |
* | Merge branch 'PHP-7.1'Anatol Belski2017-02-071-2/+2
|\ \ | |/ | | | | | | * PHP-7.1: switch to smart str conversion routine to hide exact NAN type
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-02-071-2/+2
| |\ | | | | | | | | | | | | * PHP-7.0: switch to smart str conversion routine to hide exact NAN type
| | * switch to smart str conversion routine to hide exact NAN typeAnatol Belski2017-02-071-2/+2
| | | | | | | | | | | | see https://github.com/php/php-src/pull/2356#issuecomment-277564135
| | * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| | |
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| | |
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
| | |
* | | Export zend_s(tr)pprintfNikita Popov2017-01-011-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's annoying that in Zend you have to use zend_strpprintf instead of strpprintf, while in PHP you have to use strpprintf instead of zend_strpprintf. Make zend_s(tr)pprintf always available and keep s(tr)pprintf as macro aliases.
* | | Merge branch 'PHP-7.1'Dmitry Stogov2016-12-071-1/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.1: Check if PHP is in execution state.
| * | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-12-071-1/+3
| |\ \ | | |/ | | | | | | | | | * PHP-7.0: Check if PHP is in execution state.
| | * Check if PHP is in execution state.Dmitry Stogov2016-12-071-1/+3
| | |
* | | further normalizations, uint vs uint32_tAnatol Belski2016-11-261-2/+2
|/ / | | | | | | | | | | fix merge mistake yet one more replacement run
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-10-221-2/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #73350 (Exception::__toString() cause circular references)
| * Fixed bug #73350 (Exception::__toString() cause circular references)Xinchen Hui2016-10-221-2/+3
| |
| * Revert "export symbol missing by phpdbg"Anatol Belski2016-10-131-0/+12
| | | | | | | | | | | | This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there
| * export symbol missing by phpdbgAnatol Belski2016-10-121-12/+0
| |
| * Fix bug #73190: memcpy negative parameter _bc_new_num_exStanislav Malyshev2016-10-121-5/+21
| | | | | | | | (cherry picked from commit 40e7baab3c90001beee4c8f0ed0ef79ad18ee0d6)
* | Revert "export symbol missing by phpdbg"Anatol Belski2016-10-141-0/+12
| | | | | | | | | | | | | | | | This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there (cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246)
* | fix another mistakeAnatol Belski2016-10-141-1/+1
| | | | | | | | (cherry picked from commit bec0121733cc5777c4d3fde8e9ff56fe68c039d3)
* | export symbol missing by phpdbgAnatol Belski2016-10-141-12/+0
| | | | | | | | (cherry picked from commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1)
* | fix wrong mergeAnatol Belski2016-10-141-4/+3
| | | | | | | | (cherry picked from commit 821a230f290b7457d4223001286afe00fe887277)
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-141-4/+21
| | | | | | | | | | | | | | * PHP-7.0: Fix bug #73190: memcpy negative parameter _bc_new_num_ex (cherry picked from commit af1bf873fe4fc70be17fa9f270e8f30666f2d2db)
* | Implement \ArgumentCountError exceptionDavey Shafik2016-08-301-1/+6
| |
* | Merge branch 'PHP-7.0'Nikita Popov2016-07-141-0/+2
|\ \ | |/ | | | | | | Conflicts: Zend/zend_vm_execute.h
| * Fix leak of class name when printing exception backtraceNikita Popov2016-07-141-0/+1
| |
| * Fix leak if throw_exception_object() failsNikita Popov2016-07-141-0/+1
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-07-121-2/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-7.0: Fixed bug #72581 (previous property undefined in Exception after deserialization) Conflicts: Zend/zend_exceptions.c
| * Fixed bug #72581 (previous property undefined in Exception after ↵Xinchen Hui2016-07-121-2/+1
| | | | | | | | deserialization)
* | Merge branch 'PHP-7.0'Dmitry Stogov2016-06-221-2/+4
|\ \ | |/ | | | | | | * PHP-7.0: Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).
| * Allow "proxy" ovjects to substitute their class names through ↵Dmitry Stogov2016-06-221-2/+4
| | | | | | | | get_class_name() handler (similar to var_dump() and others).
* | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-211-1/+1
| | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | Intern some known (and offten used) strings.Dmitry Stogov2016-05-121-73/+92
| |
* | Fixed compilation warningsDmitry Stogov2016-04-291-4/+5
| |
* | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-1/+0
| | | | | | | | but is never used.
* | Merge zend_execute_data->called_scope into zend_execute_data->This.Dmitry Stogov2016-04-011-4/+8
| | | | | | | | | | | | | | "called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this. Now EG(This) may store IS_OBJECT + $this or IS_UNUSED + "called_scope" (of course, "called_scope" may be NULL). Some code might need to be adopted to support this change. Checks (Z_OBJ(EX(This))) might need to be converted into (Z_TYPE(EX(This)) == IS_OBJECT).
* | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
| |
* | Merge branch 'PHP-7.0'Xinchen Hui2016-01-021-1/+1
|\ \ | |/
| * bump year which is missed in rev 49493a2Xinchen Hui2016-01-021-1/+1
| |
* | cleanupXinchen Hui2015-11-211-61/+8
|/
* Port the fix of 5.6 to 7.0Xinchen Hui2015-11-211-17/+18
|
* Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-11-201-1/+9
|\ | | | | | | | | Conflicts: Zend/zend_exceptions.c
| * Fixed bug #70944 (try{ } finally{} can create infinite chains of exceptions)Xinchen Hui2015-11-201-1/+8
| |
* | Mark error and exception functions as "cold" (Matt's idea)Dmitry Stogov2015-08-191-7/+7
| |
View Lorry Controller Status