summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Unused retXinchen Hui2015-06-282-0/+4
|
* tweak the zendparse symbol to be exported with newer bisonAnatol Belski2015-06-281-0/+7
|
* fix touchingAnatol Belski2015-06-271-1/+1
|
* touch all the files before creating a tarballAnatol Belski2015-06-271-0/+3
|
* fix one more bad char in the NEWSAnatol Belski2015-06-271-1/+1
|
* remove BOM and a unicode char from the NEWSAnatol Belski2015-06-271-2/+2
|
* updated NEWSChristoph M. Becker2015-06-271-1/+2
|
* 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
| * updated NEWSChristoph M. Becker2015-06-271-1/+2
| |
| * 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
| |
* | updated NEWSChristoph M. Becker2015-06-271-0/+3
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-272-0/+22
|\ \ | |/ | | | | | | * PHP-5.6: Fix #64878: 304 responses return Content-Type header
| * updated NEWSChristoph M. Becker2015-06-271-0/+3
| |
| * 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 some fixes from Senthil. Some test diffs still remain.Christopher Jones2015-06-271-26/+44
| |
* | Fix table name in initialization DROP TABLE statementChristopher Jones2015-06-271-1/+1
| |
* | Feature: Enhanced array_column() to also work with object elements.Tjerk Meesters2015-06-273-19/+202
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-271-0/+12
|\ \ | |/ | | | | | | * PHP-5.6: added regression test for bug #69679
| * added regression test for bug #69679Christoph M. Becker2015-06-271-0/+12
| | | | | | | | DOMDocument::loadHTML refuses to accept NULL bytes.
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-06-261-0/+27
|\ \ | |/ | | | | | | | | * PHP-5.6: slightly revised bug69462.phpt Test for bug #69462
| * slightly revised bug69462.phptChristoph M. Becker2015-06-261-1/+2
| |
| * Test for bug #69462Tomasz Sawicki2015-06-261-0/+26
| | | | | | | | | | Test scenario for already fixed bug #69462 with segmentation fault when SoapVar XML node name was null.
* | Fix warning in zend_execute.c by explicit castBob Weinand2015-06-261-1/+1
| |
* | Use ZEND_INIT_STATIC_METHOD_CALL for literals of form "classname::method"Bob Weinand2015-06-262-6/+47
| |
* | Fix closure leak testAaron Piotrowski2015-06-261-2/+2
| |
* | Fix test duplication, add more testsAaron Piotrowski2015-06-262-1/+31
| |
* | restricted test to English locale (fails otherwise)Christoph M. Becker2015-06-261-1/+4
| |
* | fixed broken test (syntax error in SKIPIF section)Christoph M. Becker2015-06-261-1/+1
| |
* | Add test for bug #69939Kalle Sommer Nielsen2015-06-261-0/+11
| |
* | Fixed bug #69939 (Casting object to bool returns false)Kalle Sommer Nielsen2015-06-262-1/+5
| |
* | Merge branch 'master' of https://git.php.net/push/php-srcKalle Sommer Nielsen2015-06-2613-50/+154
|\ \
| * | Fix Closure leak in aborted INIT_DYNAMIC_FCALLBob Weinand2015-06-262-0/+17
| | |
| * | Added more indirect call tests, remove invalid testAaron Piotrowski2015-06-253-21/+101
| | |
| * | Fix 'Class::method' indirect call with empty method nameAaron Piotrowski2015-06-252-24/+0
| | |
| * | Merge branch 'PHP-5.6'Tjerk Meesters2015-06-265-0/+31
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
| | * Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read ↵Tjerk Meesters2015-06-265-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with extra certs Squashed commit of the following: commit a64c1d9bc4c129fd946a478bdcb55101e42157b7 Author: Tomasz Sawicki <falundir@gmail.com> Date: Wed Jun 24 08:49:37 2015 +0200 Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs The "key values mismatch" error is triggered in openssl_pkcs12_read by PKCS12_parse, because it uses X509_check_private_key to separate main certificate (which corresponds to private key) from extra certificates. Extra certificates usually comes first (p12 contents are reversed as stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH error. The fix pops "key values mismatch" error from OpenSSL error stack for each extra certificate if there are any.
| * | 3rd arg to stream_set_timeout is optionalRasmus Lerdorf2015-06-251-5/+5
| | | | | | | | | | | | ignore_user_abort() should take a bool not a string
| * | Merge branch 'PHP-5.6'Julien Pauli2015-06-250-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: fix unknown size of void error
| | * Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-06-250-0/+0
| | |\ | | | | | | | | | | | | | | | | * PHP-5.5: fix unknown size of void error
| | | * fix unknown size of void errorAnatol Belski2015-06-251-1/+1
| | | |
* | | | Merge branch 'master' of https://git.php.net/push/php-srcKalle Sommer Nielsen2015-06-2561-303/+561
|\ \ \ \ | |/ / /
| * | | Optimize out usless conditions used by specializerDmitry Stogov2015-06-252-4/+12
| | | |
| * | | update the doc in regard to the latest discussionsAnatol Belski2015-06-251-1/+1
| | | |
| * | | Merge branch 'PHP-5.6'Anatol Belski2015-06-250-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9
| | * | backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9Anatol Belski2015-06-251-1/+1
| | | |
| * | | Better check for __builtin_constant_p() availabilityDmitry Stogov2015-06-252-1/+5
| | | |
| * | | Moved test to correct placeDmitry Stogov2015-06-251-0/+0
| | | |
| * | | Fix paths issue when fetching .phpdbginit under WindowsBob Weinand2015-06-252-2/+5
| | | |
View Lorry Controller Status