summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed PHP version numberphp-5.5.4RC1Julien Pauli2013-09-051-1/+1
* Preparing for 5.5.4RC1Julien Pauli2013-09-043-4/+4
* Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-021-0/+47
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-09-021-1/+1
| |\
| | * Typo....Xinchen Hui2013-09-021-1/+1
| * | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-09-021-0/+47
| |\ \ |/ / / | | _
| * Add a XFAIL test for #64896Xinchen Hui2013-09-021-0/+47
| * Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-08-304-5/+44
| |\
| * \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-08-294-17/+49
| |\ \
| * \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-08-281-1/+1
| |\ \ \
* | \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-304-7/+46
|\ \ \ \ \
| * | | | | Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by Addres...Remi Collet2013-08-302-2/+4
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-08-301-5/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by Addres...Remi Collet2013-08-302-5/+7
| * | | | | Update NEWSXinchen Hui2013-08-301-0/+2
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-302-0/+35
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)Xinchen Hui2013-08-303-0/+37
| | | |_|/ | | |/| |
* | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-297-25/+99
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)Dmitry Stogov2013-08-293-8/+45
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-08-293-9/+9
| |\ \ \ \ | | |/ / /
| | * | | Fixed bug #61759 (class_alias() should accept classes with leading backslashe...Dmitry Stogov2013-08-292-9/+7
| | * | | Fixed bug #61759 (class_alias() should accept classes with leading backslashe...Dmitry Stogov2013-08-291-0/+2
| * | | | Fixed compatibility with php-5.2Dmitry Stogov2013-08-291-1/+4
| * | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-08-292-8/+38
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-291-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Avoid compiler warningXinchen Hui2013-08-291-1/+1
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-292-8/+38
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix bug #65579 (Using traits with get_class_methods causes segfault).Adam Harvey2013-08-283-8/+40
| | | | |/ | | | |/|
| * | | | Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). ...Dmitry Stogov2013-08-292-2/+6
| |/ / /
* | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-283-11/+3
|\ \ \ \ | |/ / /
| * | | removed the /Wp64 switch as we use true 64 bit compiler nowAnatol Belski2013-08-282-2/+2
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-08-280-0/+0
| |\ \ \ | | |/ /
| | * | updated lib versionsAnatol Belski2013-08-281-1/+1
| | |/
| * | updated lib versions, the vc11 ones only matter nowAnatol Belski2013-08-281-9/+1
|/ /
* | Fixed compiler warningsXinchen Hui2013-08-272-3/+3
* | Fixed compilation warningDmitry Stogov2013-08-261-1/+0
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-254-100/+135
|\ \ | |/
| * Fix bug #65554 in DateTime, when use it with D/l in format and textual day ha...gron19872013-08-254-102/+137
* | Merge branch 'fix_travis' into PHP-5.5Stanislav Malyshev2013-08-2512-13/+39
|\ \
| * | fix mysql tests & mark nextRowset problematic testsStanislav Malyshev2013-08-248-9/+27
| * | fix mysql initStanislav Malyshev2013-08-241-1/+1
| * | add opensslStanislav Malyshev2013-08-241-0/+1
| * | add mysql settingsStanislav Malyshev2013-08-244-4/+11
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-242-1/+15
|\ \ \ | | |/ | |/|
| * | Fix DateInterval->days value when object was created not from DateTime::diff()Alexander Moskalev2013-08-242-1/+15
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-243-0/+105
|\ \ \ | |/ /
| * | Test extension xmlrpc encode type double and string decode type string and introot2013-08-243-0/+105
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-241-2/+2
|\ \ \ | |/ /
| * | Stricter libc-client symlink checkOle Markus With2013-08-241-2/+2
* | | Expose fputcsv's escape_char to userlandJoey Smith2013-08-245-12/+135