summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NEWS for the last revertphp-5.5.16PHP-5.5.16Julien Pauli2014-08-211-4/+0
|
* Revert "Fixed Bug #67724" See https://bugs.php.net/bug.php?id=67865Julien Pauli2014-08-213-28/+1
| | | | This reverts commit e4ff7f2ee346d641715694209e61704c9e815483.
* 5.5.16Julien Pauli2014-08-193-4/+8
|
* fix potentially missing NUL terminationStanislav Malyshev2014-08-191-0/+2
|
* Fix bug #67730 - Null byte injection possible with imagexxx functionsStanislav Malyshev2014-08-191-0/+5
|
* Fixed bug #67717 - segfault in dns_get_recordStanislav Malyshev2014-08-191-24/+60
|
* Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-191-1/+1
|
* 5.5.16RC1php-5.5.16RC1Julien Pauli2014-08-063-7/+7
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-050-0/+0
|\ | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.33-dev now Conflicts: configure.in main/php_version.h
| * 5.4.33-dev nowStanislav Malyshev2014-08-053-4/+6
| |
* | BFNMichael Wallner2014-08-051-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-053-1/+28
|\ \ | |/ | | | | | | * PHP-5.4: Fixed Bug #67724
| * Fixed Bug #67724Michael Wallner2014-08-054-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
* | typoRemi Collet2014-08-041-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-040-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: typo
| * typoRemi Collet2014-08-041-1/+1
| |
* | NEWSRemi Collet2014-08-041-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-041-1/+6
|\ \ | |/ | | | | | | | | * PHP-5.4: NEWS Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
| * NEWSRemi Collet2014-08-041-0/+4
| |
| * Fixed Bug #66901 php-gd 'c_color' NULL pointer dereferenceRemi Collet2014-08-041-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.5Anatol Belski2014-08-041-0/+8
|\ \ | |/ | | | | | | * PHP-5.4: backport the fix for bug #67739
| * backport the fix for bug #67739Anatol Belski2014-08-041-0/+8
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-041-0/+35
|\ \ | |/ | | | | | | * PHP-5.4: add test
| * add testStanislav Malyshev2014-08-041-0/+35
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-044-21/+76
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #67705 (extensive backtracking in rule regular expression)
| * Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-044-21/+76
| |
* | Fix wrong lenght sizeAndrey Hristov2014-07-311-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Peter Cowburn2014-07-312-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.4Peter Cowburn2014-07-312-11514/+11512
| |\
| | * Bug #51096 - Remove unnecessary ? for first/last day ofPeter Cowburn2014-07-312-11514/+11512
| |/
* | Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-07-300-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: Update NEWS
| * Update NEWSKeyur Govande2014-07-301-0/+4
| |
* | Update NEWSKeyur Govande2014-07-301-0/+4
| |
* | BFNMichael Wallner2014-07-301-0/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-303-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 Wallner2014-07-304-6/+13
| |
* | Merge commit '8b9719d' into PHP-5.5Rasmus Lerdorf2014-07-301-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 upRasmus Lerdorf2014-07-301-0/+3
| |
* | Updated NEWS for #67693Tjerk Meesters2014-07-301-0/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-07-302-1/+26
|\ \ | |/ | | | | | | | | * PHP-5.4: Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array
| * Updated NEWS for #67693Tjerk Meesters2014-07-301-0/+3
| |
| * Fixed bug #67693 - incorrect push to the empty arrayTjerk Meesters2014-07-302-1/+26
| |
* | Fixed usage after freeDmitry Stogov2014-07-301-1/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-07-305-26/+121
|\ \ | |/ | | | | | | | | * PHP-5.4: Undo inadvertent commit of php_version Corrected patch for bug #60616
| * Undo inadvertent commit of php_versionKeyur Govande2014-07-301-0/+1
| |
| * Corrected patch for bug #60616Keyur Govande2014-07-306-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.5Keyur Govande2014-07-282-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 Govande2014-07-282-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.5Stanislav Malyshev2014-07-281-3/+3
|\ \ | |/ | | | | | | * PHP-5.4: fix NEWS
| * fix NEWSStanislav Malyshev2014-07-281-3/+3
| |