]>
granicus.if.org Git - php/log
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
Anatol Belski [Wed, 27 Jul 2016 21:32:20 +0000 (23:32 +0200)]
update NEWS
Anatol Belski [Wed, 27 Jul 2016 21:31:35 +0000 (23:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 27 Jul 2016 21:30:23 +0000 (23:30 +0200)]
update NEWS
Anatol Belski [Wed, 27 Jul 2016 21:03:53 +0000 (23:03 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
Anatol Belski [Wed, 27 Jul 2016 21:03:23 +0000 (23:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
root [Tue, 19 Jul 2016 19:28:25 +0000 (15:28 -0400)]
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
Anatol Belski [Wed, 27 Jul 2016 18:50:02 +0000 (20:50 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Fixed bug #72683 getmxrr broken
Anatol Belski [Wed, 27 Jul 2016 18:49:46 +0000 (20:49 +0200)]
update NEWS
Anatol Belski [Wed, 27 Jul 2016 18:49:16 +0000 (20:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72683 getmxrr broken
Anatol Belski [Wed, 27 Jul 2016 18:48:45 +0000 (20:48 +0200)]
Fixed bug #72683 getmxrr broken
Anatol Belski [Wed, 27 Jul 2016 18:42:26 +0000 (20:42 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Anatol Belski [Wed, 27 Jul 2016 18:42:05 +0000 (20:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 27 Jul 2016 18:41:27 +0000 (20:41 +0200)]
update NEWS
Christoph M. Becker [Wed, 27 Jul 2016 17:10:28 +0000 (19:10 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Wed, 27 Jul 2016 17:05:43 +0000 (19:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 27 Jul 2016 16:59:40 +0000 (18:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/pcre/php_pcre.c
Christoph M. Becker [Wed, 27 Jul 2016 16:50:52 +0000 (18:50 +0200)]
Fix #72688: preg_match missing group names in matches
We have to multiply with 0x100 to properly scale the high byte.
Bob Weinand [Wed, 27 Jul 2016 16:19:18 +0000 (18:19 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 27 Jul 2016 16:18:47 +0000 (18:18 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 27 Jul 2016 16:08:43 +0000 (18:08 +0200)]
Fixed a potential segfault in zend_objects_store_free_object_storage()
Under the special circumstance where a garbage collected objects bucket slot was not reused until the end of the script, we get access into freed memory...
No test added as it usually is valgrind-only, and only sometimes when the memory happens to have changed (i.e. (GC_FLAGS(obj) & IS_OBJ_FREE_CALLED) == 0), it actually *may* segfault
Christoph M. Becker [Wed, 27 Jul 2016 14:58:19 +0000 (16:58 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Wed, 27 Jul 2016 14:53:29 +0000 (16:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 27 Jul 2016 14:47:09 +0000 (16:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
Christoph M. Becker [Wed, 27 Jul 2016 14:37:49 +0000 (16:37 +0200)]
Implement #72653: SQLite should allow opening with empty filename
From the [sqlite3_open](https://www.sqlite.org/c3ref/open.html) docs:
| If the filename is an empty string, then a private, temporary on-disk
| database will be created. This private database will be automatically
| deleted as soon as the database connection is closed.
We make that facility available to userland.
While we're at it, we also do some minor optimizations, remove the
unnecessary check for NUL characters in filename, which is already catered
to by ZPP(p), and add a missing `return` in case db_obj isn't initialized.
Nikita Popov [Wed, 27 Jul 2016 13:59:44 +0000 (15:59 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 27 Jul 2016 13:58:22 +0000 (15:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 27 Jul 2016 13:56:52 +0000 (15:56 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Ville Hukkamäki [Mon, 25 Jul 2016 18:50:38 +0000 (18:50 +0000)]
Fix bug #72667
Open data stream after receiving PASV reply, before sending the
main request.
Included test cases for opendir() with ftp:// and ftps:// wrappers.
Test cases re-use ext/ftp/tests/server.inc
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Sara Golemon [Wed, 27 Jul 2016 04:57:07 +0000 (21:57 -0700)]
Bugfix#70896 gmp_fact() silently ignores non-integer inputs
Factorials only make sense for integer inputs.
To do something factorial-like, the Gamma Function
should be used instead.
However, at this point it's no longer a factorial.
For PHP/GMP, we'll raise a warning on trying to use
a non-integer input, but carry on returning the truncated
value as we used to (avoiding BC breakage).
Pierrick Charron [Wed, 27 Jul 2016 04:40:23 +0000 (00:40 -0400)]
Merge branch 'PHP-7.1'
Pierrick Charron [Wed, 27 Jul 2016 04:39:47 +0000 (00:39 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Pierrick Charron [Wed, 27 Jul 2016 04:38:54 +0000 (00:38 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
main/streams/streams.c
Pierrick Charron [Wed, 27 Jul 2016 04:33:13 +0000 (00:33 -0400)]
Fixed bug #72686 (zlib: url support is broken).
zlib: support is broken since a really long time.
It never worked on versions >= PHP5.6 so we can just remove
this dead code.
Bug was introduced 2006-05-14 (Before 5.2.0)
Pierrick Charron [Wed, 27 Jul 2016 00:38:26 +0000 (20:38 -0400)]
Merge branch 'PHP-7.1'
Pierrick Charron [Wed, 27 Jul 2016 00:37:04 +0000 (20:37 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Pierrick Charron [Wed, 27 Jul 2016 00:36:34 +0000 (20:36 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/spl/spl_iterators.c
Pierrick Charron [Wed, 27 Jul 2016 00:34:16 +0000 (20:34 -0400)]
Fixed bug #72684 (AppendIterator segfault with closed generator)
Pierrick Charron [Tue, 26 Jul 2016 23:24:04 +0000 (19:24 -0400)]
Merge branch 'PHP-7.1'
Pierrick Charron [Tue, 26 Jul 2016 23:23:08 +0000 (19:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1