summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* Added support for CSS/JavaScript source mapsThorsten Rinne2015-11-171-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-171-0/+4
|
* Fixed bug #70863 Incorect logic to increment_function for proxy objectsAnatol Belski2015-11-081-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
| | | |
* | | | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-272-0/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fix #64878: 304 responses return Content-Type header
| * | | Fix #64878: 304 responses return Content-Type headerChristoph M. Becker2015-06-272-0/+22
| | | | | | | | | | | | | | | | | | | | According to RFC 7232 304 responses should not send a Content-Type header, so the CLI server should comply.
* | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-141-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt
| * | | | cleanup more redundant S_IS* declarationsAnatol Belski2015-05-251-4/+0
| | | | |
* | | | | Throwable method signatures.Aaron Piotrowski2015-05-181-9/+9
| | | | |
* | | | | Update exception names in tests after formatting changes.Aaron Piotrowski2015-05-172-2/+2
| | | | |
* | | | | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-172-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Tweak uncaught exception message displayNikita Popov2015-05-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* | | | | Fix a few missed tests.Aaron Piotrowski2015-05-161-1/+1
| | | | |
* | | | | Updated tests to reflect exception class changes.Aaron Piotrowski2015-05-164-5/+5
|/ / / /
* | | | Display EngineExceptions like ordinary exceptionsNikita Popov2015-05-152-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
* | | | Add comment about SEARCH HTTP Verb being possible as wellMats Lindh2015-05-121-2/+1
| | | |
* | | | Add test for the SEARCH HTTP verb in the CLI HTTP server.Mats Lindh2015-05-121-0/+40
| | | |
View Lorry Controller Status