summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| | | |
| | * | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
| | | |
* | | | fixed broken testChristoph M. Becker2015-07-261-1/+2
| | | |
* | | | Fixed bug #70006 (cli - function with default arg = STDOUT crash output).Xinchen Hui2015-07-071-0/+18
| | | |
* | | | http parser code assumes char is signedAnton Blanchard2015-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A char can be either signed or unsigned, and on PowerPC and ARM it is unsigned. The following code will always be false on these architectures: if (c == -1) goto error;
* | | | 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.
* | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-11/+11
| | | | | | | | | | | | | | | | semantick changes).
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-272-2/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed #69655: php -S changes MKCALENDAR request method to MKCOL
| * | | Fixed #69655: php -S changes MKCALENDAR request method to MKCOLChristoph M. Becker2015-06-272-2/+39
| | | | | | | | | | | | | | | | | | | | The parsing of the request method in the CLI server has been faulty, so that several unsupported methods have been recognized as other methods.
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-271-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: added skip condition for powershell requirement of test
| * | | added skip condition for powershell requirement of testChristoph M. Becker2015-06-271-1/+3
| | | |
View Lorry Controller Status