]>
granicus.if.org Git - php/log
Stanislav Malyshev [Wed, 14 May 2014 00:14:06 +0000 (17:14 -0700)]
enable email notifications
[skip ci]
Stanislav Malyshev [Wed, 14 May 2014 00:08:06 +0000 (17:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:07:51 +0000 (17:07 -0700)]
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:07:35 +0000 (17:07 -0700)]
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:02:09 +0000 (17:02 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
Stanislav Malyshev [Tue, 13 May 2014 23:52:17 +0000 (16:52 -0700)]
Merge branch 'bug67251' into PHP-5.4
* bug67251:
Fix bug #67251 - date_parse_from_format out-of-bounds read
Conflicts:
ext/date/lib/parse_date.c
Stanislav Malyshev [Tue, 13 May 2014 23:44:24 +0000 (16:44 -0700)]
Merge branch 'bug67252' into PHP-5.4
* bug67252:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Stanislav Malyshev [Tue, 13 May 2014 23:42:23 +0000 (16:42 -0700)]
Merge branch 'bug67250' into PHP-5.4
* bug67250:
Fix bug #67250 (iptcparse out-of-bounds read)
Derick Rethans [Tue, 13 May 2014 15:36:59 +0000 (16:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Tue, 13 May 2014 15:36:58 +0000 (16:36 +0100)]
- Updated to version 2014.3 (2014c)
Stanislav Malyshev [Mon, 12 May 2014 17:54:34 +0000 (10:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test - output can be chunked
Stanislav Malyshev [Mon, 12 May 2014 17:53:45 +0000 (10:53 -0700)]
fix test - output can be chunked
Stanislav Malyshev [Mon, 12 May 2014 05:21:57 +0000 (22:21 -0700)]
improve CURL tests to allow testing without separate server
Stanislav Malyshev [Mon, 12 May 2014 04:09:11 +0000 (21:09 -0700)]
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 03:29:27 +0000 (20:29 -0700)]
Fix bug #67252: convert_uudecode out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 02:34:21 +0000 (19:34 -0700)]
Fix bug #67251 - date_parse_from_format out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 02:09:19 +0000 (19:09 -0700)]
Fix bug #67250 (iptcparse out-of-bounds read)
Stanislav Malyshev [Mon, 12 May 2014 01:15:29 +0000 (18:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
Stanislav Malyshev [Mon, 12 May 2014 01:14:57 +0000 (18:14 -0700)]
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Stanislav Malyshev [Mon, 12 May 2014 00:54:27 +0000 (17:54 -0700)]
Fix bug #67247 spl_fixedarray_resize integer overflow
Stanislav Malyshev [Mon, 12 May 2014 00:43:28 +0000 (17:43 -0700)]
fix news
Stanislav Malyshev [Fri, 9 May 2014 20:28:39 +0000 (13:28 -0700)]
add tests stuff to README
Bob Weinand [Sun, 11 May 2014 13:15:27 +0000 (15:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 11 May 2014 13:13:40 +0000 (15:13 +0200)]
Updated NEWS
Bob Weinand [Sun, 11 May 2014 13:11:03 +0000 (15:11 +0200)]
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)
Linux apparently does not like memcpy in overlapping regions...
Felipe Pena [Sun, 11 May 2014 12:46:25 +0000 (09:46 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Felipe Pena [Sun, 11 May 2014 12:45:17 +0000 (09:45 -0300)]
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Felipe Pena [Sat, 10 May 2014 14:55:45 +0000 (11:55 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Move checking
Felipe Pena [Sat, 10 May 2014 14:55:42 +0000 (11:55 -0300)]
- Move checking
Felipe Pena [Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed missing NULL check in SimpleXMLElement::xpath()
Felipe Pena [Sat, 10 May 2014 14:53:40 +0000 (11:53 -0300)]
- Fixed missing NULL check in SimpleXMLElement::xpath()
Felipe Pena [Sat, 10 May 2014 14:39:28 +0000 (11:39 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed missing NULL check
Felipe Pena [Sat, 10 May 2014 14:39:08 +0000 (11:39 -0300)]
- Fixed missing NULL check
Anatol Belski [Fri, 9 May 2014 20:15:54 +0000 (22:15 +0200)]
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
upstream patch applied
Stanislav Malyshev [Thu, 8 May 2014 09:00:23 +0000 (02:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
oops, 5.4 and 5.5 use malloc in TSRM
Stanislav Malyshev [Thu, 8 May 2014 08:59:39 +0000 (01:59 -0700)]
oops, 5.4 and 5.5 use malloc in TSRM
Stanislav Malyshev [Thu, 8 May 2014 08:08:55 +0000 (01:08 -0700)]
make release tags not fail Travis CI
Stanislav Malyshev [Thu, 8 May 2014 08:00:51 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix memory leak in TSRM
Stanislav Malyshev [Wed, 7 May 2014 20:28:03 +0000 (13:28 -0700)]
Fix memory leak in TSRM
Ferenc Kovacs [Tue, 6 May 2014 22:55:05 +0000 (00:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed test (it requires ext/hash)
Dmitry Stogov [Thu, 10 Apr 2014 08:14:11 +0000 (12:14 +0400)]
Fixed test (it requires ext/hash)
Ferenc Kovacs [Tue, 6 May 2014 22:38:32 +0000 (00:38 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
Dmitry Stogov [Fri, 11 Apr 2014 08:43:35 +0000 (12:43 +0400)]
Fixed tests (they might fail from time to time because of session GC)
Ferenc Kovacs [Sat, 3 May 2014 00:50:37 +0000 (02:50 +0200)]
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.
Adam Harvey [Fri, 2 May 2014 17:23:09 +0000 (10:23 -0700)]
Fix author name on the #63228 patch.
Ferenc Kovacs [Fri, 2 May 2014 07:49:10 +0000 (09:49 +0200)]
Revert "show leaks in their own group"
using valgrind would be a bit too much for travis I guess.
This reverts commit
ea60d79e23556deb0f72cf4111deefa0d9a55262 .
Ferenc Kovacs [Fri, 2 May 2014 07:32:42 +0000 (09:32 +0200)]
show leaks in their own group
Adam Harvey [Thu, 1 May 2014 18:22:46 +0000 (11:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Use the right path for the suggested PHP invocation in ext_skel.
Adam Harvey [Thu, 1 May 2014 18:21:34 +0000 (11:21 -0700)]
Use the right path for the suggested PHP invocation in ext_skel.
Fixes bug #67160 (ext_skel outputs incorrect information).
Ferenc Kovacs [Thu, 1 May 2014 08:54:15 +0000 (10:54 +0200)]
5.5.12 was released yesterday
Ferenc Kovacs [Thu, 1 May 2014 08:52:24 +0000 (10:52 +0200)]
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:52:13 +0000 (10:52 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing NEWS entry to the correct release where it was added
Ferenc Kovacs [Thu, 1 May 2014 08:50:08 +0000 (10:50 +0200)]
add missing NEWS entry to the correct release where it was added
Michael Wallner [Wed, 30 Apr 2014 11:01:59 +0000 (13:01 +0200)]
fix test locality inconsitency
Michael Wallner [Wed, 30 Apr 2014 07:26:50 +0000 (09:26 +0200)]
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Ferenc Kovacs [Tue, 29 Apr 2014 21:34:10 +0000 (23:34 +0200)]
Merge remote-tracking branch 'tyrael/more_travis' into PHP-5.5
* tyrael/more_travis:
separate travis jobs for debug and non-debug builds
separate travis jobs for TS and NTS builds
put this test back to XFAIL, as it was before, since it is still leaking memory
Stanislav Malyshev [Tue, 29 Apr 2014 16:14:40 +0000 (09:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Tue, 15 Apr 2014 17:43:24 +0000 (10:43 -0700)]
Fix bug #67060: use default mode of 660
Ferenc Kovacs [Mon, 28 Apr 2014 06:31:02 +0000 (08:31 +0200)]
separate travis jobs for debug and non-debug builds
Ferenc Kovacs [Sun, 27 Apr 2014 15:52:59 +0000 (17:52 +0200)]
separate travis jobs for TS and NTS builds
Ferenc Kovacs [Sun, 27 Apr 2014 20:23:43 +0000 (22:23 +0200)]
put this test back to XFAIL, as it was before, since it is still leaking memory
Anatol Belski [Tue, 29 Apr 2014 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
Anatol Belski [Tue, 29 Apr 2014 11:44:54 +0000 (13:44 +0200)]
updated NEWS
Anatol Belski [Tue, 29 Apr 2014 11:40:44 +0000 (13:40 +0200)]
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
Popa Adrian Marius [Mon, 28 Apr 2014 09:15:53 +0000 (12:15 +0300)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src:
enable gmp for tests
Popa Adrian Marius [Mon, 28 Apr 2014 09:13:44 +0000 (12:13 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Cleanup ZEND_MODULE_API_NO =>
20050922
Popa Adrian Marius [Mon, 28 Apr 2014 09:13:11 +0000 (12:13 +0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Cleanup ZEND_MODULE_API_NO =>
20050922
Popa Adrian Marius [Mon, 28 Apr 2014 09:12:52 +0000 (12:12 +0300)]
Cleanup ZEND_MODULE_API_NO =>
20050922
Stanislav Malyshev [Mon, 28 Apr 2014 07:55:51 +0000 (00:55 -0700)]
enable gmp for tests
Anatol Belski [Fri, 25 Apr 2014 15:40:19 +0000 (17:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed test
Anatol Belski [Fri, 25 Apr 2014 15:39:53 +0000 (17:39 +0200)]
fixed test
Anatol Belski [Fri, 25 Apr 2014 15:25:37 +0000 (17:25 +0200)]
updated NEWS
Anatol Belski [Fri, 25 Apr 2014 15:24:58 +0000 (17:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data
Anatol Belski [Fri, 25 Apr 2014 15:23:26 +0000 (17:23 +0200)]
Fixed bug #67118 DateTime constructor crash with invalid data
Stanislav Malyshev [Fri, 25 Apr 2014 07:00:01 +0000 (00:00 -0700)]
update NEWS
Stanislav Malyshev [Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
Stanislav Malyshev [Fri, 25 Apr 2014 06:58:38 +0000 (23:58 -0700)]
add a test case previously broken by a bad fix
Stanislav Malyshev [Fri, 25 Apr 2014 06:49:52 +0000 (23:49 -0700)]
Revert "Fixed bug #64604"
This reverts commit
b05c088a3abf8e4c6fb6e40418423a9e2dd3d929 .
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
Anatol Belski [Thu, 24 Apr 2014 18:13:47 +0000 (20:13 +0200)]
updated libmagic.patch
Anatol Belski [Thu, 24 Apr 2014 17:50:23 +0000 (19:50 +0200)]
backport this piece from 5.6, related to the #66307 fix
Anatol Belski [Thu, 24 Apr 2014 17:30:34 +0000 (19:30 +0200)]
Fixed bug #66307 Fileinfo crashes with powerpoint files
Anatol Belski [Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix dll export
Anatol Belski [Thu, 24 Apr 2014 08:51:42 +0000 (10:51 +0200)]
fix dll export
Stanislav Malyshev [Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Jakub Zelenka [Mon, 21 Apr 2014 12:02:20 +0000 (13:02 +0100)]
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Stanislav Malyshev [Mon, 21 Apr 2014 00:22:08 +0000 (17:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Conflicts:
ext/phar/phar_path_check.c
Danack [Thu, 13 Feb 2014 14:48:51 +0000 (14:48 +0000)]
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Stanislav Malyshev [Sun, 20 Apr 2014 23:35:49 +0000 (16:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix a compiler warning in php_rand.h
Rouven Weßling [Mon, 24 Feb 2014 13:45:42 +0000 (14:45 +0100)]
Fix a compiler warning in php_rand.h
Stanislav Malyshev [Sun, 20 Apr 2014 23:22:31 +0000 (16:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor
Julio Pintos [Fri, 14 Mar 2014 19:47:30 +0000 (16:47 -0300)]
Fix #66908: php-fpm reload leaks epoll_create() file descriptor
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
Stanislav Malyshev [Sun, 20 Apr 2014 22:24:14 +0000 (15:24 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65701: Do not use cache for file file copy
Boro Sitnikovski [Mon, 14 Apr 2014 08:02:11 +0000 (10:02 +0200)]
Fix bug #65701: Do not use cache for file file copy
Anatol Belski [Fri, 18 Apr 2014 13:50:15 +0000 (15:50 +0200)]
UPGRADING note about bug #67072
Anatol Belski [Fri, 18 Apr 2014 13:44:18 +0000 (15:44 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
UPGRADING note about bug #67072
Anatol Belski [Fri, 18 Apr 2014 13:43:05 +0000 (15:43 +0200)]
UPGRADING note about bug #67072
Anatol Belski [Fri, 18 Apr 2014 13:16:09 +0000 (15:16 +0200)]
refixed the test related to bug #67072
Anatol Belski [Fri, 18 Apr 2014 13:14:42 +0000 (15:14 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Improved the fix for bug #67072, thanks Nikita
Anatol Belski [Fri, 18 Apr 2014 13:13:32 +0000 (15:13 +0200)]
Improved the fix for bug #67072, thanks Nikita