]>
granicus.if.org Git - php/log
George Wang [Mon, 3 Nov 2014 16:42:01 +0000 (11:42 -0500)]
set default response code to 200
Stanislav Malyshev [Wed, 22 Oct 2014 20:16:29 +0000 (13:16 -0700)]
fix NEWS & version
Remi Collet [Wed, 22 Oct 2014 13:39:49 +0000 (15:39 +0200)]
NEWS
Remi Collet [Wed, 22 Oct 2014 13:37:04 +0000 (15:37 +0200)]
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Upstream commit
https://github.com/file/file/commit/
39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
Stanislav Malyshev [Sun, 28 Sep 2014 23:57:42 +0000 (16:57 -0700)]
Fix bug #68113 (Heap corruption in exif_thumbnail())
Stanislav Malyshev [Mon, 29 Sep 2014 00:53:49 +0000 (17:53 -0700)]
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c
Stanislav Malyshev [Sun, 28 Sep 2014 21:19:31 +0000 (14:19 -0700)]
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Stanislav Malyshev [Mon, 29 Sep 2014 00:33:44 +0000 (17:33 -0700)]
Fix bug #68027 - fix date parsing in XMLRPC lib
Ard Biesheuvel [Fri, 10 Oct 2014 09:40:07 +0000 (11:40 +0200)]
update NEWS
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Sara Golemon [Fri, 3 Oct 2014 01:54:46 +0000 (18:54 -0700)]
Add hash to EXTENSIONS file
Matthew Daley [Sun, 28 Sep 2014 04:49:35 +0000 (17:49 +1300)]
Set an LDAP error code when failing ldap_bind due to null bytes
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.
Fix by setting an LDAP error code before returning in this case.
Johannes Schlüter [Sat, 27 Sep 2014 00:17:26 +0000 (02:17 +0200)]
This test should pass
Derick Rethans [Fri, 26 Sep 2014 15:26:59 +0000 (16:26 +0100)]
- Updated to version 2014.8 (2014h)
Stanislav Malyshev [Fri, 26 Sep 2014 07:55:49 +0000 (00:55 -0700)]
update NEWS
Stanislav Malyshev [Fri, 26 Sep 2014 07:44:24 +0000 (00:44 -0700)]
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Ard Biesheuvel [Sat, 20 Sep 2014 23:32:31 +0000 (16:32 -0700)]
Fixed bug #66242 (don't assume char is signed)
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Matteo Beccati [Tue, 16 Sep 2014 08:17:25 +0000 (10:17 +0200)]
Fixed freetype test on multiple environments
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)
This reverts commit
592df890276604c790d02be26b1b3c3710b3b888 .
Remi Collet [Mon, 15 Sep 2014 06:23:25 +0000 (08:23 +0200)]
Fix NEWS
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Daniel Lowrey [Tue, 9 Sep 2014 13:50:15 +0000 (07:50 -0600)]
Bug #41631: Fix regression from first attempt (
6569db8 )
Daniel Lowrey [Tue, 9 Sep 2014 13:37:57 +0000 (07:37 -0600)]
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Tjerk Meesters [Tue, 9 Sep 2014 09:58:45 +0000 (17:58 +0800)]
Fixed #67985 - Incorrect last used array index copied to new array after unset
In master zend_array_dup() is used to do this properly; this is a workaround.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
Matteo Beccati [Wed, 3 Sep 2014 07:43:29 +0000 (09:43 +0200)]
Fixed test with freetype >= 2.4.12
Stanislav Malyshev [Tue, 2 Sep 2014 22:03:04 +0000 (15:03 -0700)]
5.4.34 is next
Stanislav Malyshev [Tue, 2 Sep 2014 21:15:39 +0000 (14:15 -0700)]
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
This reverts commit
53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff .
The change breaks tests, so not putting it into 5.4.
Stanislav Malyshev [Sun, 31 Aug 2014 01:32:12 +0000 (18:32 -0700)]
Fix bug #67644 - Memory corruption & crash during ob_start function callback
Stanislav Malyshev [Mon, 1 Sep 2014 19:13:43 +0000 (12:13 -0700)]
update NEWS
Stanislav Malyshev [Mon, 1 Sep 2014 19:11:42 +0000 (12:11 -0700)]
Merge branch 'pull-request/770' into PHP-5.4
* 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)
Derick Rethans [Mon, 1 Sep 2014 15:40:49 +0000 (16:40 +0100)]
- Updated to version 2014.7 (2014g)
Stanislav Malyshev [Fri, 29 Aug 2014 06:10:32 +0000 (23:10 -0700)]
fix NEWS for fcgi fix merge
David Zuelke [Sat, 9 Aug 2014 06:26:33 +0000 (08:26 +0200)]
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Chris Wright [Sat, 23 Aug 2014 00:40:19 +0000 (01:40 +0100)]
Fix stream_select() issue with OpenSSL buffer
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
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:09 +0000 (00:47 +0200)]
update the GIT-RULES with the 5.6 and the release branches
Lior Kaplan [Sun, 24 Aug 2014 21:29:05 +0000 (00:29 +0300)]
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Ferenc Kovacs [Sat, 23 Aug 2014 22:08:09 +0000 (00:08 +0200)]
this test depends on the simplexml ext, not just on xml
Keyur Govande [Sat, 23 Aug 2014 14:17:37 +0000 (14:17 +0000)]
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Michael Wallner [Thu, 21 Aug 2014 20:41:36 +0000 (22:41 +0200)]
fix bug #67865
Remi Collet [Wed, 20 Aug 2014 13:16:53 +0000 (15:16 +0200)]
NEWS
Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]
fixed variable corruption under win x64
Lior Kaplan [Tue, 19 Aug 2014 21:54:19 +0000 (00:54 +0300)]
Add NEWS entry for bug #67730
Included in 5.4.32 with commit
706aefb
Lior Kaplan [Tue, 19 Aug 2014 21:51:37 +0000 (00:51 +0300)]
Add CVE ID for bug #67539
Sara Golemon [Tue, 19 Aug 2014 19:46:53 +0000 (12:46 -0700)]
Switch use of strtok() to gd_strtok_r()
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.
Stanislav Malyshev [Tue, 19 Aug 2014 08:33:45 +0000 (01:33 -0700)]
Merge tag 'PHP-5.4.32' into PHP-5.4
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
Stanislav Malyshev [Tue, 19 Aug 2014 07:40:27 +0000 (00:40 -0700)]
5.4.32
Remi Collet [Tue, 19 Aug 2014 06:40:18 +0000 (08:40 +0200)]
NEWS
Remi Collet [Tue, 19 Aug 2014 06:33:49 +0000 (08:33 +0200)]
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
Incomplete fix for CVE-2014-4049
Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
Stanislav Malyshev [Tue, 19 Aug 2014 06:04:24 +0000 (23:04 -0700)]
fix potentially missing NUL termination
Stanislav Malyshev [Tue, 19 Aug 2014 05:49:10 +0000 (22:49 -0700)]
Fix bug #67730 - Null byte injection possible with imagexxx functions
Stanislav Malyshev [Tue, 19 Aug 2014 05:37:25 +0000 (22:37 -0700)]
Fixed bug #67717 - segfault in dns_get_record
Lior Kaplan [Sun, 17 Aug 2014 18:32:53 +0000 (21:32 +0300)]
Correct typo in comments: 'initialized'
Veres Lajos [Tue, 12 Aug 2014 21:00:23 +0000 (22:00 +0100)]
typofixes
Keyur Govande [Fri, 15 Aug 2014 23:08:29 +0000 (23:08 +0000)]
Add NEWS
Keyur Govande [Fri, 15 Aug 2014 23:06:55 +0000 (23:06 +0000)]
Merge branch 'pull-request/772' into PHP-5.4
* 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.
Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]
Fix bug #67716 - Segfault in cdf.c
Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]
Fix bug #67716 - Segfault in cdf.c
Stanislav Malyshev [Fri, 15 Aug 2014 00:07:28 +0000 (17:07 -0700)]
fix test
Anatol Belski [Tue, 20 Aug 2013 11:39:30 +0000 (13:39 +0200)]
split the glob() test to test different basedir
Anatol Belski [Mon, 19 Aug 2013 12:21:16 +0000 (14:21 +0200)]
fixed glob() edge case on windows, ref bug #47358
Pierre Joye [Tue, 8 Jan 2013 14:02:04 +0000 (15:02 +0100)]
- fix bug #47358, glob returns error, should be empty array()
Conflicts:
ext/standard/dir.c
Keyur Govande [Thu, 14 Aug 2014 18:20:26 +0000 (18:20 +0000)]
Fix failing tests
Keyur Govande [Thu, 14 Aug 2014 18:19:56 +0000 (18:19 +0000)]
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.
Johannes Schlüter [Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 14 Aug 2014 15:08:02 +0000 (17:08 +0200)]
Update Git rules
Johannes Schlüter [Thu, 14 Aug 2014 15:05:20 +0000 (17:05 +0200)]
Back to -dev (with EOL notice in NEWS)
Keyur Govande [Thu, 14 Aug 2014 01:14:11 +0000 (01:14 +0000)]
Fix typo from commit
32314f6b6
Keyur Govande [Thu, 14 Aug 2014 00:55:14 +0000 (00:55 +0000)]
Fix destruction order in zend_shutdown (bug #65463, #66036)
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.
Johannes Schlüter [Wed, 13 Aug 2014 19:22:50 +0000 (21:22 +0200)]
It's 2014 already, fix copyright year where user visible
Left out all file headers
Johannes Schlüter [Wed, 13 Aug 2014 16:36:10 +0000 (18:36 +0200)]
PHP 5.3.29
Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]
Fixed #66091
Anatol Belski [Tue, 12 Aug 2014 09:50:26 +0000 (11:50 +0200)]
updated NEWS
Anatol Belski [Tue, 12 Aug 2014 09:49:46 +0000 (11:49 +0200)]
backported the fix for bug #41577
Ferenc Kovacs [Tue, 12 Aug 2014 08:34:54 +0000 (10:34 +0200)]
fix the failing date tests introduced with the latest timezonedb update
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Anatol Belski [Thu, 7 Aug 2014 17:49:59 +0000 (19:49 +0200)]
fix TS build
Daniel Lowrey [Thu, 7 Aug 2014 16:37:50 +0000 (12:37 -0400)]
Update NEWS
Daniel Lowrey [Thu, 7 Aug 2014 15:47:42 +0000 (11:47 -0400)]
Bug #41631: Observe socket read timeouts in SSL streams
Anatol Belski [Thu, 7 Aug 2014 13:20:17 +0000 (15:20 +0200)]
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Derick Rethans [Thu, 7 Aug 2014 09:22:09 +0000 (10:22 +0100)]
- Updated to version 2014.6 (2014f)
Andrey Hristov [Wed, 6 Aug 2014 12:27:29 +0000 (15:27 +0300)]
Add EXPECTF
Andrey Hristov [Wed, 6 Aug 2014 11:52:55 +0000 (14:52 +0300)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Andrey Hristov [Wed, 6 Aug 2014 11:52:12 +0000 (14:52 +0300)]
Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.
Stanislav Malyshev [Wed, 6 Aug 2014 04:24:55 +0000 (21:24 -0700)]
5.4.33-dev now
Stanislav Malyshev [Wed, 6 Aug 2014 04:03:35 +0000 (21:03 -0700)]
5.4.32 RC1
Michael Wallner [Tue, 5 Aug 2014 13:44:43 +0000 (15:44 +0200)]
Fixed Bug #67724
(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
Remi Collet [Mon, 4 Aug 2014 09:08:30 +0000 (11:08 +0200)]
typo
Remi Collet [Mon, 4 Aug 2014 08:46:53 +0000 (10:46 +0200)]
NEWS
Remi Collet [Mon, 4 Aug 2014 08:42:39 +0000 (10:42 +0200)]
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
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
Anatol Belski [Mon, 4 Aug 2014 07:57:08 +0000 (09:57 +0200)]
backport the fix for bug #67739
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:08 +0000 (00:08 -0700)]
add test
Stanislav Malyshev [Mon, 4 Aug 2014 07:01:57 +0000 (00:01 -0700)]
Fix bug #67705 (extensive backtracking in rule regular expression)
Johannes Schlüter [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]
PHP 5.3.29RC1
Stanislav Malyshev [Sun, 27 Jul 2014 09:40:27 +0000 (02:40 -0700)]
Fix missing type checks in various functions
Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]
Merge branch 'pull-request/754' into PHP-5.4
Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]
Bug #51096 - Remove unnecessary ? for first/last day of
Keyur Govande [Wed, 30 Jul 2014 18:33:19 +0000 (18:33 +0000)]
Update NEWS
Michael Wallner [Wed, 30 Jul 2014 18:12:13 +0000 (20:12 +0200)]
Fixed bug #67715 (php-milter does not build and crashes randomly).
Rasmus Lerdorf [Wed, 30 Jul 2014 16:22:48 +0000 (12:22 -0400)]
We need to turn off any strict mode here for this warning to show up
Tjerk Meesters [Wed, 30 Jul 2014 10:16:56 +0000 (18:16 +0800)]
Updated NEWS for #67693
Tjerk Meesters [Wed, 30 Jul 2014 09:54:09 +0000 (17:54 +0800)]
Fixed bug #67693 - incorrect push to the empty array