]>
granicus.if.org Git - php/log
Joe Watkins [Mon, 24 Jul 2017 09:42:35 +0000 (10:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update PHP 5 version to 7 in header comments
Peter Kokot [Sun, 23 Jul 2017 14:39:30 +0000 (16:39 +0200)]
Update PHP 5 version to 7 in header comments
Nikita Popov [Sun, 23 Jul 2017 10:19:56 +0000 (12:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 30 Jul 2016 14:58:43 +0000 (16:58 +0200)]
Fix #71606: Segmentation fault mb_strcut with HTML-ENTITIES
The HTML decoding filter uses the `opaque` member of mbfl_convert_filter
as buffer, but there was no copy constructor defined, what caused double
frees when the filter is copied (what happens multiple times in mb_strcut(),
for instance).
Sara Golemon [Sun, 23 Jul 2017 01:33:20 +0000 (21:33 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use compatability zend_isnan() instead of POSIX isnan()
Sara Golemon [Sun, 23 Jul 2017 01:28:43 +0000 (21:28 -0400)]
Use compatability zend_isnan() instead of POSIX isnan()
s/isnan/zend_isnan/g
Sara Golemon [Sun, 23 Jul 2017 01:23:17 +0000 (21:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix compile-time optimization of NAN comparisons
Sara Golemon [Sun, 23 Jul 2017 00:58:54 +0000 (20:58 -0400)]
Fix compile-time optimization of NAN comparisons
Anatol Belski [Sat, 22 Jul 2017 12:13:51 +0000 (14:13 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:13:25 +0000 (14:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:12:45 +0000 (14:12 +0200)]
[ci skip] update NEWS
Bob Weinand [Sat, 22 Jul 2017 09:14:54 +0000 (11:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 22 Jul 2017 09:14:00 +0000 (11:14 +0200)]
Fixed bug #74954 (null deref and segfault in zend_generator_resume())
Anatol Belski [Sat, 22 Jul 2017 08:36:31 +0000 (10:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Anatol Belski [Sat, 22 Jul 2017 08:35:26 +0000 (10:35 +0200)]
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Nikita Popov [Fri, 21 Jul 2017 21:13:44 +0000 (23:13 +0200)]
Fix DFG construction for VERIFY_RETURN
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.
The test case only breaks on PHP 7.2.
Xinchen Hui [Fri, 21 Jul 2017 10:17:12 +0000 (18:17 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 10:16:54 +0000 (18:16 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Xinchen Hui [Fri, 21 Jul 2017 10:16:37 +0000 (18:16 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Move the define into the header to reduce diff for future upgrade
Xinchen Hui [Fri, 21 Jul 2017 10:16:11 +0000 (18:16 +0800)]
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Anatol Belski [Fri, 21 Jul 2017 09:16:15 +0000 (11:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move the define into the header to reduce diff for future upgrade
Anatol Belski [Fri, 21 Jul 2017 07:12:06 +0000 (09:12 +0200)]
Move the define into the header to reduce diff for future upgrade
Xinchen Hui [Fri, 21 Jul 2017 03:58:30 +0000 (11:58 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 03:58:07 +0000 (11:58 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
Xinchen Hui [Fri, 21 Jul 2017 03:52:56 +0000 (11:52 +0800)]
Fixed bug #74947 (Segfault in scanner on INF number)
Anatol Belski [Thu, 20 Jul 2017 20:07:32 +0000 (22:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increment sdk version
Anatol Belski [Thu, 20 Jul 2017 20:06:34 +0000 (22:06 +0200)]
increment sdk version
Anatol Belski [Thu, 20 Jul 2017 18:39:36 +0000 (20:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove another cygwin instance in AppVeyor run
Anatol Belski [Thu, 20 Jul 2017 18:39:04 +0000 (20:39 +0200)]
remove another cygwin instance in AppVeyor run
Anatol Belski [Wed, 19 Jul 2017 20:41:32 +0000 (22:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix dir separator in test
Anatol Belski [Wed, 19 Jul 2017 20:41:09 +0000 (22:41 +0200)]
fix dir separator in test
Sara Golemon [Wed, 19 Jul 2017 18:01:00 +0000 (14:01 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Do not allow using traits/interfaces/abstract classes as stream wrappers
Sara Golemon [Wed, 19 Jul 2017 16:29:05 +0000 (12:29 -0400)]
Do not allow using traits/interfaces/abstract classes as stream wrappers
Fixes https://bugs.php.net/bug.php?id=74951
Lior Kaplan [Wed, 19 Jul 2017 14:26:38 +0000 (17:26 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add oci8_failover.c to config.w32, follow up for commit
1b797f7a
Lior Kaplan [Wed, 19 Jul 2017 14:23:22 +0000 (17:23 +0300)]
Add oci8_failover.c to config.w32, follow up for commit
1b797f7a
Dmitry Stogov [Wed, 19 Jul 2017 12:36:24 +0000 (15:36 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Reset globals on startup or restart
Dmitry Stogov [Wed, 19 Jul 2017 12:35:10 +0000 (15:35 +0300)]
Reset globals on startup or restart
Nikita Popov [Tue, 18 Jul 2017 20:15:20 +0000 (22:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
andrewnester [Tue, 6 Jun 2017 06:37:05 +0000 (09:37 +0300)]
Fixed #74699 - Broken ArrayIterator unserializing
Nikita Popov [Tue, 18 Jul 2017 19:45:35 +0000 (21:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
YaoGuai [Sun, 16 Jul 2017 07:12:29 +0000 (15:12 +0800)]
Fix check of mysql_commit() return value
For mysql_commit() everything non-zero is an error.
Andrew Nester [Tue, 11 Jul 2017 18:50:38 +0000 (21:50 +0300)]
Fixed #74892 - Fixed URL rewriting for urls started with #
Joe Watkins [Tue, 18 Jul 2017 16:21:19 +0000 (17:21 +0100)]
bump versions
Anatol Belski [Tue, 18 Jul 2017 10:09:58 +0000 (12:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Exclude ext/ftp from AppVeyor test run
Anatol Belski [Tue, 18 Jul 2017 10:08:31 +0000 (12:08 +0200)]
Exclude ext/ftp from AppVeyor test run
as the tests depend on fork() and otherwise an extra setup would be
needed anyway.
Anatol Belski [Tue, 18 Jul 2017 08:26:10 +0000 (10:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move to 7.0.23 for dev
Anatol Belski [Tue, 18 Jul 2017 08:25:40 +0000 (10:25 +0200)]
move to 7.0.23 for dev
Anatol Belski [Mon, 17 Jul 2017 17:40:31 +0000 (19:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix missing var for phpize
Anatol Belski [Mon, 17 Jul 2017 04:54:27 +0000 (06:54 +0200)]
fix missing var for phpize
(cherry picked from commit
36c3d7140753bb692e36f5dcef7db7aa76224751 )
Joe Watkins [Mon, 17 Jul 2017 05:54:46 +0000 (06:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
Peter Kokot [Tue, 11 Jul 2017 22:41:43 +0000 (00:41 +0200)]
Fixed bug #74906 redirecting incorrect include <sys/errno.h>
Joe Watkins [Mon, 17 Jul 2017 05:51:26 +0000 (06:51 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
Peter Kokot [Wed, 12 Jul 2017 19:23:41 +0000 (21:23 +0200)]
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
Anatol Belski [Sat, 15 Jul 2017 09:30:56 +0000 (11:30 +0200)]
Add test for bug #74923
Anatol Belski [Fri, 14 Jul 2017 19:07:48 +0000 (21:07 +0200)]
update NEWS
Anatol Belski [Fri, 14 Jul 2017 11:23:24 +0000 (13:23 +0200)]
Fixed bug #74923 Crash when crawling through network share
Christopher Jones [Fri, 14 Jul 2017 04:13:33 +0000 (14:13 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Fri, 14 Jul 2017 04:13:08 +0000 (14:13 +1000)]
Bump OCI8 version for recent patch
Anatol Belski [Wed, 12 Jul 2017 13:40:00 +0000 (15:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Guard against AppVeyor losing deps issue
Anatol Belski [Wed, 12 Jul 2017 13:26:30 +0000 (15:26 +0200)]
Guard against AppVeyor losing deps issue
Possibly due to concurrent build cache updates or some changes in
the remote image. Some locking mechanism still could be required.
Anatol Belski [Wed, 12 Jul 2017 12:49:58 +0000 (14:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase poll timeout as false positives mitigation
Anatol Belski [Wed, 12 Jul 2017 12:38:12 +0000 (14:38 +0200)]
increase poll timeout as false positives mitigation
Anatol Belski [Mon, 10 Jul 2017 20:50:34 +0000 (22:50 +0200)]
update NEWS
Anatol Belski [Mon, 10 Jul 2017 20:50:20 +0000 (22:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 10 Jul 2017 20:49:55 +0000 (22:49 +0200)]
update NEWS
Anatol Belski [Mon, 10 Jul 2017 19:45:43 +0000 (21:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
switch to next binary tools sdk version
Anatol Belski [Mon, 10 Jul 2017 19:44:43 +0000 (21:44 +0200)]
switch to next binary tools sdk version
Anatol Belski [Mon, 10 Jul 2017 15:01:25 +0000 (17:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Add more constants, improve comments, and add tests"
Anatol Belski [Mon, 10 Jul 2017 14:53:56 +0000 (16:53 +0200)]
Revert "Add more constants, improve comments, and add tests"
This reverts commit
0c4f11ecaad213483f98c39128e217f9b389f604 .
Anatol Belski [Mon, 10 Jul 2017 11:49:44 +0000 (13:49 +0200)]
improve test
Joe Watkins [Mon, 10 Jul 2017 05:55:53 +0000 (06:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
#73594 tests only check the extra params if dns_get_record is successful
Pedro Magalhães [Sun, 9 Jul 2017 14:02:27 +0000 (16:02 +0200)]
#73594 tests only check the extra params if dns_get_record is successful
Joe Watkins [Mon, 10 Jul 2017 05:53:43 +0000 (06:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74852 (property_exists returns true on unknown DateInterval property)
jhdxr [Sat, 8 Jul 2017 12:04:25 +0000 (20:04 +0800)]
Fixed bug #74852 (property_exists returns true on unknown DateInterval property)
Anatol Belski [Sun, 9 Jul 2017 13:02:40 +0000 (15:02 +0200)]
[ci skip] update NEWS
Anatol Belski [Sun, 9 Jul 2017 13:02:03 +0000 (15:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Sun, 9 Jul 2017 13:01:37 +0000 (15:01 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 8 Jul 2017 23:31:25 +0000 (01:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags
Anatol Belski [Sat, 8 Jul 2017 21:52:22 +0000 (23:52 +0200)]
Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags
Anatol Belski [Sat, 8 Jul 2017 11:42:10 +0000 (13:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs versions
Anatol Belski [Sat, 8 Jul 2017 11:41:50 +0000 (13:41 +0200)]
update libs versions
Christopher Jones [Fri, 7 Jul 2017 02:14:57 +0000 (12:14 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Fri, 7 Jul 2017 02:14:12 +0000 (12:14 +1000)]
Fix NEWS entry location
Christopher Jones [Fri, 7 Jul 2017 02:13:21 +0000 (12:13 +1000)]
Fix NEWS entry location
Joe Watkins [Thu, 6 Jul 2017 08:33:07 +0000 (09:33 +0100)]
news entry for 74819
Joe Watkins [Thu, 6 Jul 2017 07:20:21 +0000 (08:20 +0100)]
news entry for 74651
Joe Watkins [Thu, 6 Jul 2017 07:06:11 +0000 (08:06 +0100)]
news entry for 74111
Joe Watkins [Thu, 6 Jul 2017 07:03:17 +0000 (08:03 +0100)]
news entry for 74435
Joe Watkins [Thu, 6 Jul 2017 07:02:00 +0000 (08:02 +0100)]
news entry for 74603
Ferenc Kovacs [Wed, 5 Jul 2017 22:13:24 +0000 (00:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 5 Jul 2017 22:12:05 +0000 (00:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 5 Jul 2017 22:10:07 +0000 (00:10 +0200)]
add missing NEWS entry for #74087 and also fix the formatting
Ferenc Kovacs [Wed, 5 Jul 2017 22:05:14 +0000 (00:05 +0200)]
move NEWS entry to the correct place, also bump the version
Anatol Belski [Wed, 5 Jul 2017 10:32:52 +0000 (12:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] sync NEWS
Anatol Belski [Wed, 5 Jul 2017 10:31:21 +0000 (12:31 +0200)]
[ci skip] sync NEWS
Remi Collet [Wed, 5 Jul 2017 08:02:42 +0000 (10:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS for oniguruma
Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
Remi Collet [Wed, 5 Jul 2017 08:02:21 +0000 (10:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
NEWS for oniguruma
Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
Remi Collet [Wed, 5 Jul 2017 07:26:55 +0000 (09:26 +0200)]
NEWS for oniguruma
Remi Collet [Tue, 30 May 2017 13:40:32 +0000 (15:40 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Remi Collet [Tue, 30 May 2017 13:39:21 +0000 (15:39 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>