Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | OCI8: remove unused ext/oci8/config.m4 macro | Christopher Jones | 2013-08-30 | 1 | -16/+0 |
* | OCI8 whitespace: remove tabs embedded in code | Christopher Jones | 2013-08-30 | 3 | -4/+4 |
* | Merge branch 'master' of https://git.php.net/repository/php-src | Christopher Jones | 2013-08-30 | 4 | -7/+44 |
|\ | |||||
| * | Merge branch 'PHP-5.5' | Remi Collet | 2013-08-30 | 1 | -7/+7 |
| |\ | |||||
| | * | Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by Addres... | Remi Collet | 2013-08-30 | 2 | -2/+4 |
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-08-30 | 1 | -5/+5 |
| | |\ | |||||
| | | * | Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by Addres... | Remi Collet | 2013-08-30 | 2 | -5/+7 |
| * | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-08-30 | 2 | -0/+35 |
| |\ \ \ | | |/ / | |||||
| | * | | Update NEWS | Xinchen Hui | 2013-08-30 | 1 | -0/+2 |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-08-30 | 2 | -0/+35 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed bug #60598 (cli/apache sapi segfault on objects manipulation) | Xinchen Hui | 2013-08-30 | 3 | -0/+37 |
| * | | | Remove ini dependency in test | Yasuo Ohgaki | 2013-08-30 | 1 | -0/+2 |
* | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Christopher Jones | 2013-08-29 | 6 | -25/+92 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-08-29 | 2 | -8/+44 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var) | Dmitry Stogov | 2013-08-29 | 3 | -8/+45 |
| * | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-08-29 | 2 | -9/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-08-29 | 3 | -9/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed bug #61759 (class_alias() should accept classes with leading backslashe... | Dmitry Stogov | 2013-08-29 | 2 | -9/+7 |
| | | * | Fixed bug #61759 (class_alias() should accept classes with leading backslashe... | Dmitry Stogov | 2013-08-29 | 1 | -0/+2 |
| * | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-08-29 | 1 | -1/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed compatibility with php-5.2 | Dmitry Stogov | 2013-08-29 | 1 | -1/+4 |
| | * | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Dmitry Stogov | 2013-08-29 | 2 | -8/+38 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'master' of git.php.net:php-src | Dmitry Stogov | 2013-08-29 | 2 | -8/+38 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-08-29 | 2 | -8/+38 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-08-29 | 1 | -1/+1 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Avoid compiler warning | Xinchen Hui | 2013-08-29 | 1 | -1/+1 |
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-08-29 | 2 | -8/+38 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Fix bug #65579 (Using traits with get_class_methods causes segfault). | Adam Harvey | 2013-08-28 | 3 | -8/+40 |
| * | | | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-08-29 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). ... | Dmitry Stogov | 2013-08-29 | 2 | -2/+6 |
| | |/ / | |||||
* | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Christopher Jones | 2013-08-28 | 3 | -11/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.5' | Anatol Belski | 2013-08-28 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | removed the /Wp64 switch as we use true 64 bit compiler now | Anatol Belski | 2013-08-28 | 2 | -2/+2 |
| * | | | Merge branch 'PHP-5.5' | Anatol Belski | 2013-08-28 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-08-28 | 0 | -0/+0 |
| | |\ \ | | | |/ | |||||
| | | * | updated lib versions | Anatol Belski | 2013-08-28 | 1 | -1/+1 |
| * | | | Merge branch 'PHP-5.5' | Anatol Belski | 2013-08-28 | 1 | -9/+1 |
| |\ \ \ |/ / / / | | _ / | | / | |||||
| * | | updated lib versions, the vc11 ones only matter now | Anatol Belski | 2013-08-28 | 1 | -9/+1 |
* | | | OCI8 2.0: add oci8-check-connection probe and do some renaming | Christopher Jones | 2013-08-27 | 4 | -10/+26 |
* | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-08-27 | 2 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Fixed compiler warnings | Xinchen Hui | 2013-08-27 | 2 | -3/+3 |
* | | | Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the... | Christopher Jones | 2013-08-26 | 1 | -11/+11 |
* | | | Merge branch 'master' of https://git.php.net/repository/php-src | Christopher Jones | 2013-08-26 | 1 | -10/+8 |
|\ \ \ | |||||
| * | | | Evaluate ZVAL_ZVAL arguments only once | Nikita Popov | 2013-08-26 | 1 | -10/+8 |
* | | | | Leave it to DTrace FBT to trace underlying library calls | Christopher Jones | 2013-08-26 | 7 | -379/+188 |
|/ / / | |||||
* | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-08-26 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Fixed compilation warning | Dmitry Stogov | 2013-08-26 | 1 | -1/+0 |
* | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-08-25 | 3 | -100/+131 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-25 | 4 | -100/+135 |
| |\ \ | | |/ | |||||
| | * | Fix bug #65554 in DateTime, when use it with D/l in format and textual day ha... | gron1987 | 2013-08-25 | 4 | -102/+137 |