Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5.8php-5.5.8PHP-5.5.8 | Julien Pauli | 2014-01-08 | 3 | -4/+4 |
| | |||||
* | Fixed (some of) add/sub. | Derick Rethans | 2014-01-08 | 1 | -40/+8 |
| | | | | | This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable this code was not correctly merged. | ||||
* | Prepare for 5.5.8RC1php-5.5.8RC1 | Julien Pauli | 2013-12-24 | 3 | -4/+4 |
| | |||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-12-23 | 1 | -4/+0 |
|\ | | | | | | | | | * PHP-5.4: removed outdated IsDebuggerPresent declaration | ||||
| * | removed outdated IsDebuggerPresent declaration | Anatol Belski | 2013-12-23 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | This piece of code seems to retain compatibility with some windows versions before 2000. Today it's not relevant anymore and only produces a warning C4273 because of the conflicting prototype. In VC9 the declaration is present in winbase.h:4142, but available is it already in winxp. Here's the doc link http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx | ||||
* | | Added suggestion about opcache.revalidate_freq setting in development ↵ | Dmitry Stogov | 2013-12-23 | 1 | -1/+5 |
| | | | | | | | | environment | ||||
* | | Fixed Issue #140: "opcache.enable_file_override" doesn't respect ↵ | Dmitry Stogov | 2013-12-23 | 5 | -3/+51 |
| | | | | | | | | "opcache.revalidate_freq" | ||||
* | | opcodes | krakjoe | 2013-12-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | krakjoe | 2013-12-22 | 6 | -10/+24 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: stop warnings from unused opcode map - BFN | ||||
| * | 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 |
|\ \ | |/ | | | | | | | * PHP-5.4: - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com | ||||
| * | - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch ↵ | Felipe Pena | 2013-12-22 | 1 | -1/+2 |
| | | | | | | | | by: michael at orlitzky dot com | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Bob Weinand | 2013-12-22 | 7 | -3/+14 |
|\ \ | |/ | | | | | | | Conflicts: Zend/zend_vm_opcodes.c | ||||
| * | 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 |
|\ \ | |/ | | | | | | | Conflicts: Zend/zend_vm_opcodes.h | ||||
| * | 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 |
|\ \ | |/ | | | | | | | | | Conflicts: Zend/zend_vm_gen.php Zend/zend_vm_opcodes.h | ||||
| * | 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 |
| | | | | | | | | | | That way extensions etc. don't have to maintain their own lists anymore. Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode. | ||||
| * | Merge branch '5.4' into PHP-5.4 | Boris Lytochkin | 2013-12-20 | 2 | -0/+9 |
| |\ | | | | | | | | | | | | | | | | * 5.4: keep 'em sorted Fixed SNMP_ERR_TOOBIG handling for bulk walk operations | ||||
| | * | 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 |
|\ \ \ | | | | | | | | | | | | | | | | | * 5.5: Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin) | ||||
| * | | | 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 |
| |\ \ \ |/ / / / | | | _ | | | | | | | * 5.4: Fixed SNMP_ERR_TOOBIG handling for bulk walk operations | ||||
| * | | 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 |
| |/ | |||||
* | | NEWS | Remi Collet | 2013-12-19 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-12-19 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) | ||||
| * | Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) | Remi Collet | 2013-12-19 | 2 | -1/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2013-12-19 | 1 | -3/+5 |
|\ \ | |/ | | | | | | | * PHP-5.4: Update NEWS handling section of README.GIT-RULES | ||||
| * | Update NEWS handling section of README.GIT-RULES | Michael Wallner | 2013-12-19 | 1 | -3/+5 |
| | | | | | | | | See http://marc.info/?t=138124004400005&r=1&w=2 | ||||
* | | Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. | Dmitry Stogov | 2013-12-18 | 3 | -3/+69 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-12-17 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.4: fixed possibly uninitialized value usage | ||||
| * | fixed possibly uninitialized value usage | Anatol Belski | 2013-12-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-12-16 | 2 | -1/+9 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix bug #65873 - Integer overflow in exif_read_data() | ||||
| * | Fix bug #65873 - Integer overflow in exif_read_data() | Stanislav Malyshev | 2013-12-16 | 2 | -1/+9 |
| | | |||||
* | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Dmitry Stogov | 2013-12-16 | 17 | -122/+140 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Fix tests expecting specific resource IDs fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git) Updated release process | ||||
| * \ | Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 | Xinchen Hui | 2013-12-15 | 3 | -78/+81 |
| |\ \ | |||||
| | * \ | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-12-14 | 2 | -3/+3 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | * PHP-5.4: fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git) | ||||
| | | * | fixed parameter order for zend_throw_exception_ex call | Anatol Belski | 2013-12-14 | 1 | -1/+1 |
| | | | | |||||
| | | * | Fix doc (svn -> git) | DQNEO | 2013-12-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Julien Pauli | 2013-12-13 | 1 | -75/+78 |
| | |\ \ | | | |/ | | | | | | | | | | | | | * PHP-5.4: Updated release process | ||||
| | | * | Merge branch 'PHP-5.3' into PHP-5.4 | Julien Pauli | 2013-12-13 | 1 | -68/+78 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Updated release process | ||||
| | | | * | Updated release process | Julien Pauli | 2013-12-13 | 1 | -77/+79 |
| | | | | | |||||
| * | | | | Fix tests expecting specific resource IDs | Eric Stenson | 2013-12-15 | 14 | -44/+59 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Wincache or APC are installed, the resource IDs are not the same. This is because Wincache takes a few resource objects for itself. As a result, these tests become false positives. On Windows boxes, the microtime precision is not granular enough to reliably register a difference if two calls to uniqid() are made concurrently. This is a fix to the uniqid() test to avoid the false positive when run on Windows machines. Also, added a test to exercise the 'more_entropy' variant of uniqid(). | ||||
* | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Dmitry Stogov | 2013-12-13 | 3 | -6/+78 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Use zend_error_noreturn here Add Tests for #65784 in 5.5 Disallowed JMP into a finally block. Update NEWS for 5.5.7 release |