summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* OCI8: remove unused ext/oci8/config.m4 macroChristopher Jones2013-08-301-16/+0
* OCI8 whitespace: remove tabs embedded in codeChristopher Jones2013-08-303-4/+4
* Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-08-304-7/+44
|\
| * Merge branch 'PHP-5.5'Remi Collet2013-08-301-7/+7
| |\
| | * 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
| * | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-302-0/+35
| |\ \ \ | | |/ /
| | * | 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
| * | | Remove ini dependency in testYasuo Ohgaki2013-08-301-0/+2
* | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-08-296-25/+92
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5'Dmitry Stogov2013-08-292-8/+44
| |\ \ \ | | |/ /
| | * | Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)Dmitry Stogov2013-08-293-8/+45
| * | | Merge branch 'PHP-5.5'Dmitry Stogov2013-08-292-9/+7
| |\ \ \ | | |/ /
| | * | 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
| * | | Merge branch 'PHP-5.5'Dmitry Stogov2013-08-291-1/+4
| |\ \ \ | | |/ /
| | * | 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 'master' of git.php.net:php-srcDmitry Stogov2013-08-292-8/+38
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-5.5'Xinchen Hui2013-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
| * | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-08-291-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). ...Dmitry Stogov2013-08-292-2/+6
| | |/ /
* | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-08-283-11/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5'Anatol Belski2013-08-282-2/+2
| |\ \ \ | | |/ /
| | * | removed the /Wp64 switch as we use true 64 bit compiler nowAnatol Belski2013-08-282-2/+2
| * | | Merge branch 'PHP-5.5'Anatol Belski2013-08-280-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-08-280-0/+0
| | |\ \ | | | |/
| | | * updated lib versionsAnatol Belski2013-08-281-1/+1
| * | | Merge branch 'PHP-5.5'Anatol Belski2013-08-281-9/+1
| |\ \ \ |/ / / / | | _ / | | /
| * | updated lib versions, the vc11 ones only matter nowAnatol Belski2013-08-281-9/+1
* | | OCI8 2.0: add oci8-check-connection probe and do some renamingChristopher Jones2013-08-274-10/+26
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-272-3/+3
|\ \ \ | |/ /
| * | Fixed compiler warningsXinchen Hui2013-08-272-3/+3
* | | Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the...Christopher Jones2013-08-261-11/+11
* | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-08-261-10/+8
|\ \ \
| * | | Evaluate ZVAL_ZVAL arguments only onceNikita Popov2013-08-261-10/+8
* | | | Leave it to DTrace FBT to trace underlying library callsChristopher Jones2013-08-267-379/+188
|/ / /
* | | Merge branch 'PHP-5.5'Dmitry Stogov2013-08-261-1/+0
|\ \ \ | |/ /
| * | Fixed compilation warningDmitry Stogov2013-08-261-1/+0
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-253-100/+131
|\ \ \ | |/ /
| * | 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