Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | NEWS for the last revertphp-5.5.16PHP-5.5.16 | Julien Pauli | 2014-08-21 | 1 | -4/+0 |
| | |||||
* | Revert "Fixed Bug #67724" See https://bugs.php.net/bug.php?id=67865 | Julien Pauli | 2014-08-21 | 3 | -28/+1 |
| | | | | This reverts commit e4ff7f2ee346d641715694209e61704c9e815483. | ||||
* | 5.5.16 | Julien Pauli | 2014-08-19 | 3 | -4/+8 |
| | |||||
* | fix potentially missing NUL termination | Stanislav Malyshev | 2014-08-19 | 1 | -0/+2 |
| | |||||
* | Fix bug #67730 - Null byte injection possible with imagexxx functions | Stanislav Malyshev | 2014-08-19 | 1 | -0/+5 |
| | |||||
* | Fixed bug #67717 - segfault in dns_get_record | Stanislav Malyshev | 2014-08-19 | 1 | -24/+60 |
| | |||||
* | Fix bug #67716 - Segfault in cdf.c | Remi Collet | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | 5.5.16RC1php-5.5.16RC1 | Julien Pauli | 2014-08-06 | 3 | -7/+7 |
| | |||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-05 | 0 | -0/+0 |
|\ | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.33-dev now Conflicts: configure.in main/php_version.h | ||||
| * | 5.4.33-dev now | Stanislav Malyshev | 2014-08-05 | 3 | -4/+6 |
| | | |||||
* | | BFN | Michael Wallner | 2014-08-05 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-08-05 | 3 | -1/+28 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed Bug #67724 | ||||
| * | Fixed Bug #67724 | Michael Wallner | 2014-08-05 | 4 | -1/+32 |
| | | | | | | | | | | | | | | (chained zlib filters silently fail with large amounts of data) Use the same buffer size zlib uses internally to avoid Z_DATA_ERROR on massively compressed data | ||||
* | | typo | Remi Collet | 2014-08-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-08-04 | 0 | -0/+0 |
|\ \ | |/ | | | | | | | * PHP-5.4: typo | ||||
| * | typo | Remi Collet | 2014-08-04 | 1 | -1/+1 |
| | | |||||
* | | NEWS | Remi Collet | 2014-08-04 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-08-04 | 1 | -1/+6 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: NEWS Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference | ||||
| * | NEWS | Remi Collet | 2014-08-04 | 1 | -0/+4 |
| | | |||||
| * | Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference | Remi Collet | 2014-08-04 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704 Notice: this fix don't manage monochrome/monovisual values but just fix the security issue CVE-2014-2497 failing when trying to load such an image | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-08-04 | 1 | -0/+8 |
|\ \ | |/ | | | | | | | * PHP-5.4: backport the fix for bug #67739 | ||||
| * | backport the fix for bug #67739 | Anatol Belski | 2014-08-04 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-04 | 1 | -0/+35 |
|\ \ | |/ | | | | | | | * PHP-5.4: add test | ||||
| * | add test | Stanislav Malyshev | 2014-08-04 | 1 | -0/+35 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-04 | 4 | -21/+76 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix bug #67705 (extensive backtracking in rule regular expression) | ||||
| * | Fix bug #67705 (extensive backtracking in rule regular expression) | Stanislav Malyshev | 2014-08-04 | 4 | -21/+76 |
| | | |||||
* | | Fix wrong lenght size | Andrey Hristov | 2014-07-31 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Peter Cowburn | 2014-07-31 | 2 | -11514/+11512 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: Bug #51096 - Remove unnecessary ? for first/last day of Conflicts: ext/date/lib/parse_date.c | ||||
| * | Merge branch 'pull-request/754' into PHP-5.4 | Peter Cowburn | 2014-07-31 | 2 | -11514/+11512 |
| |\ | |||||
| | * | Bug #51096 - Remove unnecessary ? for first/last day of | Peter Cowburn | 2014-07-31 | 2 | -11514/+11512 |
| |/ | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Keyur Govande | 2014-07-30 | 0 | -0/+0 |
|\ \ | |/ | | | | | | | * PHP-5.4: Update NEWS | ||||
| * | Update NEWS | Keyur Govande | 2014-07-30 | 1 | -0/+4 |
| | | |||||
* | | Update NEWS | Keyur Govande | 2014-07-30 | 1 | -0/+4 |
| | | |||||
* | | BFN | Michael Wallner | 2014-07-30 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-07-30 | 3 | -6/+10 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed bug #67715 (php-milter does not build and crashes randomly). | ||||
| * | Fixed bug #67715 (php-milter does not build and crashes randomly). | Michael Wallner | 2014-07-30 | 4 | -6/+13 |
| | | |||||
* | | Merge commit '8b9719d' into PHP-5.5 | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | * commit '8b9719d': We need to turn off any strict mode here for this warning to show up | ||||
| * | We need to turn off any strict mode here for this warning to show up | Rasmus Lerdorf | 2014-07-30 | 1 | -0/+3 |
| | | |||||
* | | Updated NEWS for #67693 | Tjerk Meesters | 2014-07-30 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Tjerk Meesters | 2014-07-30 | 2 | -1/+26 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array | ||||
| * | Updated NEWS for #67693 | Tjerk Meesters | 2014-07-30 | 1 | -0/+3 |
| | | |||||
| * | Fixed bug #67693 - incorrect push to the empty array | Tjerk Meesters | 2014-07-30 | 2 | -1/+26 |
| | | |||||
* | | Fixed usage after free | Dmitry Stogov | 2014-07-30 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Keyur Govande | 2014-07-30 | 5 | -26/+121 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: Undo inadvertent commit of php_version Corrected patch for bug #60616 | ||||
| * | Undo inadvertent commit of php_version | Keyur Govande | 2014-07-30 | 1 | -0/+1 |
| | | |||||
| * | Corrected patch for bug #60616 | Keyur Govande | 2014-07-30 | 6 | -27/+121 |
| | | | | | | | | | | | | | | | | | | | | | | For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5). This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which returns the number of bytes required to store the data). This fixes the issue in #60616. If the newer version is not available, over-allocate to accomodate 4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide counterparts). version. Fixed a couple of failing tests. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Keyur Govande | 2014-07-28 | 2 | -2/+16 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) | ||||
| * | Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) | Keyur Govande | 2014-07-28 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by the default handler where vallen is set by the driver to the actual bytes needed for the field. If it is larger than default-lrl then the output is corrupted (reading past the buffer) because the return functions don't expect that to happen. The patch add support to handle WVARCHAR just like a regular VARCHAR. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-28 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | * PHP-5.4: fix NEWS | ||||
| * | fix NEWS | Stanislav Malyshev | 2014-07-28 | 1 | -3/+3 |
| | |