summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'PHP-5.6'Julien Pauli2014-12-123-8/+39
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes
| | * | | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+4
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-123-8/+39
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes
| | | * | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+4
| | | | | | | | | | |
| | | * | | | | | | | Fix bug #68532: convert.base64-encode omits padding bytesmcq82014-12-123-8/+39
| | | | | | | | | | |
| * | | | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+2
| | | | | | | | | | |
| * | | | | | | | | | 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
| | * | | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+2
| | | | | | | | | | |
| | * | | | | | | | | 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
| | | * | | | | | | | Updated NEWSJulien Pauli2014-12-121-0/+2
| | | | | | | | | | |
| | | * | | | | | | | Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)Kévin Dunglas2014-12-123-2/+66
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'PHP-5.6'Julien Pauli2014-12-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS
| | * | | | | | | | | Updated NEWSJulien Pauli2014-12-121-4/+6
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-120-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS
| | | * | | | | | | | Updated NEWSJulien Pauli2014-12-121-6/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-1221-1631/+1831
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | | | | updated NEWSAnatol Belski2014-12-121-0/+1
| | | | | | | | | | |
| | * | | | | | | | | 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-124-128/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1214-1151/+1309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | Make ZEND_INIT_FCALL keep predcalculted size of necessary stack space in ↵Dmitry Stogov2014-12-125-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opline->op1.num to avoid its recalculation on each execution.
| * | | | | | | | | | Removed unused variablesDmitry Stogov2014-12-121-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Improved array_merge() and array_replace() (1-st array may be added using ↵Dmitry Stogov2014-12-112-80/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple procedure).
| * | | | | | | | | | Replaced zendi_convert_to_long() with _zval_get_long_func()Dmitry Stogov2014-12-111-105/+96
| | | | | | | | | | |
| * | | | | | | | | | Moved zend_is_true() from zend_execute.h/zend_execute_API.c into ↵Dmitry Stogov2014-12-114-135/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"Xinchen Hui2014-12-112-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bd5c5d372916375981f76ed7800b2f4600acae05.
| * | | | | | | | | | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2014-12-1117-61/+434
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Save one xor instrXinchen Hui2014-12-112-2/+6
| | | | | | | | | | | |
* | | | | | | | | | | | explicit passing of *tsrm_ls isn't needed anymoreAnatol Belski2014-12-122-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | TSRMLS_D should be void, thanks DmitryAnatol Belski2014-12-111-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into native-tlsDmitry Stogov2014-12-1033-7366/+5446
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) move the test to the right place fix TS build and C89 compat updated NEWS Fixed bug #68545 NULL pointer dereference in unserialize.c Updated NEWS Updated NEWS Updated NEWS NEWS Fix bug #68526 Implement POSIX Access Control List for UDS Improved basic zval copying primitives: ZVAL_COPY_VALUE(), ZVAL_COPY(), ZVAL_DUP() Wrap RETURN_VALUE_USED() with EXPECTED() or UNEXPECTED() macros according to more frequent usage patterns. Improved ASSIGN_<OP>, ASSIGN_DIM and UNSET_DIM drop dead/unused code simplified code Move ZVAL_DEREF() and make_real_object() into slow paths. Pass znode_op structure by value (it fits into one word) instead of pointer to structure. Move checks for references into slow paths. Improved ASSIGN_DIM and ASSIGN_OBJ Fixed typo Move checks for references into slow paths of handlers or helpers. Remove duplicate opcode handlers. ...
| * | | | | | | | | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-101-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: move the test to the right place
| | * | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-101-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: move the test to the right place
| | | * | | | | | | | | move the test to the right placeAnatol Belski2014-12-101-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | fix TS build and C89 compatAnatol Belski2014-12-103-10/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'PHP-5.6'Anatol Belski2014-12-103-36/+58
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed bug #68545 NULL pointer dereference in unserialize.c Updated NEWS Updated NEWS Conflicts: ext/standard/var_unserializer.c ext/standard/var_unserializer.re
| | * | | | | | | | | | updated NEWSAnatol Belski2014-12-101-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-103-33/+56
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68545 NULL pointer dereference in unserialize.c Conflicts: ext/standard/var_unserializer.c
| | | * | | | | | | | | Fixed bug #68545 NULL pointer dereference in unserialize.cAnatol Belski2014-12-104-33/+57
| | | | | | | | | | | |
| | * | | | | | | | | | Updated NEWSJulien Pauli2014-12-101-0/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS
| | | * | | | | | | | | Updated NEWSJulien Pauli2014-12-101-2/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Updated NEWSJulien Pauli2014-12-101-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'PHP-5.6'Remi Collet2014-12-109-4/+300
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS Fix bug #68526 Implement POSIX Access Control List for UDS
| | * | | | | | | | | | NEWSRemi Collet2014-12-101-0/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Fix bug #68526 Implement POSIX Access Control List for UDSRemi Collet2014-12-109-4/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add --with-fpm-acl build option which allow to manage ACL on Unix Domain Socket - add listen.acl_users pool option - add listen.acl_groups pool option Keep old behavior (chmod) if option not used or not supported.