summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
Commit message (Collapse)AuthorAgeFilesLines
* Fixed #73902 mention router support in usage output for php-cliJoe Watkins2017-01-101-1/+1
|
* Update copyright headers to 2017Sammy Kaye Powers2017-01-041-2/+2
|
* Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-0/+3
| | | | This allows us to unfork a bunch of tests for Windows.
* fix size_t signed comparisonJoe Watkins2016-04-291-1/+1
|
* Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not ↵Sean DuBois2016-03-151-4/+3
| | | | properly set $argi and $argn
* Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | Also re bug #71575.
* be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
|
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-2/+2
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-2/+2
| |
* | Add NTS/ZTS information to php -vBob Weinand2015-09-301-8/+11
| |
* | fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+4
| |
* | Switch position of ce in exception ce variable namesAaron Piotrowski2015-07-031-1/+1
| |
* | Change zend_exception_get_default() to zend_exception_ceAaron Piotrowski2015-07-031-1/+1
| |
* | integrate the openssl applink shimAnatol Belski2015-07-031-0/+4
| | | | | | | | | | | | | | | | | | This fixes ext/openssl/tests/openssl_spki_export.phpt failing with the no OPENSSL_Applink error. Applink is also an interesting technique documented in the OpenSSL FAQ https://www.openssl.org/support/faq.html#PROG2 which allows under circumstances using different OpenSSL binaries than those a program was linked with.
* | Drop zend_indent() as it was never used, complete or workingKalle Sommer Nielsen2015-03-271-21/+0
| |
* | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-2/+2
| | | | | | | | which also comply with the current semantics for such macros
* | Merged zend_array and HashTable into the single data structure.Dmitry Stogov2015-02-131-2/+2
| | | | | | | | | | Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
* | Silence unused variable warningReeze Xia2015-02-131-4/+1
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2015-02-131-4/+1
|\ \ | |/ | | | | | | | | | | Conflicts: ext/soap/soap.c ext/standard/basic_functions.c ext/zlib/zlib.c
| * bump yearXinchen Hui2015-01-151-2/+2
| |
* | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-2/+2
| | | | | | | | Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
* | bump yearXinchen Hui2015-01-151-2/+2
| |
* | Faster sorting algoXinchen Hui2015-01-141-1/+1
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-16/+16
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-80/+80
| |
* | 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-151-0/+5
| | | | | | | | plus apache2handler, cli and cgi
* | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-151-1/+1
| | | | | | | | for better comparability with the mainstream
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-131-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-131-5/+5
| | |
* | | reworked the patch, less new stuff but workyAnatol Belski2014-09-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | native tls initial patchkrakjoe2014-09-201-4/+1
|/ /
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | fix ftell/fseek callsAnatol Belski2014-09-141-2/+2
| |
* | 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 3Anatol Belski2014-08-251-7/+7
| |
* | master renames phase 1Anatol Belski2014-08-251-9/+9
| |
* | regenerated parser filesAnatol Belski2014-08-171-2/+2
| |
* | fix macros in the 5 basic extensionsAnatol Belski2014-08-161-9/+9
| |
* | Refactored parameter passing mechanism.Dmitry Stogov2014-06-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | In PHP-5.6 and below each argument passed to user function was copies on VM stack twice. Now we always have ZEND_INIT_FCALL (or simular) opcode that pushes "call frame" on top of VM stack. "Call frame" is actually the same zend_execute_data structure. All the following ZEND_SEND instructions push arguments on top of the stack in a way that they directly comes into corresponding CV variables of the called frame. Extra arguments are copied at the end of stack frame (after all CV and TMP variables) on function enterance. There are two minor incompatibilities: 1) It's not allowed to decalre functions redefining arguments e.g. "function foo($a,$a) {}". 2) func_get_arg() and func_get args() return the current value of argument and not the original value that was sent.
* | Fixed apply_func_t (they should be broken before)Xinchen Hui2014-05-251-1/+1
| |
* | Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), ↵Dmitry Stogov2014-04-031-1/+1
| | | | | | | | candidate for GC, etc)
* | Fixed various CLI problemsDmitry Stogov2014-03-141-17/+15
| |
* | Fixed module name printingXinchen Hui2014-02-281-1/+2
| |
* | Use better data structures (incomplete)Dmitry Stogov2014-02-141-47/+26
| |
* | Use better data structures (incomplete)Dmitry Stogov2014-02-101-4/+7
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-2/+2
|\ \ | |/
| * Bump yearXinchen Hui2014-01-031-2/+2
| |
* | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few ↵Kalle Sommer Nielsen2013-12-181-1/+1
| | | | | | | | TSRMLS_FETCH() calls in our various SAPIs
* | Kill another TSRMLS_FETCH() in the zend extension loading codeKalle Sommer Nielsen2013-12-181-1/+1
| |
View Lorry Controller Status