]>
granicus.if.org Git - php/log
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 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:29:02 +0000 (16:29 +0200)]
Update to SQLite3 3.13.0
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 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: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: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: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:17:43 +0000 (18:17 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
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:30:23 +0000 (23:30 +0200)]
update NEWS
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:48:45 +0000 (20:48 +0200)]
Fixed bug #72683 getmxrr broken
Anatol Belski [Wed, 27 Jul 2016 18:41:27 +0000 (20:41 +0200)]
update NEWS
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: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: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: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
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: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:20:12 +0000 (19:20 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Pierrick Charron [Tue, 26 Jul 2016 22:50:15 +0000 (18:50 -0400)]
Fixed bug #71709
When curl_setopt is called with an empty slist as value, we should
not add the empty slist to the list of slist to free.
Anatol Belski [Sun, 19 Jun 2016 18:38:31 +0000 (20:38 +0200)]
upgraded to PCRE 8.39
(cherry picked from commit
9d4fe9672a1c32d1349f267d24d079e3ebdc83e8 )
Nikita Popov [Mon, 25 Jul 2016 21:02:54 +0000 (23:02 +0200)]
Fix GMP unserialization with self-reference
Christoph M. Becker [Mon, 25 Jul 2016 15:07:41 +0000 (17:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt
Christoph M. Becker [Mon, 25 Jul 2016 15:03:10 +0000 (17:03 +0200)]
Further fixes wrt. bug #72668
Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.
Xinchen Hui [Mon, 25 Jul 2016 12:28:39 +0000 (20:28 +0800)]
Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
Anatol Belski [Mon, 25 Jul 2016 08:17:41 +0000 (10:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Make phpize use PHP_PREFIX as the default location (windows)
Enable 'nmake test' on building extensions
Anatol Belski [Mon, 25 Jul 2016 08:14:18 +0000 (10:14 +0200)]
update NEWS
y-uti [Sat, 26 Mar 2016 09:56:25 +0000 (18:56 +0900)]
Make phpize use PHP_PREFIX as the default location (windows)
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
y-uti [Mon, 28 Mar 2016 10:50:31 +0000 (19:50 +0900)]
Enable 'nmake test' on building extensions
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
Anatol Belski [Mon, 25 Jul 2016 07:51:13 +0000 (09:51 +0200)]
update NEWS
y-uti [Mon, 28 Mar 2016 10:50:31 +0000 (19:50 +0900)]
Enable 'nmake test' on building extensions
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
y-uti [Sat, 26 Mar 2016 09:56:25 +0000 (18:56 +0900)]
Make phpize use PHP_PREFIX as the default location (windows)
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
Christoph M. Becker [Mon, 25 Jul 2016 00:02:54 +0000 (02:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
Christoph M. Becker [Mon, 25 Jul 2016 00:00:37 +0000 (02:00 +0200)]
Fix broken test case
d28f1da introduced a test regression, due to potentially additional output
regarding FreeType support. We fix that by making the test more resilient.
Christoph M. Becker [Sun, 24 Jul 2016 22:16:21 +0000 (00:16 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
Christoph M. Becker [Sun, 24 Jul 2016 22:13:44 +0000 (00:13 +0200)]
Fix broken test case
The test claims that it would be "checking all the values in returned array",
but due to the use of %a it actually skipped elements. We fix that by using
%s instead.
Xinchen Hui [Sun, 24 Jul 2016 15:58:22 +0000 (23:58 +0800)]
Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
Anatol Belski [Sun, 24 Jul 2016 12:53:53 +0000 (14:53 +0200)]
regenerate date parser with re2c 0.15.3
Anatol Belski [Sun, 24 Jul 2016 12:51:59 +0000 (14:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
regenerate date parser with re2c 0.15.3
Anatol Belski [Sun, 24 Jul 2016 12:50:10 +0000 (14:50 +0200)]
regenerate date parser with re2c 0.15.3
Nikita Popov [Sat, 23 Jul 2016 22:18:47 +0000 (00:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 23 Jul 2016 22:13:42 +0000 (00:13 +0200)]
More tolerance in another IntlCalendar test
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
Nikita Popov [Sat, 23 Jul 2016 22:06:55 +0000 (00:06 +0200)]
Ensure session GC is not run during variation6.phpt
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
Anatol Belski [Sat, 23 Jul 2016 19:03:45 +0000 (21:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Sat, 23 Jul 2016 18:55:39 +0000 (20:55 +0200)]
fix test
Christoph M. Becker [Sat, 23 Jul 2016 17:31:50 +0000 (19:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 17:29:43 +0000 (19:29 +0200)]
Fix #68712: suspicious if-else statements
Christoph M. Becker [Sat, 23 Jul 2016 16:12:14 +0000 (18:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 16:09:18 +0000 (18:09 +0200)]
Fix copy&paste errors in gd_interpolation.c
According to <https://github.com/libgd/libgd/commit/
f101380 >.
Christoph M. Becker [Sat, 23 Jul 2016 14:50:16 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 14:48:07 +0000 (16:48 +0200)]
Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.
[1] <https://github.com/libgd/libgd/commit/
aa1d71c >
Bob Weinand [Sat, 23 Jul 2016 14:39:21 +0000 (16:39 +0200)]
Fix ClosedGeneratorException possibly thrown into wrong scope
Nikita Popov [Sat, 23 Jul 2016 11:29:57 +0000 (13:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
vhuk [Thu, 21 Jul 2016 09:20:06 +0000 (12:20 +0300)]
Fix for bug #54431
Nikita Popov [Fri, 22 Jul 2016 15:22:13 +0000 (17:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 22 Jul 2016 15:20:56 +0000 (17:20 +0200)]
Make IntlCalendar::getNow() test more tolerant
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
Xinchen Hui [Fri, 22 Jul 2016 15:13:42 +0000 (23:13 +0800)]
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
Christoph M. Becker [Fri, 22 Jul 2016 13:27:16 +0000 (15:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/spl/spl_directory.c
Christoph M. Becker [Fri, 22 Jul 2016 12:55:13 +0000 (14:55 +0200)]
Fix #72646: SplFileObject::getCsvControl does not return the escape character
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
Remi Collet [Fri, 22 Jul 2016 07:36:36 +0000 (09:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
FPM: add test for CVE-2016-5385
Remi Collet [Fri, 22 Jul 2016 07:35:09 +0000 (09:35 +0200)]
FPM: add test for CVE-2016-5385
Christoph M. Becker [Thu, 21 Jul 2016 16:38:44 +0000 (18:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 21 Jul 2016 16:36:12 +0000 (18:36 +0200)]
Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars
We must not forget to properly reset the state for multibyte characters
following an escape character.
Christoph M. Becker [Thu, 21 Jul 2016 14:50:37 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Pieter Hordijk [Fri, 15 Jul 2016 19:58:13 +0000 (21:58 +0200)]
Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
Remi Collet [Thu, 21 Jul 2016 06:42:53 +0000 (08:42 +0200)]
bump zip extension version
Xinchen Hui [Thu, 21 Jul 2016 06:25:15 +0000 (14:25 +0800)]
Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
Anatol Belski [Wed, 20 Jul 2016 23:55:42 +0000 (01:55 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs_versions.txt
Anatol Belski [Wed, 20 Jul 2016 23:54:53 +0000 (01:54 +0200)]
update libs_version.txt
Anatol Belski [Wed, 20 Jul 2016 23:52:03 +0000 (01:52 +0200)]
update libs_versions.txt
Ferenc Kovacs [Wed, 20 Jul 2016 22:37:41 +0000 (00:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 20 Jul 2016 22:36:07 +0000 (00:36 +0200)]
update NEWs
Anatol Belski [Wed, 20 Jul 2016 16:00:53 +0000 (18:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
regenerate date parser with re2c 0.13.5 to fix OSX issues
Anatol Belski [Wed, 20 Jul 2016 15:57:39 +0000 (17:57 +0200)]
regenerate date parser with re2c 0.13.5 to fix OSX issues
Anatol Belski [Wed, 20 Jul 2016 11:32:53 +0000 (13:32 +0200)]
regenerate date parser with re2c 0.13.5
Xinchen Hui [Wed, 20 Jul 2016 10:07:18 +0000 (18:07 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed arginfo
Xinchen Hui [Wed, 20 Jul 2016 10:07:02 +0000 (18:07 +0800)]
Fixed arginfo
Derick Rethans [Wed, 20 Jul 2016 09:21:03 +0000 (10:21 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Wed, 20 Jul 2016 09:19:53 +0000 (10:19 +0100)]
Regenerate with the -b flag, as we used to do.
Apparently, Apple's LLVM can't handle it otherwise o_O.
Xinchen Hui [Wed, 20 Jul 2016 09:01:42 +0000 (17:01 +0800)]
Fixed typo
Xinchen Hui [Wed, 20 Jul 2016 08:59:14 +0000 (16:59 +0800)]
Fixed bug #72629 (Caught exception assignment to variables ignores references).
Xinchen Hui [Wed, 20 Jul 2016 08:12:37 +0000 (16:12 +0800)]
Fixed bug #72622 (array_walk + array_replace_recursive create references from nothing)
Stanislav Malyshev [Wed, 20 Jul 2016 05:38:35 +0000 (22:38 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Improve fix for #72520
#72482, revert for 5.6 for now
Conflicts:
ext/zip/zip_stream.c
Stanislav Malyshev [Wed, 20 Jul 2016 05:37:44 +0000 (22:37 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Improve fix for #72520
Stanislav Malyshev [Wed, 20 Jul 2016 05:37:03 +0000 (22:37 -0700)]
Improve fix for #72520