summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-1/+1
|\ | | | | | | | | | | * origin/master: fix integral constant overflow warning Use HUGE PAGES for opcahce SHM, if available.
| * fix integral constant overflow warningPRE_NATIVE_TLS_MERGEAnatol Belski2014-12-171-1/+1
| | | | | | | | as it's promoted to size_t when passed to ZEND_CALL_ARG
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-1/+1
|\ \ | |/ | | | | | | | | * origin/master: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Added EXPECTED(). Most functions have arguments.
| * Added EXPECTED(). Most functions have arguments.Dmitry Stogov2014-12-171-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-172-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix unserializer patch move this entry to the correct version add missing NEWS entry add missing NEWS entry Updated or skipped certain 32-bit tests add NEWS entry for #68594 5.4.37 add more BC breaks update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Fix typo Hash value must not zero?
| * Merge branch 'fix-typo' of https://github.com/gustavotemple/php-srcXinchen Hui2014-12-171-0/+1
| |\
| | * Fix typoGustavo Frederico Temple Pedrosa2014-12-151-0/+1
| | |
| * | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2014-12-1716-99/+388
| |\ \
| * | | Hash value must not zero?Xinchen Hui2014-12-131-0/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-165-64/+194
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Optimize argument passing handlers: Fix pcre non-FAST_ZPP build Conflicts: Zend/zend_compile.c Zend/zend_execute.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/pcre/php_pcre.c
| * | | Optimize argument passing handlers:Dmitry Stogov2014-12-165-64/+194
| | | | | | | | | | | | | | | | | | | | | | | | - predcalculate offsets of passed argument and store it in opline->result.var for ZEND_SEND_*; - don't update "number of passed arguments" op each ZEND_SEND_* opcode, store it on call frame creation - Change ZEND_HANDLE_EXCEPTION to determine "number of passed arguments" in incomplete calls fefore freeing
* | | | don't need this in nts modeAnatol Belski2014-12-161-1/+0
| | | |
* | | | reworked ini dtorAnatol Belski2014-12-163-4/+15
| | | |
* | | | free the right globalsAnatol Belski2014-12-163-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | That's the same as in the previous commit. In the TS mode the tsrm cache pointer might be unavailable or point to a wrong thread, so the exact globals passed should be freed.
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * origin/master: fix perms fix perms PowerPC64 support in safe_address function
| * | | PowerPC64 support in safe_address functionGustavo Frederico Temple Pedrosa2014-12-161-0/+24
| | | | | | | | | | | | | | | | | | | | Add a ppc64-specific implementation of the safe_address function with overflow checking.
* | | | depending on declaration the tsrm cache pointer might be unavailableAnatol Belski2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | during shutdown when the main thread frees all the other threads resources. Even otherwise, exact resource passed to the dtor should be freed, not the one from the current thread.
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-162-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Revert "Removed useless local variable" Fix the fix for bug #55415 add BC breaks from PHPNG RFC add include for definition of php_url_encode
| * | | Revert "Removed useless local variable"Dmitry Stogov2014-12-162-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 44ae32ad55b9ceee9eb980edefcc62df6cff3eef. It doesn't work properly. We can't access call->scope after free.
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-154-16/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: made the apache ini holders to be zend_bool Removed useless local variable Use simpler functions Fixed test small fixes to UPGRADING Reorder to save alignment size (of course, only for common used structs)
| * | | Removed useless local variableDmitry Stogov2014-12-152-8/+4
| | | |
| * | | Use simpler functionsDmitry Stogov2014-12-152-8/+5
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-152-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Save 8 bytes on 64 bits Conflicts: Zend/zend_API.c
| * | | Save 8 bytes on 64 bitsXinchen Hui2014-12-152-2/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-145-0/+118
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Fix bug #67106 split main fpm config split fpm config to two parts. PR#903 fix typo Fix undefined behaviour in strnatcmp Fix undefined behaviour in strnatcmp Fixed memory leak introduced by 73458e8f update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c
| * | | Fixed memory leak introduced by 73458e8fAndrea Faulds2014-12-135-0/+118
| | | |
* | | | removed the TS part, as suggested by Dmitry.Anatol Belski2014-12-141-4/+0
| | | | | | | | | | | | | | | | Tests seem to be ok so far
* | | | second shot on removing TSRMLS_*Anatol Belski2014-12-148-42/+43
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-1388-5625/+5550
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-1320-67/+156
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (37 commits) NEWS NEWS Fix bug #68601 buffer read overflow in gd_gif_in.c Fixed compilation warnings Removed unnecessary checks pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary Merged PR #911. Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before. Updated NEWS Updated NEWS Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes Updated NEWS Updated NEWS Updated NEWS Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) Updated NEWS Updated NEWS Fix MySQLi tests Fixed gd test ...
| * | | Merge branch 'zppFailOnOverflow'Andrea Faulds2014-12-133-25/+46
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * zppFailOnOverflow: Fix MySQLi tests Fixed gd test Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG() Fixed copy-and-paste error Fix more 32-bit tests Skip buncha tests on 32-bit skip simplexml skip posix 32-bit skip tests on 32-bit Fixes simplexml test Fixes posix tests Fixes iconv tests Marked tests as 32-bit Fixed more 32-bit tests Fixed some 32-bit tests Mark said ext/date tests as 32-bit only Fixed ext/date tests broken by zpp error on overflow Fixed broken tests Make zpp fail if NaN passed for int, or out-of-range float for non-capping int Conflicts: ext/date/tests/getdate_variation7.phpt ext/date/tests/localtime_variation3.phpt
| | * | Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()Andrea Faulds2014-11-293-7/+13
| | | |
| | * | Fixed copy-and-paste errorAndrea Faulds2014-11-291-1/+1
| | | |
| | * | Merge branch 'master' into zppFailOnOverflowAndrea Faulds2014-11-2946-3000/+3261
| | |\ \
| | * \ \ Merge branch 'master' into zppFailOnOverflowAndrea Faulds2014-11-0811-318/+1324
| | |\ \ \
| | * \ \ \ Merge branch 'master' into zppFailOnOverflowAndrea Faulds2014-11-01131-12472/+11914
| | |\ \ \ \
| | * | | | | Make zpp fail if NaN passed for int, or out-of-range float for non-capping intAndrea Faulds2014-09-222-22/+37
| | | | | | |
| * | | | | | Fixed compilation warningsDmitry Stogov2014-12-1214-32/+37
| | | | | | |
| * | | | | | Removed unnecessary checksDmitry Stogov2014-12-121-6/+6
| | | | | | |
| * | | | | | Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some ↵Guilherme Blanco2014-12-125-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | currently defined classes as final which were just not being considered as such before.
| * | | | | | Merge branch 'PHP-5.6'Julien Pauli2014-12-123-2/+66
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) Conflicts: Zend/zend_compile.c
| | * \ \ \ \ \ 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 remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-1213-1520/+1653
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: updated NEWS PowerPC64 support for add and sub with overflow check PowerPC64 support for operators with overflow check Fixed bug #68583 Crash in timeout thread Reduced size of zend_op on 64-bit systems. Make ZEND_INIT_FCALL keep predcalculted size of necessary stack space in opline->op1.num to avoid its recalculation on each execution. Removed unused variables Improved array_merge() and array_replace() (1-st array may be added using simple procedure). Replaced zendi_convert_to_long() with _zval_get_long_func() Moved zend_is_true() from zend_execute.h/zend_execute_API.c into zend_operators.h/zend_operators.c. Splited the most expensive part of inline i_zend_is_true() into a separate zend_object_is_true(). Replaced zendi_convert_to_long() with cals to zend_is_true(). Revert "Save one xor instr" Save one xor instr Conflicts: Zend/zend_execute_API.c
| * | | | | | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-123-128/+41
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed bug #68583 Crash in timeout thread Conflicts: Zend/zend_execute.h Zend/zend_execute_API.c
| | * | | | | | | 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.
| * | | | | | | | PowerPC64 support for add and sub with overflow checkGustavo Frederico Temple Pedrosa2014-12-121-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds fast architecture-specific implementations of the following functions for the ppc64: * fast_add_function * fast_sub_function
| * | | | | | | | PowerPC64 support for operators with overflow checkGustavo Frederico Temple Pedrosa2014-12-121-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds fast architecture-specific implementations of the following functions for the ppc64: * fast_increment_function * fast_decrement_function
| * | | | | | | | Reduced size of zend_op on 64-bit systems.Dmitry Stogov2014-12-129-1131/+1284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the main idea - the smaller the zend_op structure, the lees memory traffic is required to load VM instructions during execution. The patch reduces the size of each opcode from 48 to 32 bytes (saves 16 bytes for each opcode, and applications use thousands of opoceds). This reduced the number of CPU cache misses by 12% and improved performance of real-life apps by 1-2%. The patch affects how constants and jump targets are represented in VM during execution. Previously they were implemented as absolute 64-bit pointers. Now they are relative 32-bit offsets. In run-time constant now should be accessed as: RT_CONSTANT(op_array, opine->op1) instead of opline->op1.zv EX_CONSTANT(opline->op1) instead of opline->op1.zv Jump targets: OP_JMP_ADDR(opline, opline->op2) instead of opline->op2.jmp_addr The patch doesn't change zend_op representation for 32-bit systems. They still use absolute addresses. The compile-time representation is also kept the same.
View Lorry Controller Status