]>
granicus.if.org Git - php/log
Kalle Sommer Nielsen [Sat, 30 Jul 2016 15:55:20 +0000 (17:55 +0200)]
Fix opcache build
Kalle Sommer Nielsen [Sat, 30 Jul 2016 15:52:57 +0000 (17:52 +0200)]
Fix ext/standard build with the recent fixes to array.c
This solution might not be canon, but it works by re-using _php_math_round() from math.c, since round() is not available
in the C++98 Standard Library on Windows at least. At the same
time it seems like the symbol export for it was missing from
php_math.h.
Kalle Sommer Nielsen [Sat, 30 Jul 2016 15:32:53 +0000 (17:32 +0200)]
Also fix TSRM on Windows
Kalle Sommer Nielsen [Sat, 30 Jul 2016 15:30:49 +0000 (17:30 +0200)]
Fix build on Windows
Nikita Popov [Sat, 30 Jul 2016 14:29:41 +0000 (16:29 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 30 Jul 2016 14:29:33 +0000 (16:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 30 Jul 2016 14:29:10 +0000 (16:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/wddx/wddx.c
Nikita Popov [Sat, 30 Jul 2016 14:28:42 +0000 (16:28 +0200)]
Add missing TSRMLS_FETCH()
Nikita Popov [Sat, 30 Jul 2016 14:08:44 +0000 (16:08 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 30 Jul 2016 14:08:30 +0000 (16:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 30 Jul 2016 14:07:54 +0000 (16:07 +0200)]
Fix incorrect merge
Forgot to amend the merge fixes...
Nikita Popov [Sat, 30 Jul 2016 13:55:10 +0000 (15:55 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 30 Jul 2016 13:54:20 +0000 (15:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 30 Jul 2016 13:51:23 +0000 (15:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 13:10:54 +0000 (15:10 +0200)]
Fixed bug #72142
Christoph M. Becker [Sat, 30 Jul 2016 10:16:49 +0000 (12:16 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 30 Jul 2016 10:02:56 +0000 (12:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 30 Jul 2016 09:49:19 +0000 (11:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
ju1ius [Sat, 30 Jul 2016 04:08:25 +0000 (06:08 +0200)]
fixes bad address given to onig_error_code_to_str
Closes bug #72710
(cherry picked from commit
0fb7eb6723bcc6fd98053911543e801edb5ab763 )
Nikita Popov [Fri, 29 Jul 2016 22:38:10 +0000 (00:38 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 29 Jul 2016 22:36:06 +0000 (00:36 +0200)]
Fix invalid free on undef const in update_const()
Also clean up the control flow a bit -- move all unqualified
constant handling in one branch.
Nikita Popov [Fri, 29 Jul 2016 22:15:50 +0000 (00:15 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 29 Jul 2016 16:51:06 +0000 (18:51 +0200)]
Fix memory unsafety in array_walk()
Fixes bugs #61967, #62607, #69068, #70713.
The primary changes are:
a) Use the ht_iterator mechanism to ensure safety not only if the
iterated array itself changes, but also if it is replaced (and
potentially destroyed) entirely. We use the same semantics for
behavior under modification as foreach-by-reference. In
particular, we advance to the next element before processing it.
If the iterated entity is exchanged we iterate the new one from
the start. If it is not an array/object we warn and abort.
b) Always create a reference to the current value. Previously the
code kept the value as a non-reference and updated it to the
reference value produced by the user callback. However this is
unsafe, as the array may have been reallocated in the meantime,
so the previous value pointer is no longer value.
c) Around a recursive walk, incref the reference containing the
array. This ensures that the location where the currently
iterated value is stored cannot be freed.
One problem I was not able to solve is that we cannot decrement
the apply count if the array is exchanged during a recursive walk.
Nikita Popov [Fri, 29 Jul 2016 17:08:23 +0000 (19:08 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 29 Jul 2016 17:08:15 +0000 (19:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 29 Jul 2016 17:07:04 +0000 (19:07 +0200)]
Fix ref handling in array_merge/replace_recursive()
As usual, if the reference has rc=1 it really isn't a reference.
Anatol Belski [Fri, 29 Jul 2016 15:34:20 +0000 (17:34 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
add test for bug #72701
Anatol Belski [Fri, 29 Jul 2016 15:33:40 +0000 (17:33 +0200)]
update NEWS
Anatol Belski [Fri, 29 Jul 2016 15:23:39 +0000 (17:23 +0200)]
add test for bug #72701
Anatol Belski [Fri, 29 Jul 2016 15:02:24 +0000 (17:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72701 mysqli_get_host_info() wrong output
fix typo
add more errno handling
set errno in ioutil access routine
Anatol Belski [Fri, 29 Jul 2016 15:00:52 +0000 (17:00 +0200)]
Fixed bug #72701 mysqli_get_host_info() wrong output
Anatol Belski [Fri, 29 Jul 2016 13:08:55 +0000 (15:08 +0200)]
fix typo
Anatol Belski [Fri, 29 Jul 2016 13:05:41 +0000 (15:05 +0200)]
add more errno handling
Anatol Belski [Fri, 29 Jul 2016 12:31:06 +0000 (14:31 +0200)]
set errno in ioutil access routine
Anatol Belski [Fri, 29 Jul 2016 12:02:04 +0000 (14:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
move error check to right place
Anatol Belski [Fri, 29 Jul 2016 11:33:58 +0000 (13:33 +0200)]
move error check to right place
this only makes sense when length was passed
Anatol Belski [Fri, 29 Jul 2016 11:08:10 +0000 (13:08 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
document file cache fallback ini directive
Anatol Belski [Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
document file cache fallback ini directive
Anatol Belski [Fri, 29 Jul 2016 11:04:51 +0000 (13:04 +0200)]
document file cache fallback ini directive
Anatol Belski [Fri, 29 Jul 2016 00:41:30 +0000 (02:41 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix and improve the ioutil cwd routine for nts
Anatol Belski [Fri, 29 Jul 2016 00:13:06 +0000 (02:13 +0200)]
fix and improve the ioutil cwd routine for nts
- move intermediate var to stack
- fix length calculation
- improve error code setting
Christoph M. Becker [Thu, 28 Jul 2016 23:29:31 +0000 (01:29 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 23:27:14 +0000 (01:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 23:12:12 +0000 (01:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/calendar/calendar.c
Christoph M. Becker [Thu, 28 Jul 2016 22:24:46 +0000 (00:24 +0200)]
Fix #71894: AddressSanitizer: global-buffer-overflow in zif_cal_from_jd
Julian days < 347998 denote invalid Jewish calendar dates, so
cal_from_jd($jd, CAL_JEWISH) and jdmonthname($jd, CAL_MONTH_JEWISH) should
actually fail. For BC we don't yet let them though, but we fix the OOB read
that happens in this case, and we also adjust cal_from_jd()'s return value
to have empty strings for "abbrevdayname" and "dayname" instead of "Sun"/
"Sunday" and NULL for "dow" instead of 0, which doesn't make any sense.
Christoph M. Becker [Thu, 28 Jul 2016 18:15:19 +0000 (20:15 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 18:09:50 +0000 (20:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 18:00:37 +0000 (20:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 17:59:14 +0000 (19:59 +0200)]
Implement FR #65462: Please add tests for gregorian and jewish overflow fixes
Christoph M. Becker [Thu, 28 Jul 2016 17:30:48 +0000 (19:30 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 17:24:18 +0000 (19:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 17:17:56 +0000 (19:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 17:13:58 +0000 (19:13 +0200)]
Fix #67976: cal_days_month() fails for final month of the French calendar
The French calendar ends on 0014-13-05, so trying to calculate the Julian
day of 0015-01-01 fails. We cater to that by returning the hard-coded value.
Nikita Popov [Thu, 28 Jul 2016 16:52:19 +0000 (18:52 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 28 Jul 2016 16:49:36 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 28 Jul 2016 16:45:44 +0000 (18:45 +0200)]
Revert "Make call_user_func() on reference args consistent"
This reverts commit
fafe01b07bfcb4f4a9088dd89195f2f5acba8fd0 .
See bug #72698, there is code using this behavior. Reverting for
PHP 7.0 *only*. The fix is still in PHP 7.1.
Christoph M. Becker [Thu, 28 Jul 2016 16:26:06 +0000 (18:26 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 16:25:49 +0000 (18:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 16:24:13 +0000 (18:24 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 16:22:19 +0000 (18:22 +0200)]
Bug #69975 had already been fixed as of PHP 5.6.12
Also CVE-2015-8879 had been assigned.
Christoph M. Becker [Thu, 28 Jul 2016 15:31:35 +0000 (17:31 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 15:31:13 +0000 (17:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 15:19:47 +0000 (17:19 +0200)]
Fix #72677: SCM_CREDENTIALS related tests should be skipped on AIX
Patch provided by matthieu dot sarter dot external at atos dot net.
Christoph M. Becker [Thu, 28 Jul 2016 15:08:51 +0000 (17:08 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 15:00:54 +0000 (17:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 14:54:36 +0000 (16:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 14:49:45 +0000 (16:49 +0200)]
Fix #72676: Test cli_process_title_unix fails on AIX
Patch provided by matthieu dot sarter dot external at atos dot net.
Christoph M. Becker [Thu, 28 Jul 2016 14:41:22 +0000 (16:41 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 14:40:37 +0000 (16:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 14:29:02 +0000 (16:29 +0200)]
Update to SQLite3 3.13.0
Christoph M. Becker [Thu, 28 Jul 2016 13:52:30 +0000 (15:52 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 13:35:56 +0000 (15:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
Christoph M. Becker [Thu, 28 Jul 2016 13:24:41 +0000 (15:24 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
Christoph M. Becker [Thu, 28 Jul 2016 13:21:48 +0000 (15:21 +0200)]
Fix #72694: mb_ereg_search_setpos does not accept a string's last position
Setting the search position immediately behind the last character should be
allowed, so we fix this off-by-one error.
Christoph M. Becker [Thu, 28 Jul 2016 12:19:48 +0000 (14:19 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 12:08:31 +0000 (14:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 11:59:13 +0000 (13:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 11:56:40 +0000 (13:56 +0200)]
Fix #72693: mb_ereg_search increments search position when a match zero-width
That's caused by an off-by-one error, which we fix.
Christoph M. Becker [Thu, 28 Jul 2016 11:27:36 +0000 (13:27 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 11:18:18 +0000 (13:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 11:09:09 +0000 (13:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
Christoph M. Becker [Thu, 28 Jul 2016 11:07:05 +0000 (13:07 +0200)]
Fix #72691: mb_ereg_search raises a warning if a match zero-width
That warning doesn't make sense (PCRE doesn't throw such a warning either),
so we remove it.
Christoph M. Becker [Thu, 28 Jul 2016 10:30:35 +0000 (12:30 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Thu, 28 Jul 2016 10:30:02 +0000 (12:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 28 Jul 2016 10:28:10 +0000 (12:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 28 Jul 2016 10:26:41 +0000 (12:26 +0200)]
Bug #6836 has already been fixed in PHP 5.6.24 and 7.0.9
Pierrick Charron [Thu, 28 Jul 2016 03:54:45 +0000 (23:54 -0400)]
Add new curl functions in UPGRADING
Pierrick Charron [Thu, 28 Jul 2016 03:40:12 +0000 (23:40 -0400)]
Merge branch 'PHP-7.1'
Pierrick Charron [Thu, 28 Jul 2016 03:39:34 +0000 (23:39 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Pierrick Charron [Thu, 28 Jul 2016 03:36:22 +0000 (23:36 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/curl/interface.c
Pierrick Charron [Thu, 28 Jul 2016 03:30:20 +0000 (23:30 -0400)]
Fixed bug #71929 (CURLINFO_CERTINFO data parsing error).
Pierrick Charron [Wed, 27 Jul 2016 22:26:19 +0000 (18:26 -0400)]
Merge branch 'PHP-7.1'
Pierrick Charron [Wed, 27 Jul 2016 22:25:55 +0000 (18:25 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Pierrick Charron [Wed, 27 Jul 2016 22:17:43 +0000 (18:17 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 27 Jul 2016 21:53:40 +0000 (23:53 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
cleanup the table after the test run
Anatol Belski [Wed, 27 Jul 2016 21:53:19 +0000 (23:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
cleanup the table after the test run
Pierrick Charron [Wed, 27 Jul 2016 21:52:05 +0000 (17:52 -0400)]
Update NEWS
Anatol Belski [Wed, 27 Jul 2016 21:50:10 +0000 (23:50 +0200)]
cleanup the table after the test run
Anatol Belski [Wed, 27 Jul 2016 21:32:57 +0000 (23:32 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS