]>
granicus.if.org Git - php/log
Bob Weinand [Sun, 20 Nov 2016 18:20:09 +0000 (19:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 20 Nov 2016 18:18:50 +0000 (19:18 +0100)]
Revert "Revert "Remove a few unused write warning""
This reverts commit
ff5a65d26b139142c5e967582c369ef65b79adf8 .
(With zend_ prefix now)
Nikita Popov [Sun, 20 Nov 2016 18:10:03 +0000 (19:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 20 Nov 2016 18:02:40 +0000 (19:02 +0100)]
Revert "Remove a few unused write warning (backport from master, oops)s"
This reverts commit
c65d24eaa3671e61db7c2a3f28daeaf7c74ac758 .
Bob Weinand [Sun, 20 Nov 2016 13:18:54 +0000 (14:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 20 Nov 2016 13:14:46 +0000 (14:14 +0100)]
Remove a few unused write warning (backport from master, oops)s
Joe Watkins [Sun, 20 Nov 2016 08:34:16 +0000 (08:34 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Sun, 20 Nov 2016 08:32:26 +0000 (08:32 +0000)]
fix #72180, #73219
Xinchen Hui [Sun, 20 Nov 2016 07:47:39 +0000 (15:47 +0800)]
Update NEWS
Xinchen Hui [Sun, 20 Nov 2016 07:46:53 +0000 (15:46 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
Fix #73219 (fix acinclude when / is present)
make it possible to show specific help pages without interactive session
Conflicts:
acinclude.m4
Xinchen Hui [Sun, 20 Nov 2016 07:44:27 +0000 (15:44 +0800)]
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
Joe Watkins [Sun, 20 Nov 2016 05:34:08 +0000 (05:34 +0000)]
Fix #73219 (fix acinclude when / is present)
Joe Watkins [Sun, 20 Nov 2016 05:24:14 +0000 (05:24 +0000)]
make it possible to show specific help pages without interactive session
Joe Watkins [Sun, 20 Nov 2016 05:24:14 +0000 (05:24 +0000)]
make it possible to show specific help pages without interactive session
Anatol Belski [Fri, 18 Nov 2016 21:11:25 +0000 (22:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test portability
Anatol Belski [Fri, 18 Nov 2016 21:10:41 +0000 (22:10 +0100)]
fix test portability
Nikita Popov [Fri, 18 Nov 2016 20:41:10 +0000 (21:41 +0100)]
Fixed bug #73303
Anatol Belski [Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
don't fail miserably, when an unknown vc version is used
Anatol Belski [Fri, 18 Nov 2016 17:19:47 +0000 (18:19 +0100)]
don't fail miserably, when an unknown vc version is used
Nikita Popov [Fri, 18 Nov 2016 16:56:28 +0000 (17:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 18 Nov 2016 16:56:16 +0000 (17:56 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Mitch Hagstrand [Fri, 11 Nov 2016 23:40:30 +0000 (15:40 -0800)]
Fix the lchwon error test for Travis CI.
The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.
Christoph M. Becker [Fri, 18 Nov 2016 13:30:30 +0000 (14:30 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 18 Nov 2016 13:29:28 +0000 (14:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Dmitry Stogov [Fri, 18 Nov 2016 13:20:09 +0000 (16:20 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Regenerated scanner
Dmitry Stogov [Fri, 18 Nov 2016 13:19:46 +0000 (16:19 +0300)]
Regenerated scanner
Dmitry Stogov [Fri, 18 Nov 2016 13:18:22 +0000 (16:18 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed memory leaks in parse_ini_file()
Dmitry Stogov [Fri, 18 Nov 2016 13:17:52 +0000 (16:17 +0300)]
Fixed memory leaks in parse_ini_file()
Christoph M. Becker [Fri, 18 Nov 2016 13:17:19 +0000 (14:17 +0100)]
Fix #64526: Add missing mysqlnd.* parameters to php.ini-*
Anatol Belski [Fri, 18 Nov 2016 11:00:02 +0000 (12:00 +0100)]
extend skipif
Dmitry Stogov [Fri, 18 Nov 2016 10:21:22 +0000 (13:21 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Disabled PHP call tracing by default (it makes significant overhead). This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
Dmitry Stogov [Fri, 18 Nov 2016 10:19:30 +0000 (13:19 +0300)]
Disabled PHP call tracing by default (it makes significant overhead).
This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
Dmitry Stogov [Fri, 18 Nov 2016 09:52:46 +0000 (12:52 +0300)]
Revert "Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing"
This reverts commit
01239b0effbc1839aca6d03cdd4c3a0c1a509798 .
Dmitry Stogov [Fri, 18 Nov 2016 09:23:48 +0000 (12:23 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
extend skipif
add vc15 to the list
Dmitry Stogov [Fri, 18 Nov 2016 09:23:10 +0000 (12:23 +0300)]
Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing
Anatol Belski [Fri, 18 Nov 2016 01:23:17 +0000 (02:23 +0100)]
extend skipif
This test won't pass on Windows. The main reason is that the multiline
input is not really possible to create on cmd. But also, because of the
single quotes. And without multiline data piping, it doesn't make sense.
Anatol Belski [Thu, 17 Nov 2016 22:46:49 +0000 (23:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add vc15 to the list
Anatol Belski [Thu, 17 Nov 2016 22:43:32 +0000 (23:43 +0100)]
add vc15 to the list
Dmitry Stogov [Thu, 17 Nov 2016 12:59:35 +0000 (15:59 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 12:58:38 +0000 (15:58 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 12:57:40 +0000 (15:57 +0300)]
Fixed test
Nikita Popov [Thu, 17 Nov 2016 00:07:18 +0000 (01:07 +0100)]
RC inference fixes
Dmitry Stogov [Thu, 17 Nov 2016 11:07:11 +0000 (14:07 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 11:06:56 +0000 (14:06 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 11:05:48 +0000 (14:05 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed 64-bit build
Dmitry Stogov [Thu, 17 Nov 2016 11:05:22 +0000 (14:05 +0300)]
Fixed 64-bit build
Julien Pauli [Thu, 17 Nov 2016 10:48:32 +0000 (11:48 +0100)]
Updated NEWS
Julien Pauli [Thu, 17 Nov 2016 10:33:36 +0000 (11:33 +0100)]
Improvement for bug73297
Rowan Collins [Mon, 24 Oct 2016 18:01:17 +0000 (18:01 +0000)]
Simplify ext/standard/tests/http/bug73297.phpt
Rowan Collins [Sun, 23 Oct 2016 18:24:58 +0000 (18:24 +0000)]
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Rowan Collins [Tue, 11 Oct 2016 21:12:18 +0000 (21:12 +0000)]
Add failing test for bug#73297
Julien Pauli [Thu, 17 Nov 2016 10:49:31 +0000 (11:49 +0100)]
Updated NEWS
Julien Pauli [Thu, 17 Nov 2016 10:33:36 +0000 (11:33 +0100)]
Improvement for bug73297
Rowan Collins [Mon, 24 Oct 2016 18:01:17 +0000 (18:01 +0000)]
Simplify ext/standard/tests/http/bug73297.phpt
Rowan Collins [Sun, 23 Oct 2016 18:24:58 +0000 (18:24 +0000)]
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Rowan Collins [Tue, 11 Oct 2016 21:12:18 +0000 (21:12 +0000)]
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 10:43:45 +0000 (13:43 +0300)]
Fixed test
Julien Pauli [Thu, 17 Nov 2016 10:37:13 +0000 (11:37 +0100)]
Updated NEWS
Dmitry Stogov [Thu, 17 Nov 2016 10:34:32 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
Julien Pauli [Thu, 17 Nov 2016 10:33:36 +0000 (11:33 +0100)]
Improvement for bug73297
Dmitry Stogov [Thu, 17 Nov 2016 10:33:05 +0000 (13:33 +0300)]
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
Dmitry Stogov [Thu, 17 Nov 2016 10:18:25 +0000 (13:18 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Overflow check
Dmitry Stogov [Thu, 17 Nov 2016 10:17:34 +0000 (13:17 +0300)]
Overflow check
Rowan Collins [Mon, 24 Oct 2016 18:01:17 +0000 (18:01 +0000)]
Simplify ext/standard/tests/http/bug73297.phpt
Rowan Collins [Sun, 23 Oct 2016 18:24:58 +0000 (18:24 +0000)]
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Rowan Collins [Tue, 11 Oct 2016 21:12:18 +0000 (21:12 +0000)]
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 08:45:14 +0000 (11:45 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip 64-bit specific tests on 32-bit systems
Dmitry Stogov [Thu, 17 Nov 2016 08:44:28 +0000 (11:44 +0300)]
Skip 64-bit specific tests on 32-bit systems
Dmitry Stogov [Thu, 17 Nov 2016 07:41:42 +0000 (10:41 +0300)]
VERIFY_RETURN_TYPE on references can't be eliminated
Dmitry Stogov [Wed, 16 Nov 2016 22:14:47 +0000 (01:14 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Accorate handling of too big inodes of chroot directories
Dmitry Stogov [Wed, 16 Nov 2016 22:14:23 +0000 (01:14 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Accorate handling of too big inodes of chroot directories
Dmitry Stogov [Wed, 16 Nov 2016 22:08:42 +0000 (01:08 +0300)]
Accorate handling of too big inodes of chroot directories
Nikita Popov [Wed, 16 Nov 2016 20:33:05 +0000 (21:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Wed, 16 Nov 2016 20:00:52 +0000 (12:00 -0800)]
Fix #73546: Logging for opcache has an empty file name
Dmitry Stogov [Wed, 16 Nov 2016 20:20:22 +0000 (23:20 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
"opcache.validate_root" is useless on Windows
Dmitry Stogov [Wed, 16 Nov 2016 20:19:56 +0000 (23:19 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
"opcache.validate_root" is useless on Windows
Dmitry Stogov [Wed, 16 Nov 2016 20:15:14 +0000 (23:15 +0300)]
"opcache.validate_root" is useless on Windows
Dmitry Stogov [Wed, 16 Nov 2016 20:10:59 +0000 (23:10 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
fix gcov coverage
Dmitry Stogov [Wed, 16 Nov 2016 20:09:13 +0000 (23:09 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use full path
Nuno Lopes [Wed, 16 Nov 2016 20:08:42 +0000 (15:08 -0500)]
fix gcov coverage
Dmitry Stogov [Wed, 16 Nov 2016 20:05:00 +0000 (23:05 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use full path
Dmitry Stogov [Wed, 16 Nov 2016 20:01:40 +0000 (23:01 +0300)]
Use full path
Dmitry Stogov [Wed, 16 Nov 2016 17:49:00 +0000 (20:49 +0300)]
Fixed type ingference
Dmitry Stogov [Wed, 16 Nov 2016 13:47:22 +0000 (16:47 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed ZTS build
Dmitry Stogov [Wed, 16 Nov 2016 13:47:05 +0000 (16:47 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
Dmitry Stogov [Wed, 16 Nov 2016 13:46:54 +0000 (16:46 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed ZTS build
Fix #73530: Unsetting result set may reset other result set
Dmitry Stogov [Wed, 16 Nov 2016 13:43:57 +0000 (16:43 +0300)]
Fixed ZTS build
Christoph M. Becker [Wed, 16 Nov 2016 11:01:55 +0000 (12:01 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 16 Nov 2016 10:55:57 +0000 (11:55 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 16 Nov 2016 10:49:04 +0000 (11:49 +0100)]
Fix #73530: Unsetting result set may reset other result set
Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.
Anatol Belski [Wed, 16 Nov 2016 10:21:32 +0000 (11:21 +0100)]
keep ABI
Dmitry Stogov [Wed, 16 Nov 2016 09:59:28 +0000 (12:59 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
Fixed bug #73512 Fails to find firebird headers
Dmitry Stogov [Wed, 16 Nov 2016 09:56:15 +0000 (12:56 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #69090 (check cached files permissions)
Dmitry Stogov [Wed, 16 Nov 2016 09:49:50 +0000 (12:49 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #69090 (check cached files permissions)
Remi Collet [Wed, 16 Nov 2016 09:45:59 +0000 (10:45 +0100)]
Fixed bug #73512 Fails to find firebird headers
- use fb_config output instead of relying on hardoded path
Dmitry Stogov [Wed, 16 Nov 2016 09:43:10 +0000 (12:43 +0300)]
Fixed bug #69090 (check cached files permissions)
Xinchen Hui [Wed, 16 Nov 2016 07:14:33 +0000 (15:14 +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:
new entry for #2196
Improve error message
Fix test
Refactor and cleanup implementation.
Revert "Fix Bug #73461"
Revert "Protect class based session save handler"
Protect class based session save handler
Fix Bug #73461
Xinchen Hui [Wed, 16 Nov 2016 07:05:04 +0000 (15:05 +0800)]
Fixed bug #73532 (Null pointer dereference in mb_eregi)
Joe Watkins [Wed, 16 Nov 2016 05:12:04 +0000 (05:12 +0000)]
new entry for #2196
Yasuo Ohgaki [Tue, 15 Nov 2016 03:10:20 +0000 (12:10 +0900)]
Improve error message