Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged changes for bug #63297 from 5.3 | Anatoliy Belsky | 2012-10-25 | 1 | -6/+20 |
* | enabled libxpm for gd on windows | Anatoliy Belsky | 2012-10-24 | 1 | -1/+5 |
* | Merge branch 'PHP-5.3' into PHP-5.4 | Christopher Jones | 2012-10-21 | 3 | -10/+32 |
|\ | |||||
| * | Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) | Christopher Jones | 2012-10-21 | 3 | -10/+32 |
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-10-19 | 59 | -28459/+39657 |
|\ \ | |/ | |||||
| * | Fixed bug #63284 PCRE upgrade to 8.31 | Anatoliy Belsky | 2012-10-19 | 59 | -28459/+39657 |
| * | Update libmagic.patch | Xinchen Hui | 2012-10-19 | 1 | -57/+102 |
* | | Merge branch 'PHP-5.3' into PHP-5.4 | Christopher Jones | 2012-10-18 | 4 | -3/+6 |
|\ \ | |/ | |||||
| * | Fixed bug #63307 (Unused variable in oci8.c) | Christopher Jones | 2012-10-18 | 2 | -2/+3 |
| * | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3 | Christopher Jones | 2012-10-18 | 20 | -101/+399 |
| |\ | |||||
| * | | Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) | Christopher Jones | 2012-10-18 | 3 | -2/+4 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Derick Rethans | 2012-10-18 | 1 | -79/+95 |
|\ \ \ | | |/ | |/| | |||||
| * | | - Updated to version 2012.7 (2012g) | Derick Rethans | 2012-10-18 | 1 | -79/+95 |
| * | | Merge the fix for #61964 to 5.3, which will fix #63304 | Xinchen Hui | 2012-10-18 | 2 | -7/+89 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | indent | Xinchen Hui | 2012-10-18 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-18 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | better fix for #63055 | Xinchen Hui | 2012-10-18 | 1 | -2/+1 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-18 | 2 | -1/+25 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) | Xinchen Hui | 2012-10-18 | 2 | -1/+25 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2012-10-17 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 | Andrey Hristov | 2012-10-17 | 874 | -914/+1542 |
| |\ \ | |||||
| * | | | fix compilation failure on 32/64bit linux systems, when libmysql is used | Andrey Hristov | 2012-10-17 | 1 | -0/+7 |
* | | | | Merge branch 'PHP-5.3' into PHP-5.4 | ULF WENDEL | 2012-09-29 | 2 | -4/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Cover have_ssl=NO and have_ssl=DISABLED | ULF WENDEL | 2012-09-29 | 2 | -4/+4 |
* | | | | Fixed bug #63248 Load multiple magic files on win | Anatoliy Belsky | 2012-10-16 | 3 | -107/+138 |
* | | | | Merge branch 'PHP-5.3' into PHP-5.4 | ULF WENDEL | 2012-09-29 | 6 | -8/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Minor changes for MySQL 5.6 | ULF WENDEL | 2012-09-29 | 6 | -8/+18 |
* | | | | - Fixed bug #63214 (Large PDO Firebird Queries) | Felipe Pena | 2012-10-12 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Gustavo Lopes | 2012-10-12 | 1 | -0/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix bug #63240 on stream_get_line() | Gustavo Lopes | 2012-10-12 | 1 | -0/+17 |
| * | | | extended the SKIPIF section with ICU 49 (sync with 5.4 branch) | Anatoliy Belsky | 2012-10-12 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-10-12 | 5 | -2/+145 |
|\ \ \ \ | |/ / / | |||||
| * | | | fixed tests for gd having freetype >= 2.4.10 | Anatoliy Belsky | 2012-10-12 | 5 | -2/+145 |
| | |/ | |/| | |||||
* | | | Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOT... | Xinchen Hui | 2012-10-12 | 1 | -1/+1 |
* | | | Fix warnings preventing this test from passing | Anatoliy Belsky | 2012-10-10 | 1 | -0/+2 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 55 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove executable permission on inc | Xinchen Hui | 2012-10-10 | 56 | -0/+0 |
* | | | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 4 | -0/+0 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 627 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 678 | -0/+0 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-09 | 55 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #63236 (Executable permission on various source files) | Xinchen Hui | 2012-10-09 | 56 | -0/+0 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-09 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec) | Xinchen Hui | 2012-10-09 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-10-04 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | exposing the libxpm version in phpinfo | Anatoliy Belsky | 2012-10-04 | 1 | -0/+5 |
| * | | Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 | Derick Rethans | 2012-10-04 | 52 | -262/+553 |
| |\ \ | |||||
* | \ \ | Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 | Derick Rethans | 2012-10-04 | 103 | -683/+1272 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-10-02 | 1 | -2/+1 |
| |\ \ \ \ | | | |/ / | | |/| | |