summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Disable upload_2G test on travisNikita Popov2016-03-031-0/+4
| | |
| | * fix ts buldAnatol Belski2016-02-181-1/+1
| | |
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-03-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (25 commits) Update NEWS update NEWS fix test file Fix version update NEWS Update NEWS Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() Fix bug #71637: Multiple Heap Overflow due to integer overflows extend check for add_flag Fixed another segfault with file_cache_only now set version fix nmake clean in phpize mode Fixed segfault with file_cache_only Fixed possible crash at PCRE on MSHUTDOWN Fixed more synchronisation issues during SHM reload Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string sync with improvements in NEWS Fixed process synchronisation problem, that may cause crashes after opcache restart Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() Fix bug #71637: Multiple Heap Overflow due to integer overflows ...
| * | Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.19: fix test file Fix version update NEWS Update NEWS Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() fix ts buld prep for 5.6.19RC1 5.6.20 is next Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize Conflicts: configure.in ext/wddx/wddx.c main/php_version.h
| | * | fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
| | |/
* | | Merge branch 'PHP-7.0'Anatol Belski2016-02-141-0/+13
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
| | * Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bugAnatol Belski2016-02-141-0/+13
| | |
| * | be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
| | |
* | | be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
| | |
* | | Merge branch 'PHP-7.0'Anatol Belski2016-01-181-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: fork test fix test fork test fork test for win32 fork test
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-181-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fork test fix test fork test fork test for win32 fork test
| | * fix testAnatol Belski2016-01-181-5/+5
| | |
* | | add WinEditLine support for CLIAnatol Belski2016-01-151-0/+5
|/ /
* | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-031-1/+1
| |
* | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-018-9/+9
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-018-9/+9
| |
| * Added support for HTTP 451Julien Pauli2015-12-231-0/+1
| |
* | Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).Adam Harvey2015-12-012-0/+48
| | | | | | | | | | | | We didn't initialise the retval variable in php_cli_server_dispatch_router(); let's now initialise it to be IS_UNDEF, as the following if condition expects.
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2015-11-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) Conflicts: sapi/cgi/config9.m4 sapi/fpm/config.m4
| * Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: ↵Lior Kaplan2015-11-231-2/+2
| | | | | | | | php_register_internal_extensions)
| * Ensure the test failsXinchen Hui2015-11-111-0/+4
| |
* | Update mime type generator script to keep track of additional mime-typesReeze Xia2015-11-152-1/+13
| |
* | Added support for CSS/JavaScript source mapsThorsten Rinne2015-11-151-0/+1
| | | | | | Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
* | Ensure the test failsXinchen Hui2015-11-111-0/+4
| |
* | Fixed bug #70863 Incorect logic to increment_function for proxy objectsAnatol Belski2015-11-061-1/+1
| |
* | Add NTS/ZTS information to php -vBob Weinand2015-09-301-8/+11
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2015-09-111-0/+41
|\ \ | |/
| * Add test XFAIL for bug #70470Xinchen Hui2015-09-111-0/+41
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-09-052-2/+23
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix #68291: 404 on urls with '+' Resolved conflicts: sapi/cli/php_cli_server.c
| * Fix #68291: 404 on urls with '+'Christoph M. Becker2015-09-052-2/+23
| | | | | | | | | | URI paths have to be treated according to RFC 3986 by the CLI web server, not as application/x-www-form-urlencoded.
* | fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+4
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-142-0/+33
|\ \ | |/ | | | | | | * PHP-5.6: Fix #70264: CLI server directory traversal
| * Fix #70264: CLI server directory traversalChristoph M. Becker2015-08-142-0/+33
| | | | | | | | | | | | | | | | On Windows the built-in webserver doesn't prevent directory traversal when backslashes are used as path component separators. Even though that is not a security issue (the CLI webserver is meant for testing only), we fix that by replacing backslashes in the path with slashes on Windows, because backslashes may be valid characters for file names on other systems, but not on Windows.
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-093-0/+66
|\ \ | |/ | | | | | | | | * PHP-5.6: Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE added tests for bug #66606
| * Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPEwusuopu2015-08-091-0/+3
| | | | | | | | The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
| * added tests for bug #66606Christoph M. Becker2015-08-092-0/+63
| |
* | fix testStanislav Malyshev2015-08-041-1/+1
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: fix test Conflicts: sapi/cli/tests/005.phpt
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-041-2/+2
| |\ | | | | | | | | | | | | * PHP-5.5: fix test
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-2/+2
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: fix test
| | | * fix testStanislav Malyshev2015-08-041-2/+2
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: Zend/zend_exceptions.c ext/date/php_date.c ext/openssl/openssl.c ext/phar/phar_internal.h ext/soap/php_http.c ext/spl/spl_array.c ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/tests/serialize/bug69152.phpt sapi/cli/tests/005.phpt
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-041-4/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: ext/soap/php_http.c ext/spl/spl_observer.c
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-4/+7
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.4: fix test update NEWS
| | | * fix testStanislav Malyshev2015-08-041-4/+7
| | | |
| | * | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-032-0/+20
| | | | | | | | | | | | | | | | This also fixes bug #54081
| | * | Bump yearXinchen Hui2015-01-158-9/+9
| | | |
View Lorry Controller Status