summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2014-01-030-0/+0
|\
| * Bump yearXinchen Hui2014-01-03807-817/+817
* | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-01-020-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Derick Rethans2014-01-0216-30/+286
| |\
* | | Fixed (some of) add/sub.Derick Rethans2014-01-021-40/+8
* | | - BFNFelipe Pena2014-01-011-0/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5krakjoe2014-01-011-18/+25
|\ \ \ | | |/ | |/|
| * | fix #66375 bad logic in sapi header callback routinekrakjoe2014-01-011-18/+25
* | | Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5Felipe Pena2014-01-0115-669/+852
|\ \ \
| * \ \ Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2013-12-302-0/+8
| |\ \ \ | | |/ /
| | * | Fix leak caused by fix to bug #65667Nikita Popov2013-12-302-0/+8
| * | | Fix test failXinchen Hui2013-12-301-0/+1
| * | | Fix dos style eol in phptsXinchen Hui2013-12-303-126/+126
| * | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ...Xinchen Hui2013-12-304-486/+488
| * | | minor fix on previousRemi Collet2013-12-281-1/+2
| * | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())Remi Collet2013-12-283-23/+54
| * | | Revert accidented committed php_version.hXinchen Hui2013-12-271-3/+3
| * | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())Xinchen Hui2013-12-274-37/+173
| * | | Fixed ZEND_MM_MEM_TYPE=mmap_zeroDmitry Stogov2013-12-262-1/+2
| * | | brought the ext/sybase_ct/config.w32 up to dateAnatol Belski2013-12-251-2/+5
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-240-0/+0
| |\ \ \ | | |/ /
| | * | 5.4.25 nextStanislav Malyshev2013-12-243-4/+6
* | | | - Fixed bug #66381 (__ss_family was changed on AIX 5.3)Felipe Pena2014-01-012-3/+4
|/ / /
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-231-4/+0
|\ \ \ | |/ /
| * | removed outdated IsDebuggerPresent declarationAnatol Belski2013-12-231-4/+0
* | | Added suggestion about opcache.revalidate_freq setting in development environ...Dmitry Stogov2013-12-231-1/+5
* | | Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.rev...Dmitry Stogov2013-12-235-3/+51
* | | opcodeskrakjoe2013-12-221-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5krakjoe2013-12-226-10/+24
|\ \ \ | |/ /
| * | stop warnings from unused opcode mapkrakjoe2013-12-223-7/+17
| * | - BFNFelipe Pena2013-12-221-0/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-12-221-1/+2
|\ \ \ | |/ /
| * | - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch b...Felipe Pena2013-12-221-1/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-227-3/+14
|\ \ \ | |/ /
| * | Included new .c file in build tooBob Weinand2013-12-227-3/+14
* | | Fixed little typo in zend_vm_gen.phpBob Weinand2013-12-211-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-213-170/+201
|\ \ \ | |/ /
| * | Moved to new file, killing a lot of warningsBob Weinand2013-12-213-165/+196
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-212-2/+2
|\ \ \ | |/ /
| * | Fixed build...Bob Weinand2013-12-212-2/+2
| * | Added an opcode to opcode name mapBob Weinand2013-12-212-0/+177
| * | Merge branch '5.4' into PHP-5.4Boris Lytochkin2013-12-202-0/+9
| |\ \
| | * | keep 'em sortedBoris Lytochkin2013-12-201-3/+3
* | | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-212-0/+182
* | | | Merge branch '5.5' into PHP-5.5Boris Lytochkin2013-12-202-0/+9
|\ \ \ \
| * | | | Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)Boris Lytochkin2013-12-201-0/+3
| * | | | Merge branch '5.4' into 5.5Boris Lytochkin2013-12-201-0/+6
| |\ \ \ \ |/ / / / / | | | _ / | | | /
| * | | Fixed SNMP_ERR_TOOBIG handling for bulk walk operationsBoris Lytochkin2013-12-202-0/+9
| |/ /
* | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2013-12-191-358/+372
|\ \ \ | | |/ | |/|
| * | - Updated to version 2013.9 (2013i)Derick Rethans2013-12-191-358/+372
| |/