summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* typo fixesVeres Lajos2013-07-15101-160/+160
|
* typos (orig)Veres Lajos2013-07-152-3/+3
|
* less serious compatAbility fixesVeres Lajos2013-07-155-6/+6
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-142-0/+10
|\ | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #62665: add curl.cainfo to php.ini Conflicts: php.ini-development php.ini-production
| * Fix bug #62665: add curl.cainfo to php.iniStanislav Malyshev2013-07-143-1/+14
| | | | | | | | | | | | | | Conflicts: php.ini-development php.ini-production
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-140-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: add news for bug #65219
| * add news for bug #65219Stanislav Malyshev2013-07-141-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-143-18/+19
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Add built-in web server to invocation list Terminology: change embedded web server to built-in web server to align with cli usage Align -B and -E parameter names with cli usage (begin_code and end_code) Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
| * Add built-in web server to invocation listLior Kaplan2013-07-141-1/+2
| |
| * Terminology: change embedded web server to built-in web server to align with ↵Lior Kaplan2013-07-141-3/+3
| | | | | | | | cli usage
| * Align -B and -E parameter names with cli usage (begin_code and end_code)Lior Kaplan2013-07-141-8/+8
| |
| * Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4Anatol Belski2013-07-141-6/+6
| |\
| | * Merge branch 'PHP-5.3' into PHP-5.4Stanley Sufficool2013-07-140-0/+0
| | |\ | | | | | | | | | | | | * PHP-5.3:
| | | * Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3Stanley Sufficool2013-07-1442-122/+1262
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits) Merge PHP 5.3.27 NEWS add test for bug #65236 truncate results at depth of 255 to prevent corruption fix assembly of safe_address() for x86 and x86_64 Add bison 2.6.4 to the list of supported versions Update git rules (5.5 is stable, 5.3 sec only) This will be PHP 5.3.28 Fixed bug #63186 (compile failure on netbsd) ensure the error_reporting level to get expected notice fixed tests missing tests for bug #53437 missing colon Backported the fix for bug #53437 Fixed test script Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC) Fixed bug #64934 Apache2 TS crash with get_browser() Add NEWS for PHP 5.3.26 Fixed bug #64960 (Segfault in gc_zval_possible_root) fix CVE-2013-2110 - use correct formula to calculate string size ...
| | | | * Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2013-07-102-6/+19
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of https://git.php.net/repository/php-src: Merge PHP 5.3.27 NEWS add test for bug #65236
| | * | | | Fix Bug #65219Stanley Sufficool2013-07-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | DBSETLDBNAME should be called before login to set DBNAME in login record
* | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-141-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * PHP-5.4: fix uninitialized memory usage
| * | | | | fix uninitialized memory usageAnatol Belski2013-07-141-2/+2
| |/ / / /
* | | | | Update NEWSXinchen Hui2013-07-141-0/+2
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-07-143-71/+146
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| * | | | Fixed bug #65254 (Exception not catchable when exception thrown in autoload ↵Xinchen Hui2013-07-144-81/+168
| | | | | | | | | | | | | | | | | | | | with a namespace).
| * | | | - BFNFelipe Pena2013-07-131-0/+4
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-07-131-0/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
| * | | | - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot chFelipe Pena2013-07-131-0/+15
| | | | |
* | | | | fix version - not -dev anymore since 5.5.0 releaseStanislav Malyshev2013-07-121-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-07-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * PHP-5.4: - Fixed bug #65227 (Memory leak in gmp_cmp second parameter) Fixed meta data retrieve when OID is larger than 2^31
| * | | | - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)Felipe Pena2013-07-122-0/+4
| | | | |
| * | | | Fixed meta data retrieve when OID is larger than 2^31Yasuo Ohgaki2013-07-132-1/+4
| | | | |
* | | | | Fixed meta data retrieve when OID is larger than 2^31Yasuo Ohgaki2013-07-131-1/+1
| | | | |
* | | | | Inprove pg_unescape_bytea() error messageYasuo Ohgaki2013-07-131-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: fix the date for 5.4.17
| * | | | fix the date for 5.4.17Stanislav Malyshev2013-07-121-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: update 5.4.17 date
| * | | | update 5.4.17 dateStanislav Malyshev2013-07-121-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-120-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: update 5.4.17 date
| * | | | update 5.4.17 dateStanislav Malyshev2013-07-121-1/+1
| | | | |
* | | | | updated NEWSAnatol Belski2013-07-111-0/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-111-1/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #65226 chroot() does not get enabled
| * | | | Fixed bug #65226 chroot() does not get enabledAnatol Belski2013-07-112-1/+24
| | | | |
| * | | | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-07-103-45/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.4' of https://git.php.net/repository/php-src: Merge PHP 5.3.27 NEWS add test for bug #65236 fix possible resource leak and make sure there's something to qsort() - Updated to version 2013.4 (2013d)
* | \ \ \ \ Merge branch 'spl_tempfile_clean' into PHP-5.5Christopher Jones2013-07-101-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * spl_tempfile_clean: Cleanup temp test file
| * | | | | | Cleanup temp test fileChristopher Jones2013-07-101-0/+4
|/ / / / / /
* | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-07-104-45/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of https://git.php.net/repository/php-src: Merge PHP 5.3.27 NEWS add test for bug #65236 fix possible resource leak and make sure there's something to qsort() Cleanup temp file - Updated to version 2013.4 (2013d)
| * \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-100-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-07-100-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge PHP 5.3.27 NEWSJohannes Schlüter2013-07-101-6/+4
| | | | | | |
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-101-0/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-07-101-0/+15
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | add test for bug #65236Johannes Schlüter2013-07-101-0/+15
| | | | |_|/ | | | |/| |
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-101-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * PHP-5.4: fix possible resource leak and make sure there's something to qsort()