summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug #68676 (Explicit Double Free)Kalle Sommer Nielsen2014-12-291-1/+1
|
* Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-12-191-0/+20
|\
| * Fix bug #67111Nikita Popov2014-12-191-0/+20
| | | | | | | | | | | | | | Loop variables need to be freed for both "break" and "continue". I'm adding the test to Zend/ because it's good to have a test for this even without opcache.
* | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-123-2/+66
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) Conflicts: Zend/zend_compile.c
| * Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)Kévin Dunglas2014-12-123-2/+66
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-123-128/+41
|\ \ | |/ | | | | | | | | | | | | * PHP-5.5: Fixed bug #68583 Crash in timeout thread Conflicts: Zend/zend_execute.h
| * Fixed bug #68583 Crash in timeout threadAnatol Belski2014-12-123-128/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the GUI element used for execution timeout handling on Windows. Instead a timer queue technique is used, which is indeed a thread pool. A timer queue timer is a lightweight object handled but that thread pool and the timer thread spends most of the time sleeping and waiting for an alert. Please note also that this introduces neither binary nor source breach. The custom timeout thread functions are deleted, however they was not exported throug DLL, so couldn't be used by any external code. As well they couldn't be used anywhere in the core except in executor api, because those custom timeout thread functions they used to operate on static variables which would be overwritten (and that would blow). So instead a relatively modern technique is used for the timeout handling. It's still not perfect because the executor still has to check EX(timed_out). This can be a topic for an improvement in master. But brobably can be tricky as currently it seems to be not possible to signal an individual thread. Also note another issue that static variables aren't thread safe, but the current timer implementation is.
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-031-3/+6
|\ \ | |/ | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation
| * Fixed bug #55541 errors spawn MessageBox, which blocks test automationAnatol Belski2014-12-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With that, also fixed bug #68297 (Application Popup provides too few information) as a better error message is provided to the event log. In the second case, the condition for display_startup_error was removed. The condition was added as a fix for bug #30760 which was preventing the MessageBox to appear. When display_startup_error=on, the error will be seen on the console. But when running under a webserver it'll probably get lost, so we need to log it other way into the event log (would be done automatically when message box was used, but that would eventually cause issues of blocked execution). Generally speaking - any MessageBox or other graphical element is a potential issue and that was repeatedly reported. Graphical elements shouldn't be used in the core. Even being a rare one it can cause a bad situation where the server is blocked. Yet some places have to cleaned up.
* | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-11-282-0/+29
|\ \ | |/ | | | | | | | | * PHP-5.5: updated NEWS Fix #65419 - Inside trait, self::class != __CLASS__
| * Fix #65419 - Inside trait, self::class != __CLASS__Julien Pauli2014-11-282-0/+29
| |
* | #68446 is fixedFerenc Kovacs2014-11-261-2/+0
| |
* | fix dir separator in testAnatol Belski2014-11-251-1/+1
| |
* | fix TS buildAnatol Belski2014-11-251-4/+4
| |
* | Better fix for bug #68446Dmitry Stogov2014-11-254-17/+41
| |
* | Revert NEWS and set test to XFAILBob Weinand2014-11-251-0/+2
| |
* | Revert "Fix bug #68446 (bug with constant defaults and type hints)"Bob Weinand2014-11-255-80/+47
| | | | | | | | This reverts commit 5ef138b0c7c4e9532e205f45c18a72aa1d279c24.
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-234-0/+14
|\ \ | |/ | | | | | | | | | | | | * PHP-5.5: update NEWS Update the VM generation script, per Bob. Update NEWS after rebase. Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
| * Merge branch 'pull-request/840' into PHP-5.5Stanislav Malyshev2014-11-234-0/+14
| |\ | | | | | | | | | | | | | | | | | | * pull-request/840: Update the VM generation script, per Bob. Update NEWS after rebase. Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
| | * Update the VM generation script, per Bob.Adam Harvey2014-10-311-0/+2
| | |
| | * Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.Adam Harvey2014-10-313-0/+12
| | |
* | | Added NEWS entry and test for bug 68446Bob Weinand2014-11-241-0/+36
| | |
* | | Fix bug #68446 (bug with constant defaults and type hints)Bob Weinand2014-11-235-47/+80
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-11-211-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix #68185 - Inconsistent insteadof definition Conflicts: Zend/zend_compile.c
| * | Fix #68185 - Inconsistent insteadof definitionJulien Pauli2014-11-211-1/+1
| | |
| * | fix incompatible pointer typesAnatol Belski2014-11-171-2/+6
| | |
| * | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-11-101-1/+1
| |\ \
* | | | fix incompatible pointer typesAnatol Belski2014-11-171-2/+6
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-11-102-7/+18
|\ \ \ \ | |/ / /
| * | | Fixed bug #68370 ("unset($this)" can make the program crash)Xinchen Hui2014-11-102-7/+18
| | |/ | |/|
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-11-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | * PHP-5.5: Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy) Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
| * | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-11-071-1/+1
| |\ \ | | |/ | |/| | | | | | | * PHP-5.4: Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
| | * Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in ↵Dmitry Stogov2014-11-071-1/+1
| | | | | | | | | | | | zend_hash_copy)
* | | Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)Xinchen Hui2014-10-311-9/+6
| | |
* | | DLL export several APIs needed for phpdbgAnatol Belski2014-10-124-4/+4
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-10-032-3/+27
|\ \ \ | |/ /
| * | Fix bug #68188Nikita Popov2014-10-032-3/+27
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2014-09-202-0/+53
|\ \ \ | |/ /
| * | Fixed bug #67633Nikita Popov2014-09-202-0/+53
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-09-092-0/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed #67985 - Incorrect last used array index copied to new array after unset
| * | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-09-092-0/+17
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed #67985 - Incorrect last used array index copied to new array after unset
| | * Fixed #67985 - Incorrect last used array index copied to new array after unsetTjerk Meesters2014-09-092-0/+17
| | | | | | | | | | | | In master zend_array_dup() is used to do this properly; this is a workaround.
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-09-013-2/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-013-2/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: update NEWS Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
| | * Merge branch 'pull-request/770' into PHP-5.4Stanislav Malyshev2014-09-013-2/+18
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/770: Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
| | | * Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)Keyur Govande2014-08-231-9/+12
| | | |
| | | * Fix typo from commit 32314f6b6Keyur Govande2014-08-141-1/+1
| | | |
| | | * Fix destruction order in zend_shutdown (bug #65463, #66036)Keyur Govande2014-08-143-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Apache or a similar SAPI receives a signal during PHP processing it calls zend_shutdown() without calling shutdown_executor(). #65463: If a module like Gearman or Memcached is loaded, in the unfixed version it is unloaded by zend_destroy_modules() before the CG(CLASS_TABLE) is destructed. When CG(CLASS_TABLE) is destructed, any pointers to methods (specifically around destruction) in the unloaded module's .so are now dangling and the process segfaults. #66036: Any subclasses of an internal class like ArrayObject need to be destructed in order: subclass first and then the internal class. In the unfixed version zend_shutdown() clears the CG(CLASS_TABLE) from the head of the list onwards, so internal classes are destructed first and user-defined classes last. Internal classes are alloc/deallocated with malloc/free while user-defined classes with emalloc/efree. If there's shared data between them then efree() could be called instead of free() leading to a seg-fault.
* | | | Making ini parser typedTjerk Meesters2014-09-015-4671/+4889
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode
* | | | Fix bug #67938: Segfault when extending interface method with variadicNikita Popov2014-08-302-1/+28
| | | | | | | | | | | | | | | | | | | | We only want to check extra optional args if the proto function is variadic, not when we're adding extra variadic args.
View Lorry Controller Status