Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2014-01-03 | 0 | -0/+0 |
|\ | |||||
| * | Bump year | Xinchen Hui | 2014-01-03 | 807 | -817/+817 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-01-02 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 | Derick Rethans | 2014-01-02 | 16 | -30/+286 |
| |\ | |||||
* | | | Fixed (some of) add/sub. | Derick Rethans | 2014-01-02 | 1 | -40/+8 |
* | | | - BFN | Felipe Pena | 2014-01-01 | 1 | -0/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | krakjoe | 2014-01-01 | 1 | -18/+25 |
|\ \ \ | | |/ | |/| | |||||
| * | | fix #66375 bad logic in sapi header callback routine | krakjoe | 2014-01-01 | 1 | -18/+25 |
* | | | Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 | Felipe Pena | 2014-01-01 | 15 | -669/+852 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Nikita Popov | 2013-12-30 | 2 | -0/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix leak caused by fix to bug #65667 | Nikita Popov | 2013-12-30 | 2 | -0/+8 |
| * | | | Fix test fail | Xinchen Hui | 2013-12-30 | 1 | -0/+1 |
| * | | | Fix dos style eol in phpts | Xinchen Hui | 2013-12-30 | 3 | -126/+126 |
| * | | | Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as ... | Xinchen Hui | 2013-12-30 | 4 | -486/+488 |
| * | | | minor fix on previous | Remi Collet | 2013-12-28 | 1 | -1/+2 |
| * | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Remi Collet | 2013-12-28 | 3 | -23/+54 |
| * | | | Revert accidented committed php_version.h | Xinchen Hui | 2013-12-27 | 1 | -3/+3 |
| * | | | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Xinchen Hui | 2013-12-27 | 4 | -37/+173 |
| * | | | Fixed ZEND_MM_MEM_TYPE=mmap_zero | Dmitry Stogov | 2013-12-26 | 2 | -1/+2 |
| * | | | brought the ext/sybase_ct/config.w32 up to date | Anatol Belski | 2013-12-25 | 1 | -2/+5 |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-12-24 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.4.25 next | Stanislav Malyshev | 2013-12-24 | 3 | -4/+6 |
* | | | | - Fixed bug #66381 (__ss_family was changed on AIX 5.3) | Felipe Pena | 2014-01-01 | 2 | -3/+4 |
|/ / / | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-12-23 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | removed outdated IsDebuggerPresent declaration | Anatol Belski | 2013-12-23 | 1 | -4/+0 |
* | | | Added suggestion about opcache.revalidate_freq setting in development environ... | Dmitry Stogov | 2013-12-23 | 1 | -1/+5 |
* | | | Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.rev... | Dmitry Stogov | 2013-12-23 | 5 | -3/+51 |
* | | | opcodes | krakjoe | 2013-12-22 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | krakjoe | 2013-12-22 | 6 | -10/+24 |
|\ \ \ | |/ / | |||||
| * | | stop warnings from unused opcode map | krakjoe | 2013-12-22 | 3 | -7/+17 |
| * | | - BFN | Felipe Pena | 2013-12-22 | 1 | -0/+4 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2013-12-22 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch b... | Felipe Pena | 2013-12-22 | 1 | -1/+2 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2013-12-22 | 7 | -3/+14 |
|\ \ \ | |/ / | |||||
| * | | Included new .c file in build too | Bob Weinand | 2013-12-22 | 7 | -3/+14 |
* | | | Fixed little typo in zend_vm_gen.php | Bob Weinand | 2013-12-21 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2013-12-21 | 3 | -170/+201 |
|\ \ \ | |/ / | |||||
| * | | Moved to new file, killing a lot of warnings | Bob Weinand | 2013-12-21 | 3 | -165/+196 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2013-12-21 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fixed build... | Bob Weinand | 2013-12-21 | 2 | -2/+2 |
| * | | Added an opcode to opcode name map | Bob Weinand | 2013-12-21 | 2 | -0/+177 |
| * | | Merge branch '5.4' into PHP-5.4 | Boris Lytochkin | 2013-12-20 | 2 | -0/+9 |
| |\ \ | |||||
| | * | | keep 'em sorted | Boris Lytochkin | 2013-12-20 | 1 | -3/+3 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2013-12-21 | 2 | -0/+182 |
* | | | | Merge branch '5.5' into PHP-5.5 | Boris Lytochkin | 2013-12-20 | 2 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin) | Boris Lytochkin | 2013-12-20 | 1 | -0/+3 |
| * | | | | Merge branch '5.4' into 5.5 | Boris Lytochkin | 2013-12-20 | 1 | -0/+6 |
| |\ \ \ \ |/ / / / / | | | _ / | | | / | |||||
| * | | | Fixed SNMP_ERR_TOOBIG handling for bulk walk operations | Boris Lytochkin | 2013-12-20 | 2 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2013-12-19 | 1 | -358/+372 |
|\ \ \ | | |/ | |/| | |||||
| * | | - Updated to version 2013.9 (2013i) | Derick Rethans | 2013-12-19 | 1 | -358/+372 |
| |/ |