summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.4.15php-5.4.15PHP-5.4.15Stanislav Malyshev2013-05-073-4/+4
|
* Revert "Add CURL_WRAPPERS_ENABLE constant"Stanislav Malyshev2013-04-282-6/+0
| | | | | This reverts commit d7f709a032a40cb475042b43db07a4698a2488b7. Since wrappers are deleted from 5.5, no point in adding this constant.
* update creditsphp-5.4.15RC1Stanislav Malyshev2013-04-231-1/+1
|
* 5.4.15 RC1Stanislav Malyshev2013-04-233-4/+4
|
* Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-04-232-1/+2
|\ | | | | | | | | * PHP-5.3: Fix bug #64458 (dns_get_record result with string of length -1)
| * Fix bug #64458 (dns_get_record result with string of length -1)Stanislav Malyshev2013-04-232-1/+2
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-04-232-3/+9
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.3: Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function. Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| * Fixed incorrect check. SEND_REF may be executed before DO_FCALL when ↵Dmitry Stogov2013-04-232-3/+9
| | | | | | | | EX(function_state).function is not yet set to the calling function.
* | updated NEWSAnatol Belski2013-04-221-0/+4
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-04-222-16/+37
|\ \ | |/ | | | | | | * PHP-5.3: Fixed stream_socket_pair() on Windows x64 and
| * Fixed stream_socket_pair() on Windows x64 andAnatol Belski2013-04-223-16/+41
| | | | | | | | improved errorhandling in the socketpair() implementation.
* | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2013-04-221-441/+469
|\ \ | |/
| * - Updated to version 2013.3 (2013c)Derick Rethans2013-04-221-441/+469
| |
* | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Xinchen Hui2013-04-213-18/+18
|\ \
| * \ Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2013-04-191-1/+1
| |\ \ | | |/
| | * lower the limit, should fit in a byteAndrey Hristov2013-04-191-1/+1
| | |
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-04-170-0/+0
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.3: updated lib versions allow lcov 1.10
| | * updated lib versionsAnatol Belski2013-04-171-17/+17
| | |
| | * allow lcov 1.10Nuno Lopes2013-04-131-1/+1
| | |
| | * Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Anatol Belski2013-04-103-2/+15
| | |\
| * | | updated lib versionsAnatol Belski2013-04-171-1/+1
| | | |
| * | | fixed EOLAnatol Belski2013-04-171-16/+16
| | | |
| * | | allow lcov 1.10Nuno Lopes2013-04-131-1/+1
| | | |
* | | | Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is ↵Antonio Diaz Ruiz2013-04-216-1/+191
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly raised by the method DOMNode::insertBefore(newNode, [refNode]). Each file covers a different test case DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted. DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted. DOMNode_insertBefore_error4.phpt: refNode is a brand new node. DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted. DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
* | | Fixed bug (Wrong ce cached)Xinchen Hui2013-04-112-2/+2
| | |
* | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2013-04-114-0/+90
|\ \ \
| * \ \ Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Anatol Belski2013-04-103-2/+15
| |\ \ \
| * | | | updated NEWSAnatol Belski2013-04-101-0/+4
| | | | |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-04-103-0/+86
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * PHP-5.3: Fixed bug #64342 ZipArchive::addFile() has to check for file existence
| | * | | Fixed bug #64342 ZipArchive::addFile() has to check for file existenceAnatol Belski2013-04-104-0/+90
| | | | |
* | | | | lucky that the name is not used, fix name of encoderPierre Joye2013-04-111-5/+5
| |_|/ / |/| | |
* | | | Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-04-103-2/+15
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * PHP-5.3: add external 2.1 detection and fix gd_compat for 2.1+
| * | add external 2.1 detection and fix gd_compat for 2.1+Pierre Joye2013-04-103-2/+15
| |/
* | PHP 5.4.14 release dateJohannes Schlüter2013-04-101-1/+2
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-04-100-0/+0
|\ \ | |/
| * PHP 5.3.24 release dateJohannes Schlüter2013-04-101-5/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-04-091-2/+4
|\ \ | |/ | | | | | | * PHP-5.3: fix possible NULL deref
| * fix possible NULL derefPierre Joye2013-04-091-2/+4
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Pierre Joye2013-04-091-1/+2
|\ \ | |/ | | | | | | | | | | # By Pierre Joye (1) and Rasmus Lerdorf (1) * PHP-5.3: fix null deref Fixed bugs #47675 and #64577 (fd leak on Solaris)
| * fix null derefPierre Joye2013-04-091-1/+2
| |
| * Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-042-2/+2
| |
* | updated libmagic.patchAnatol Belski2013-04-081-87/+66
| |
* | fix identAnatol Belski2013-04-081-9/+9
| |
* | Refactored the previous memleak fixAnatol Belski2013-04-081-3/+3
| | | | | | | | to avoid usage of a freed pointer. Thanks Laruence )
* | fix memory leak at apprentice.c:1095Anatol Belski2013-04-081-0/+7
| |
* | fixed EOLAnatol Belski2013-04-081-8/+8
| |
* | upgraded libmagic to 5.14Anatol Belski2013-04-0723-33066/+57113
| |
* | Fix typoCarson McDonald2013-04-051-1/+1
| |
* | Constant has been renamedXinchen Hui2013-04-051-1/+1
| |
* | Fixed bugs #47675 and #64577 (fd leak on Solaris)Rasmus Lerdorf2013-04-042-2/+3
| |