]>
granicus.if.org Git - php/log
Derick Rethans [Sat, 21 Mar 2015 13:51:10 +0000 (14:51 +0100)]
Empty merge
Derick Rethans [Sat, 21 Mar 2015 13:51:09 +0000 (14:51 +0100)]
- Updated to version 2015.2 (2015b)
Ferenc Kovacs [Fri, 20 Mar 2015 13:40:58 +0000 (14:40 +0100)]
this already had an entry
Ferenc Kovacs [Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add pear to the travis build
Ferenc Kovacs [Fri, 20 Mar 2015 12:34:16 +0000 (13:34 +0100)]
add pear to the travis build
Julien Pauli [Fri, 20 Mar 2015 09:53:33 +0000 (10:53 +0100)]
Updated NEWS
Julien Pauli [Fri, 20 Mar 2015 09:45:54 +0000 (10:45 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Fri, 20 Mar 2015 09:45:36 +0000 (10:45 +0100)]
Updated NEWS
Stanislav Malyshev [Fri, 20 Mar 2015 06:05:49 +0000 (23:05 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add CVEs
Stanislav Malyshev [Fri, 20 Mar 2015 06:05:34 +0000 (23:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVEs
Stanislav Malyshev [Fri, 20 Mar 2015 05:53:29 +0000 (22:53 -0700)]
add CVEs
Lior Kaplan [Thu, 19 Mar 2015 16:25:01 +0000 (18:25 +0200)]
Add CVE ID for #68735
Lior Kaplan [Thu, 19 Mar 2015 16:24:28 +0000 (18:24 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add CVE ID for #68735
Lior Kaplan [Thu, 19 Mar 2015 16:23:34 +0000 (18:23 +0200)]
Add CVE ID for #68735
Dmitry Stogov [Thu, 19 Mar 2015 08:48:10 +0000 (11:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69152
Dmitry Stogov [Thu, 19 Mar 2015 08:42:49 +0000 (11:42 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #69152
Dmitry Stogov [Thu, 19 Mar 2015 08:36:01 +0000 (11:36 +0300)]
Fixed bug #69152
Lior Kaplan [Thu, 19 Mar 2015 00:44:45 +0000 (02:44 +0200)]
Add CVE to bug #69253
Lior Kaplan [Thu, 19 Mar 2015 00:42:35 +0000 (02:42 +0200)]
Align entries format
Lior Kaplan [Thu, 19 Mar 2015 00:40:22 +0000 (02:40 +0200)]
Add CVE assigned to 5.6.6 bugs after the release
Lior Kaplan [Thu, 19 Mar 2015 00:37:50 +0000 (02:37 +0200)]
Add CVE to bug #69248
Lior Kaplan [Thu, 19 Mar 2015 00:36:28 +0000 (02:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Align entries format
Add CVE to bug #69248
Add CVE assigned to 5.5.22 bugs after the release
Lior Kaplan [Thu, 19 Mar 2015 00:35:20 +0000 (02:35 +0200)]
Align entries format
Lior Kaplan [Thu, 19 Mar 2015 00:30:31 +0000 (02:30 +0200)]
Add CVE to bug #69248
Lior Kaplan [Thu, 19 Mar 2015 00:29:43 +0000 (02:29 +0200)]
Add CVE assigned to 5.5.22 bugs after the release
Julien Pauli [Wed, 18 Mar 2015 10:34:56 +0000 (11:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 18 Mar 2015 10:34:45 +0000 (11:34 +0100)]
Updated NEWS
Julien Pauli [Wed, 18 Mar 2015 09:55:49 +0000 (10:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 18 Mar 2015 09:55:32 +0000 (10:55 +0100)]
Updated NEWS
Stanislav Malyshev [Wed, 18 Mar 2015 05:39:21 +0000 (22:39 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.40 next
Stanislav Malyshev [Wed, 18 Mar 2015 05:39:10 +0000 (22:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.40 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 18 Mar 2015 05:37:16 +0000 (22:37 -0700)]
5.4.40 next
Stanislav Malyshev [Wed, 18 Mar 2015 05:02:57 +0000 (22:02 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Conflicts:
ext/zip/lib/zip_dirent.c
Stanislav Malyshev [Wed, 18 Mar 2015 05:00:53 +0000 (22:00 -0700)]
update NEWS
Stanislav Malyshev [Wed, 18 Mar 2015 05:00:29 +0000 (22:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Stanislav Malyshev [Wed, 18 Mar 2015 04:59:56 +0000 (21:59 -0700)]
Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
Stanislav Malyshev [Wed, 18 Mar 2015 00:13:50 +0000 (17:13 -0700)]
oops, no idea how this got in
Stanislav Malyshev [Wed, 18 Mar 2015 00:10:14 +0000 (17:10 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Stanislav Malyshev [Wed, 18 Mar 2015 00:07:38 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
Stanislav Malyshev [Wed, 18 Mar 2015 00:08:28 +0000 (17:08 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
Stanislav Malyshev [Wed, 18 Mar 2015 00:07:38 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
Stanislav Malyshev [Wed, 18 Mar 2015 00:04:57 +0000 (17:04 -0700)]
Fix bug #69248 - heap overflow vulnerability in regcomp.c
Merged from https://github.com/garyhouston/regex/commit/
70bc2965604b6b8aaf260049e64c708dddf85334
Stanislav Malyshev [Wed, 18 Mar 2015 00:03:46 +0000 (17:03 -0700)]
add test for bug #68976
Stanislav Malyshev [Tue, 17 Mar 2015 20:24:30 +0000 (13:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add NEWS
Stanislav Malyshev [Tue, 17 Mar 2015 20:24:17 +0000 (13:24 -0700)]
add NEWS
Stanislav Malyshev [Tue, 17 Mar 2015 20:23:51 +0000 (13:23 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
Stanislav Malyshev [Tue, 17 Mar 2015 20:22:12 +0000 (13:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
Stanislav Malyshev [Tue, 17 Mar 2015 20:20:22 +0000 (13:20 -0700)]
Fixed bug #68976 - Use After Free Vulnerability in unserialize()
Stanislav Malyshev [Tue, 17 Mar 2015 20:07:59 +0000 (13:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
Stanislav Malyshev [Tue, 17 Mar 2015 20:07:40 +0000 (13:07 -0700)]
update news
Stanislav Malyshev [Tue, 17 Mar 2015 20:06:17 +0000 (13:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
Stanislav Malyshev [Tue, 17 Mar 2015 20:04:36 +0000 (13:04 -0700)]
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
Stanislav Malyshev [Tue, 17 Mar 2015 19:58:00 +0000 (12:58 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix tests
Fix bug #69207 - move_uploaded_file allows nulls in path
Stanislav Malyshev [Tue, 17 Mar 2015 19:56:37 +0000 (12:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix tests
Stanislav Malyshev [Fri, 6 Feb 2015 05:54:47 +0000 (21:54 -0800)]
fix tests
Stanislav Malyshev [Tue, 17 Mar 2015 19:48:37 +0000 (12:48 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69207 - move_uploaded_file allows nulls in path
Stanislav Malyshev [Tue, 17 Mar 2015 19:47:58 +0000 (12:47 -0700)]
Fix bug #69207 - move_uploaded_file allows nulls in path
Anatol Belski [Tue, 17 Mar 2015 08:21:38 +0000 (09:21 +0100)]
updated NEWS
Anatol Belski [Tue, 17 Mar 2015 08:20:54 +0000 (09:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
Anatol Belski [Tue, 17 Mar 2015 08:20:16 +0000 (09:20 +0100)]
Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
Julien Pauli [Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix flaws in session module
Julien Pauli [Mon, 16 Mar 2015 15:00:46 +0000 (16:00 +0100)]
Fix flaws in session module
Anatol Belski [Mon, 16 Mar 2015 07:34:14 +0000 (08:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport
af2b0669 into 5.5
Anatol Belski [Mon, 16 Mar 2015 07:32:39 +0000 (08:32 +0100)]
backport
af2b0669 into 5.5
Anatol Belski [Sun, 15 Mar 2015 17:38:50 +0000 (18:38 +0100)]
libxml-2.9.2 compatibility
Anatol Belski [Sat, 14 Mar 2015 17:30:32 +0000 (18:30 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Anatol Belski [Sat, 14 Mar 2015 17:29:59 +0000 (18:29 +0100)]
fix test
Nikita Popov [Sat, 14 Mar 2015 08:18:03 +0000 (09:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Jeff Welch [Mon, 9 Mar 2015 11:14:22 +0000 (07:14 -0400)]
Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127
Xinchen Hui [Sat, 14 Mar 2015 03:31:53 +0000 (11:31 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sat, 14 Mar 2015 03:31:12 +0000 (11:31 +0800)]
Fixed typo
Xinchen Hui [Fri, 13 Mar 2015 16:53:51 +0000 (00:53 +0800)]
Update NEWS
Xinchen Hui [Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 13 Mar 2015 16:52:53 +0000 (00:52 +0800)]
Little improvement, update NEWs, added test
Xinchen Hui [Fri, 13 Mar 2015 16:42:36 +0000 (00:42 +0800)]
Merge branch 'bug69227' of https://github.com/Vektah/php-src into PHP-5.5
Nikita Popov [Fri, 13 Mar 2015 15:24:57 +0000 (16:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Wed, 11 Mar 2015 17:08:03 +0000 (18:08 +0100)]
Fixed bug #69221
A generator iterator can be created from different zvals - use
the object handle to manage references instead.
Vektah [Fri, 13 Mar 2015 04:54:30 +0000 (15:54 +1100)]
Fix a leak
Vektah [Fri, 13 Mar 2015 02:15:57 +0000 (13:15 +1100)]
Fix bug #69227 and #65967
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
Anatol Belski [Thu, 12 Mar 2015 14:21:33 +0000 (15:21 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create the php prefix if doesn't exist
Anatol Belski [Thu, 12 Mar 2015 14:20:53 +0000 (15:20 +0100)]
create the php prefix if doesn't exist
Daniel Lowrey [Wed, 11 Mar 2015 15:44:07 +0000 (09:44 -0600)]
Don't block on crypto data inside stream_select()
Xinchen Hui [Wed, 11 Mar 2015 00:20:03 +0000 (08:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 11 Mar 2015 00:19:34 +0000 (08:19 +0800)]
Improve test script for #69212
Daniel Lowrey [Wed, 11 Mar 2015 00:06:00 +0000 (18:06 -0600)]
Fix bug# 69215 (Crypto servers should send client CA list)
Nikita Popov [Tue, 10 Mar 2015 17:18:43 +0000 (18:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Tue, 10 Mar 2015 17:17:56 +0000 (18:17 +0100)]
Fixed bug #69212
Dmitry Stogov [Tue, 10 Mar 2015 16:30:32 +0000 (19:30 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
We don't cache custom strems with callbacks anymore
Dmitry Stogov [Tue, 10 Mar 2015 16:25:30 +0000 (19:25 +0300)]
We don't cache custom strems with callbacks anymore
Xinchen Hui [Tue, 10 Mar 2015 09:18:47 +0000 (17:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 09:18:39 +0000 (17:18 +0800)]
Typo
Xinchen Hui [Tue, 10 Mar 2015 09:06:05 +0000 (17:06 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 09:05:47 +0000 (17:05 +0800)]
Fixed test
Xinchen Hui [Tue, 10 Mar 2015 07:38:34 +0000 (15:38 +0800)]
Update NEWS
Xinchen Hui [Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 07:36:42 +0000 (15:36 +0800)]
Fixed bug #66609 (php crashes with __get() and ++ operator in some cases)
Xinchen Hui [Tue, 10 Mar 2015 02:44:07 +0000 (10:44 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 02:43:05 +0000 (10:43 +0800)]
Fix is reverted (test fails in all branches)
Daniel Lowrey [Mon, 9 Mar 2015 21:55:33 +0000 (15:55 -0600)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix crypto stream timeout regressions
Daniel Lowrey [Mon, 9 Mar 2015 21:53:26 +0000 (15:53 -0600)]
Fix crypto stream timeout regressions
projects / php / log