summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-135-203/+203
|
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-052-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 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'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
| | | |
| | * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-182-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * | | fix var declaration used by macro conditionsAnatol Belski2014-11-101-0/+2
| | | |
| * | | fix sprintf specAnatol Belski2014-11-101-1/+1
| | | |
| * | | fix var usage only when unistd.h availableAnatol Belski2014-11-101-0/+2
| | | |
| * | | cleanup unused variableAnatol Belski2014-11-101-1/+0
| | | |
| * | | do portable socket checksAnatol Belski2014-11-101-4/+4
| | | | | | | | | | | | | | | | also introduced a portable macro for that
* | | | don't define tsrm ls in SAPIs under linuxAnatol Belski2014-10-151-1/+1
| | | | | | | | | | | | | | | | as it's compiled statically with the core
* | | | moved most of the core to use static tsrm ls cache pointerAnatol Belski2014-10-155-4/+13
| | | | | | | | | | | | | | | | plus apache2handler, cli and cgi
* | | | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-152-2/+1
| | | | | | | | | | | | | | | | for better comparability with the mainstream
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-132-10/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix several datatype mismatch warnings fix signed/unsigned mismatch warning more signed/unsigned mismatch fix fix signed/unsigned mismatch warning fix signed/unsigned mismatch fix some signed/unsigned mismatch missing include for strlen proto More fixes for array/object casts with temporary variables Fix array/object cast of refcounted tmp var Deref right value for compound assign ops
| * | | fix several datatype mismatch warningsAnatol Belski2014-10-132-10/+40
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-102-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (40 commits) int to size_t where the underlaying API supports it use php_socket_t instead of int fix signed/unsigned mismatch warning fix compilation warning Improved specialisation $this variable accessed through IS_UNUSED operand must be IS_OBJECT, so we don't have to check for its type or perform dereference. Add notes about get_class_entry/get_class_name to UPGRADING Fix casts in GD Drop redundant casting code from ext/filter update NEWS update NEWS update NEWS update NEWS Added note to UPGRADING regarding 64-bit support in pack()/unpack() pack(): Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG Add 64 bit formats to pack() and unpack() Help to CPU branch predictor Removed unused EG(orig_error_reporting) Update get_class_name semantics Remove Z_OBJ_CLASS_NAME_P Improved VM stack primitives for fast paths. Slow paths are not inlined anymore. ...
| * | | fix signed/unsigned mismatch warningAnatol Belski2014-10-101-2/+5
| | | |
| * | | fix compilation warningAnatol Belski2014-10-101-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-011-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (26 commits) Micro optimization Drop unused INIT_STRING opcode Drop unused RAISE_ABSTRACT_ERROR opcode CT substitute unqualified true/false/null in namespaces Fix a couple compile warnings fix test filename one more test to illustrate transfer of an arbitrary data amount throug pipes fix tests on linux better test cleanup Use more readable inline functions increase the polling period to not to break existing behaviours updated NEWS Fixed bug #51800 proc_open on Windows hangs forever Fixed segfault Set an LDAP error code when failing ldap_bind due to null bytes Fix segmentation fault in debug_backtrace() Drop support for GMP 4.1 Make gmp_setbit and gmp_clrbit return values consistent removed *.dsw and *.dsp files Opcache compatibility for coalesce operator ...
| * | | Merge branch 'PHP-5.6'Johannes Schlüter2014-09-271-2/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Johannes Schlüter2014-09-271-2/+0
| | |\ \ | | | |/
| | | * Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
| | | |\
| | | | * This test should passJohannes Schlüter2014-09-271-2/+0
| | | | |
| | | * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
| | * | | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
* | | | | cleanup direct tsrm_ls passingAnatol Belski2014-09-261-9/+1
| | | | |
* | | | | reworked the patch, less new stuff but workyAnatol Belski2014-09-253-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
* | | | | basic windows fixAnatol Belski2014-09-222-3/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-221-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (24 commits) added a comment fix the REPARSE_DATA_BUFFER struct def simplify the condition Fix two memory errors by interning earlier Add smart_str_append for appending zend_strings Rename smart_str_append to smart_str_append_smart_str Use smart_str for exception stack traces Use smart_str in get_function_declaration Move smart_str implementation into Zend/ UPGRADING for Integer Semantics Fixed bug #66242 (don't assume char is signed) Fixed bug #67633 Fixed if/else if ordering Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG Use zend_ polyfilled nan/finite, check finite Updated 32-bit << test Updated << 64-bit tests Prevent bit shift count wrapping quirkiness on some CPUs for left shift Cast NaN and Infinity to zero Updated >> 64-bit tests ...
| * | | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | | | fix wrong doingskrakjoe2014-09-202-2/+5
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fixed copying of the struct as it's not being modified avoid strlen usage in loop Removes accidentally added files. Reverts some unwanted changes Deletes patch leftovers Replaces php5 with php7, without whitespace changes.
| * | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-2010-19/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-1/+1
| | | | | |
* | | | | | native tls initial patchkrakjoe2014-09-202-10/+4
| |/ / / / |/| | | |
* | | | | Make number printing functions less genericNikita Popov2014-09-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that zend_ulong is 64bit on 64bit platforms, it should be sufficient to always use it, rather than supporting multiple types. API changes: * _zend_print_unsigned_to_buf and _zend_print_signed_to_buf no longer exist. * smart_str(ing)_print_long and smart_str(ing)_print_unsigned no longer exist. * Instead of all these, zend_print_ulong_to_buf and zend_print_long_to_buf should be used. * smart_str_append_generic_ex no longer exists. * smart_str(ing)_append_off_t(_ex) no longer exists, use smart_str(ing)_append_long(_ex) instead.
* | | | | Use inline functions for most of smart_strNikita Popov2014-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope, instead it returns the new length.
* | | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-199-9/+9
| | | | |
* | | | | fix formatAnatol Belski2014-09-141-1/+1
| | | | |
* | | | | fix ftell/fseek callsAnatol Belski2014-09-141-2/+2
|/ / / /
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-1/+1
| | | |
* | | | Remove ZEND_ACC_INTERACTIVE and CG(interactive)Nikita Popov2014-08-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As far as I can discern these are leftovers of the interactive shell implementation that was used before PHP 5.4. Now the readline ext makes use of normal eval calls for this. So, dropping these until there is evidence to the contrary, as they currently wouldn't work anyway.
* | | | master renames phase 4Anatol Belski2014-08-251-3/+3
| | | |
* | | | master renames phase 3Anatol Belski2014-08-253-16/+16
| | | |
* | | | master renames phase 1Anatol Belski2014-08-252-15/+15
| | | |