]>
granicus.if.org Git - php/log
Kalle Sommer Nielsen [Wed, 3 Aug 2016 02:24:17 +0000 (04:24 +0200)]
Minor touches to the exif build script on Windows; ADD_EXTENSION_DEP() will already ERROR() out, so the WARNING() statement would never be returned anyway.
There are probably other similar cases around ext/, however the main reason for fixing this was for the typo (libxml > mbstring).
Nikita Popov [Tue, 2 Aug 2016 22:35:16 +0000 (00:35 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 2 Aug 2016 22:35:00 +0000 (00:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 2 Aug 2016 22:33:32 +0000 (00:33 +0200)]
Fix bug #72724
Christoph M. Becker [Tue, 2 Aug 2016 16:59:48 +0000 (18:59 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 2 Aug 2016 16:53:54 +0000 (18:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 2 Aug 2016 16:47:36 +0000 (18:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 2 Aug 2016 16:41:20 +0000 (18:41 +0200)]
Fix #72709: imagesetstyle() causes OOB read for empty $styles
Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle()
to be called with `noOfPixels==0`, what could have lead to OOB reads.
Actually, this issue will be fixed in libgd, but to avoid issues when older
libgd is in use, we simply disallow passing an empty $styles array to
imagesetstyle(), what wouldn't serve a useful purpose anyway.
Anatol Belski [Tue, 2 Aug 2016 12:43:44 +0000 (14:43 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
cleanup table after test
- lastInsertId using Postgres Lastval() function
Anatol Belski [Tue, 2 Aug 2016 12:42:55 +0000 (14:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
cleanup table after test
- lastInsertId using Postgres Lastval() function
Anatol Belski [Tue, 2 Aug 2016 12:40:31 +0000 (14:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
cleanup table after test
- lastInsertId using Postgres Lastval() function
Anatol Belski [Tue, 2 Aug 2016 12:36:56 +0000 (14:36 +0200)]
update NEWS
Anatol Belski [Tue, 2 Aug 2016 12:35:24 +0000 (14:35 +0200)]
cleanup table after test
Pablo Santiago Sánchez [Thu, 28 Jul 2016 01:12:56 +0000 (22:12 -0300)]
- lastInsertId using Postgres Lastval() function
Xinchen Hui [Tue, 2 Aug 2016 12:29:05 +0000 (20:29 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed warning: "operation on ‘s’ may be undefined"
Xinchen Hui [Tue, 2 Aug 2016 12:28:42 +0000 (20:28 +0800)]
Fixed warning: "operation on ‘s’ may be undefined"
Xinchen Hui [Tue, 2 Aug 2016 12:08:25 +0000 (20:08 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Folder marks
Xinchen Hui [Tue, 2 Aug 2016 12:08:15 +0000 (20:08 +0800)]
Folder marks
Xinchen Hui [Tue, 2 Aug 2016 12:02:49 +0000 (20:02 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Optimized array_merge and cleanup
Xinchen Hui [Tue, 2 Aug 2016 12:02:23 +0000 (20:02 +0800)]
Optimized array_merge and cleanup
Xinchen Hui [Tue, 2 Aug 2016 09:45:22 +0000 (17:45 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
increase versions for 7.2
Xinchen Hui [Tue, 2 Aug 2016 09:40:47 +0000 (17:40 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Optimized array_merge
prepare next
fix php_version.h
Xinchen Hui [Tue, 2 Aug 2016 09:40:37 +0000 (17:40 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
prepare next
fix php_version.h
Xinchen Hui [Tue, 2 Aug 2016 09:39:53 +0000 (17:39 +0800)]
Optimized array_merge
Anatol Belski [Tue, 2 Aug 2016 09:15:28 +0000 (11:15 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
prepare next
Anatol Belski [Tue, 2 Aug 2016 09:15:07 +0000 (11:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepare next
Anatol Belski [Tue, 2 Aug 2016 09:13:20 +0000 (11:13 +0200)]
prepare next
Anatol Belski [Tue, 2 Aug 2016 09:08:51 +0000 (11:08 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix php_version.h
Anatol Belski [Tue, 2 Aug 2016 09:08:21 +0000 (11:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix php_version.h
Anatol Belski [Tue, 2 Aug 2016 09:06:33 +0000 (11:06 +0200)]
fix php_version.h
Anatol Belski [Tue, 2 Aug 2016 09:00:54 +0000 (11:00 +0200)]
increase versions for 7.2
Xinchen Hui [Tue, 2 Aug 2016 04:42:06 +0000 (12:42 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Optimized array_column (thanks to Benjamin Coutu)
Xinchen Hui [Tue, 2 Aug 2016 04:40:46 +0000 (12:40 +0800)]
Optimized array_column (thanks to Benjamin Coutu)
Xinchen Hui [Tue, 2 Aug 2016 03:05:59 +0000 (11:05 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fixed IS_REFERENCE handling
Xinchen Hui [Tue, 2 Aug 2016 03:04:52 +0000 (11:04 +0800)]
fixed IS_REFERENCE handling
Xinchen Hui [Mon, 1 Aug 2016 12:20:27 +0000 (20:20 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Make the expression more reasonble (by nikic)
Xinchen Hui [Mon, 1 Aug 2016 12:20:01 +0000 (20:20 +0800)]
Make the expression more reasonble (by nikic)
Xinchen Hui [Mon, 1 Aug 2016 12:11:28 +0000 (20:11 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Optimized array_reverse
Xinchen Hui [Mon, 1 Aug 2016 12:11:08 +0000 (20:11 +0800)]
Optimized array_reverse
Anatol Belski [Sun, 31 Jul 2016 13:02:44 +0000 (15:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Revert "upgraded to PCRE 8.39"
Anatol Belski [Sun, 31 Jul 2016 13:01:45 +0000 (15:01 +0200)]
update NEWS
Anatol Belski [Sun, 31 Jul 2016 13:00:18 +0000 (15:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Revert "upgraded to PCRE 8.39"
Anatol Belski [Sun, 31 Jul 2016 12:58:46 +0000 (14:58 +0200)]
update NEWS
Anatol Belski [Sun, 31 Jul 2016 12:55:17 +0000 (14:55 +0200)]
Revert "upgraded to PCRE 8.39"
This reverts commit
2fba6468374a15efc82aaac8cbfc600b29c5404f .
PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.
Nikita Popov [Sat, 30 Jul 2016 16:36:15 +0000 (18:36 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 30 Jul 2016 16:36:09 +0000 (18:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 30 Jul 2016 16:35:41 +0000 (18:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 16:34:34 +0000 (18:34 +0200)]
Revert "Fixed bug #71219"
This reverts commit
14d674442ef86ad4e862228a1ff5ecd322ae7759 .
I misread the discussion on the bug -- this is not the correct
fix. However the other proposed fix does not work either, so just
reverting for now.
Nikita Popov [Sat, 30 Jul 2016 16:25:09 +0000 (18:25 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 30 Jul 2016 16:24:59 +0000 (18:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 30 Jul 2016 16:22:07 +0000 (18:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 30 Jul 2016 16:21:19 +0000 (18:21 +0200)]
Fixed bug #71219
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