summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Fixed test with freetype >= 2.4.12Matteo Beccati2014-09-032-2/+28
|
* 5.4.34 is nextStanislav Malyshev2014-09-023-4/+6
|
* Revert "Fix bug #67644 - Memory corruption & crash during ob_start function ↵Stanislav Malyshev2014-09-022-8/+0
| | | | | | | callback" This reverts commit 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff. The change breaks tests, so not putting it into 5.4.
* Fix bug #67644 - Memory corruption & crash during ob_start function callbackStanislav Malyshev2014-09-022-0/+8
|
* update NEWSStanislav Malyshev2014-09-011-0/+2
|
* Merge branch 'pull-request/770' into PHP-5.4Stanislav Malyshev2014-09-013-2/+18
|\ | | | | | | | | | | | | * pull-request/770: Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) Fix typo from commit 32314f6b6 Fix destruction order in zend_shutdown (bug #65463, #66036)
| * Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)Keyur Govande2014-08-231-9/+12
| |
| * Fix typo from commit 32314f6b6Keyur Govande2014-08-141-1/+1
| |
| * Fix destruction order in zend_shutdown (bug #65463, #66036)Keyur Govande2014-08-143-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Apache or a similar SAPI receives a signal during PHP processing it calls zend_shutdown() without calling shutdown_executor(). #65463: If a module like Gearman or Memcached is loaded, in the unfixed version it is unloaded by zend_destroy_modules() before the CG(CLASS_TABLE) is destructed. When CG(CLASS_TABLE) is destructed, any pointers to methods (specifically around destruction) in the unloaded module's .so are now dangling and the process segfaults. #66036: Any subclasses of an internal class like ArrayObject need to be destructed in order: subclass first and then the internal class. In the unfixed version zend_shutdown() clears the CG(CLASS_TABLE) from the head of the list onwards, so internal classes are destructed first and user-defined classes last. Internal classes are alloc/deallocated with malloc/free while user-defined classes with emalloc/efree. If there's shared data between them then efree() could be called instead of free() leading to a seg-fault.
* | - Updated to version 2014.7 (2014g)Derick Rethans2014-09-011-667/+652
| |
* | fix NEWS for fcgi fix mergeStanislav Malyshev2014-08-281-7/+11
| |
* | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes ↵David Zuelke2014-08-281-3/+8
| | | | | | | | bug 67606
* | Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-273-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* | update the GIT-RULES with the 5.6 and the release branchesFerenc Kovacs2014-08-271-0/+6
| |
* | Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>Lior Kaplan2014-08-257-0/+252
| |
* | this test depends on the simplexml ext, not just on xmlFerenc Kovacs2014-08-241-3/+1
| |
* | fix bug #67865Michael Wallner2014-08-212-6/+6
| |
* | NEWSRemi Collet2014-08-201-0/+3
| |
* | fixed variable corruption under win x64Anatol Belski2014-08-201-4/+4
| |
* | Add NEWS entry for bug #67730Lior Kaplan2014-08-201-0/+2
| | | | | | | | Included in 5.4.32 with commit 706aefb
* | Add CVE ID for bug #67539Lior Kaplan2014-08-201-1/+1
| |
* | Switch use of strtok() to gd_strtok_r()Sara Golemon2014-08-192-2/+7
| | | | | | | | | | | | | | | | | | strtok() is not thread safe, so this will potentially break in very bad ways if used in ZTS mode. I'm not sure why gd_strtok_r() exists since it seems to do the same thing as strtok_r(), but I'll assume it's a portability decision and do as the Romans do.
* | Merge tag 'PHP-5.4.32' into PHP-5.4Stanislav Malyshev2014-08-192-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.4.32 * tag 'PHP-5.4.32': 5.4.32 fix potentially missing NUL termination Fix bug #67730 - Null byte injection possible with imagexxx functions Fixed bug #67717 - segfault in dns_get_record Fix bug #67716 - Segfault in cdf.c 5.4.32 RC1 Conflicts: configure.in main/php_version.h
| * | 5.4.32Stanislav Malyshev2014-08-193-4/+4
| | |
| * | fix potentially missing NUL terminationStanislav Malyshev2014-08-181-0/+2
| | |
| * | Fix bug #67730 - Null byte injection possible with imagexxx functionsStanislav Malyshev2014-08-182-0/+7
| | |
| * | Fixed bug #67717 - segfault in dns_get_recordStanislav Malyshev2014-08-182-25/+64
| | |
| * | Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-142-1/+2
| | |
| * | 5.4.32 RC1php-5.4.32RC1Stanislav Malyshev2014-08-053-4/+4
| | |
* | | NEWSRemi Collet2014-08-191-0/+3
| | |
* | | Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597Remi Collet2014-08-191-24/+60
| | | | | | | | | | | | | | | | | | | | | | | | Incomplete fix for CVE-2014-4049 Check possible buffer overflow - pass real buffer end to dn_expand calls - check buffer len before each read
* | | Correct typo in comments: 'initialized'Lior Kaplan2014-08-173-3/+3
| | |
* | | typofixesVeres Lajos2014-08-1713-13/+13
| | |
* | | Add NEWSKeyur Govande2014-08-151-0/+3
| | |
* | | Merge branch 'pull-request/772' into PHP-5.4Keyur Govande2014-08-1510-18/+158
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/772: Fix failing tests Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) Before the patch, a value of 9.99 in a FLOAT column came out of mysqli as 9.9998998641968. This is because it would naively cast a 4-byte float into PHP's internal 8-byte double. To fix this, with GCC we use the built-in decimal support to "up-convert" the 4-byte float to a 8-byte double. When that is not available, we fall back to converting the float to a string and then converting the string to a double. This mimics what MySQL does.
| * | | Fix failing testsKeyur Govande2014-08-147-14/+29
| | | |
| * | | Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)Keyur Govande2014-08-143-4/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the patch, a value of 9.99 in a FLOAT column came out of mysqli as 9.9998998641968. This is because it would naively cast a 4-byte float into PHP's internal 8-byte double. To fix this, with GCC we use the built-in decimal support to "up-convert" the 4-byte float to a 8-byte double. When that is not available, we fall back to converting the float to a string and then converting the string to a double. This mimics what MySQL does.
* | | | Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-142-5/+6
| | | |
* | | | fix testStanislav Malyshev2014-08-141-1/+2
| | | |
* | | | split the glob() test to test different basedirAnatol Belski2014-08-144-39/+99
| | | |
* | | | fixed glob() edge case on windows, ref bug #47358Anatol Belski2014-08-142-0/+57
| | | |
* | | | - fix bug #47358, glob returns error, should be empty array()Pierre Joye2014-08-143-4/+6
|/ / / | | | | | | | | | | | | Conflicts: ext/standard/dir.c
* | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2014-08-141-4/+2
|\ \ \
| * | | Update Git rulesPHP-5.3Johannes Schlüter2014-08-141-4/+2
| | | |
| * | | Back to -dev (with EOL notice in NEWS)Johannes Schlüter2014-08-143-6/+10
| | | |
| * | | It's 2014 already, fix copyright year where user visiblephp-5.3.29PHP-5.3.29Johannes Schlüter2014-08-138-12/+12
| | | | | | | | | | | | | | | | Left out all file headers
| * | | PHP 5.3.29Johannes Schlüter2014-08-133-4/+4
| | | |
| * | | PHP 5.3.29RC1php-5.3.29RC1Johannes Schlüter2014-07-313-4/+4
| | | |
| * | | Fix missing type checks in various functionsStanislav Malyshev2014-07-315-19/+41
| | | |
| * | | update NEWSStanislav Malyshev2014-07-181-0/+50
| | | |
View Lorry Controller Status