summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* merged changes for bug #63297 from 5.3Anatoliy Belsky2012-10-251-6/+20
* enabled libxpm for gd on windowsAnatoliy Belsky2012-10-241-1/+5
* Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-10-213-10/+32
|\
| * Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)Christopher Jones2012-10-213-10/+32
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-1959-28459/+39657
|\ \ | |/
| * Fixed bug #63284 PCRE upgrade to 8.31Anatoliy Belsky2012-10-1959-28459/+39657
| * Update libmagic.patchXinchen Hui2012-10-191-57/+102
* | Merge branch 'PHP-5.3' into PHP-5.4Christopher Jones2012-10-184-3/+6
|\ \ | |/
| * Fixed bug #63307 (Unused variable in oci8.c)Christopher Jones2012-10-182-2/+3
| * Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-10-1820-101/+399
| |\
| * | Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)Christopher Jones2012-10-183-2/+4
* | | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-10-181-79/+95
|\ \ \ | | |/ | |/|
| * | - Updated to version 2012.7 (2012g)Derick Rethans2012-10-181-79/+95
| * | Merge the fix for #61964 to 5.3, which will fix #63304Xinchen Hui2012-10-182-7/+89
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-1/+1
|\ \ \ | |/ /
| * | indentXinchen Hui2012-10-181-1/+1
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-181-2/+1
|\ \ \ | |/ /
| * | better fix for #63055Xinchen Hui2012-10-181-2/+1
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-182-1/+25
|\ \ \ | |/ /
| * | Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)Xinchen Hui2012-10-182-1/+25
* | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-10-171-0/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3Andrey Hristov2012-10-17874-914/+1542
| |\ \
| * | | fix compilation failure on 32/64bit linux systems, when libmysql is usedAndrey Hristov2012-10-171-0/+7
* | | | Merge branch 'PHP-5.3' into PHP-5.4ULF WENDEL2012-09-292-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Cover have_ssl=NO and have_ssl=DISABLEDULF WENDEL2012-09-292-4/+4
* | | | Fixed bug #63248 Load multiple magic files on winAnatoliy Belsky2012-10-163-107/+138
* | | | Merge branch 'PHP-5.3' into PHP-5.4ULF WENDEL2012-09-296-8/+18
|\ \ \ \ | |/ / /
| * | | Minor changes for MySQL 5.6ULF WENDEL2012-09-296-8/+18
* | | | - Fixed bug #63214 (Large PDO Firebird Queries)Felipe Pena2012-10-121-1/+1
* | | | Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-0/+17
|\ \ \ \ | |/ / /
| * | | Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-0/+17
| * | | extended the SKIPIF section with ICU 49 (sync with 5.4 branch)Anatoliy Belsky2012-10-121-1/+1
* | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-125-2/+145
|\ \ \ \ | |/ / /
| * | | fixed tests for gd having freetype >= 2.4.10Anatoliy Belsky2012-10-125-2/+145
| | |/ | |/|
* | | Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOT...Xinchen Hui2012-10-121-1/+1
* | | Fix warnings preventing this test from passingAnatoliy Belsky2012-10-101-0/+2
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-1055-0/+0
|\ \ \ | |/ /
| * | Remove executable permission on incXinchen Hui2012-10-1056-0/+0
* | | Remove executable permission on phptXinchen Hui2012-10-104-0/+0
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-10627-0/+0
|\ \ \ | |/ /
| * | Remove executable permission on phptXinchen Hui2012-10-10678-0/+0
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-0955-0/+0
|\ \ \ | |/ /
| * | Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-0956-0/+0
* | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-091-1/+1
|\ \ \ | |/ /
| * | Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)Xinchen Hui2012-10-091-1/+1
* | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-041-0/+5
|\ \ \ | |/ /
| * | exposing the libxpm version in phpinfoAnatoliy Belsky2012-10-041-0/+5
| * | Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3Derick Rethans2012-10-0452-262/+553
| |\ \
* | \ \ Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4Derick Rethans2012-10-04103-683/+1272
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-10-021-2/+1
| |\ \ \ \ | | | |/ / | | |/| |