summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.8php-5.5.8PHP-5.5.8Julien Pauli2014-01-083-4/+4
|
* Fixed (some of) add/sub.Derick Rethans2014-01-081-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.8RC1Julien Pauli2013-12-243-4/+4
|
* Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-231-4/+0
|\ | | | | | | | | * PHP-5.4: removed outdated IsDebuggerPresent declaration
| * removed outdated IsDebuggerPresent declarationAnatol Belski2013-12-231-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 Stogov2013-12-231-1/+5
| | | | | | | | environment
* | Fixed Issue #140: "opcache.enable_file_override" doesn't respect ↵Dmitry Stogov2013-12-235-3/+51
| | | | | | | | "opcache.revalidate_freq"
* | opcodeskrakjoe2013-12-221-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5krakjoe2013-12-226-10/+24
|\ \ | |/ | | | | | | | | * PHP-5.4: stop warnings from unused opcode map - BFN
| * 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
|\ \ | |/ | | | | | | * 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 Pena2013-12-221-1/+2
| | | | | | | | by: michael at orlitzky dot com
* | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2013-12-227-3/+14
|\ \ | |/ | | | | | | Conflicts: Zend/zend_vm_opcodes.c
| * 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
|\ \ | |/ | | | | | | Conflicts: Zend/zend_vm_opcodes.h
| * 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
|\ \ | |/ | | | | | | | | Conflicts: Zend/zend_vm_gen.php Zend/zend_vm_opcodes.h
| * Fixed build...Bob Weinand2013-12-212-2/+2
| |
| * Added an opcode to opcode name mapBob Weinand2013-12-212-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.4Boris Lytochkin2013-12-202-0/+9
| |\ | | | | | | | | | | | | | | | * 5.4: keep 'em sorted Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
| | * 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
|\ \ \ | | | | | | | | | | | | | | | | * 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 Lytochkin2013-12-201-0/+3
| | | |
| * | | Merge branch '5.4' into 5.5Boris Lytochkin2013-12-201-0/+6
| |\ \ \ |/ / / / | | | _ | | | | | | * 5.4: Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
| * | 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
| |/
* | NEWSRemi Collet2013-12-191-0/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-191-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 Collet2013-12-192-1/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-191-3/+5
|\ \ | |/ | | | | | | * PHP-5.4: Update NEWS handling section of README.GIT-RULES
| * Update NEWS handling section of README.GIT-RULESMichael Wallner2013-12-191-3/+5
| | | | | | | | See http://marc.info/?t=138124004400005&r=1&w=2
* | Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.Dmitry Stogov2013-12-183-3/+69
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-171-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fixed possibly uninitialized value usage
| * fixed possibly uninitialized value usageAnatol Belski2013-12-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-162-1/+9
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #65873 - Integer overflow in exif_read_data()
| * Fix bug #65873 - Integer overflow in exif_read_data()Stanislav Malyshev2013-12-162-1/+9
| |
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-1617-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.5Xinchen Hui2013-12-153-78/+81
| |\ \
| | * \ Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-142-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 callAnatol Belski2013-12-141-1/+1
| | | |
| | | * Fix doc (svn -> git)DQNEO2013-12-131-2/+2
| | | |
| | * | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2013-12-131-75/+78
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Updated release process
| | | * Merge branch 'PHP-5.3' into PHP-5.4Julien Pauli2013-12-131-68/+78
| | | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Updated release process
| | | | * Updated release processJulien Pauli2013-12-131-77/+79
| | | | |
| * | | | Fix tests expecting specific resource IDsEric Stenson2013-12-1514-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.5Dmitry Stogov2013-12-133-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