summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* enable static tsrmls cache in the embed SAPIAnatol Belski2014-12-172-2/+2
|
* get rid of TSRMLS_* in the embed SAPIAnatol Belski2014-12-172-26/+12
|
* various fixes for removing explicit tsrm_ls usageAnatol Belski2014-12-167-558/+453
|
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-163-5/+12
|\ | | | | | | | | | | | | * origin/master: C89 fixes use portable struct stat fixed macro va args expansion for vs
| * C89 fixesAnatol Belski2014-12-162-3/+5
| |
| * use portable struct statAnatol Belski2014-12-161-2/+2
| |
| * fixed macro va args expansion for vsAnatol Belski2014-12-161-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * origin/master: fix perm again... cleanup uneeded cast fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian) Conflicts: ext/phar/func_interceptors.c ext/phar/phar_object.c sapi/apache2handler/sapi_apache2.c
| * cleanup uneeded castRemi Collet2014-12-161-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-152-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * 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)
| * made the apache ini holders to be zend_boolAnatol Belski2014-12-152-6/+6
| | | | | | | | since they're documented to be so and we spare 16 byte
| * Revert HTTP status codes mergerAndrea Faulds2014-12-153-14/+159
| | | | | | | | This reverts commits 65768edcf3ef27a21a07e5e994bfd9ca1cabfa94, 627b350f31be83eb1d5ac5fad692256dcfaf1281 and 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652.
| * fixed tests, bugs in status codes mergerAndrea Faulds2014-12-141-2/+2
| |
| * Merge branch 'unify_http'Andrea Faulds2014-12-143-157/+12
| |\ | | | | | | | | | | | | * unify_http: Share HTTP status codes map
| | * Share HTTP status codes mapAndrea Faulds2014-12-143-157/+12
| | |
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-144-423/+423
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | split fpm config to two parts. PR#903Elan Ruusamäe2014-12-144-423/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main config = global options secondary config = pool options makes easier to add new pools: duplicate pool config in fpm.d dir https://bugs.php.net/bug.php?id=67106
| * | Merge branch 'PHP-5.6'Remi Collet2014-12-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | * PHP-5.6: fix typo
| | * | fix typoRemi Collet2014-12-141-1/+1
| | | |
* | | | second shot on removing TSRMLS_*Anatol Belski2014-12-146-6/+4
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-1389-2126/+2047
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-121-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Reduced size of zend_op on 64-bit systems.Dmitry Stogov2014-12-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' into native-tlsDmitry Stogov2014-12-109-4/+300
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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'Remi Collet2014-12-109-4/+300
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.6: NEWS Fix bug #68526 Implement POSIX Access Control List for UDS
| | * | 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.
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * | | Fix zpp call in apache_getenv()Nikita Popov2014-12-061-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-0510-51/+79
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (111 commits) Fix zend_fcall_info_arg*() to use ZVAL_COPY Fixed #65213 - cannot cast SplFileInfo to boolean add initial install switch to C travis project instead of PHP use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/) fix TS build add config option to target codegen architectures updated NEWS updated NEWS Fixed bug #55541 errors spawn MessageBox, which blocks test automation Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same). Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*. Fixed __debugInfo() support Update UPGRADING for the new variadic functions, and re-sort. Improved POST INC/DEC make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path Missed closed folder mark Revert "Unecessary assignment" Fixed improper memory release Unecessary assignment ...
| * | | fix datatype mismatches and warningsAnatol Belski2014-12-021-11/+22
| | | |
| * | | fix datatype mismatchesAnatol Belski2014-12-021-5/+5
| | | |
| * | | fix datatype mismatchesAnatol Belski2014-12-021-8/+8
| | | |
| * | | fix datatype mismatchAnatol Belski2014-12-021-3/+3
| | | |
| * | | fix datatype mismatchesAnatol Belski2014-12-021-4/+5
| | | |
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-12-011-3/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: fix possible null pointer math
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-3/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix possible null pointer math
| | | * | fix possible null pointer mathAnatol Belski2014-12-011-3/+5
| | | | |
| | | * | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
| | * | | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
| * | | | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-12-013-2/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: XFAIL as catch_workers_output = yes seems not reliable
| | * | | XFAIL as catch_workers_output = yes seems not reliableRemi Collet2014-12-013-2/+4
| | | | |
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-11-293-7/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: Move chown to fpm_unix_set_socket_premissions()
| | * | | Move chown to fpm_unix_set_socket_premissions()Remi Collet2014-11-293-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency, with fpm_unix_resolve_socket_premissions. Compute + Use in the same source file. To make easier future enhancement. Also check chdir output to fix a build warning.
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-11-291-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: fix test with readline on mac
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-291-5/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: fix test with readline on mac
| | | * | fix test with readline on macFerenc Kovacs2014-11-291-5/+5
| | | | |
| | | * | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling fpm_conf_process_all_pools before fpm_log_open allow to use fpm_evaluate_full_path and so to honor global prefix or pool prefix for access.log
| | | * | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | Add a "There are no allowed addresses for this pool"
| | | * | Raise a warning when listen = hostname used and is resolved as multiple ↵Remi Collet2014-11-211-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addresses Using getaddrinfo is perhaps not a good idea... if we are not able to listen on multiple addresses... At least this message should help to diagnose problem, ex ... Found address for localhost, socket opened on ::1 ... Found multiple addresses for localhost, 127.0.0.1 ignored
View Lorry Controller Status