]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 6 Dec 2016 15:18:54 +0000 (16:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:17:28 +0000 (16:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:12:39 +0000 (16:12 +0100)]
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 13:44:04 +0000 (14:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:42:59 +0000 (14:42 +0100)]
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:37:58 +0000 (14:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:36:52 +0000 (14:36 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:34:27 +0000 (14:34 +0100)]
fix leak, take on 5.6
Xinchen Hui [Tue, 6 Dec 2016 09:33:15 +0000 (17:33 +0800)]
Update NEWS
Xinchen Hui [Tue, 6 Dec 2016 09:32:48 +0000 (17:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Xinchen Hui [Tue, 6 Dec 2016 09:17:59 +0000 (17:17 +0800)]
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Dmitry Stogov [Tue, 6 Dec 2016 07:01:18 +0000 (10:01 +0300)]
Micro optimizations
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:42 +0000 (22:33 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:33 +0000 (22:33 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:32:59 +0000 (22:32 -0800)]
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:42 +0000 (22:16 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:00 +0000 (22:16 -0800)]
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 05:59:10 +0000 (21:59 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:58:55 +0000 (21:58 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:40:55 +0000 (21:40 -0800)]
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Nikita Popov [Mon, 5 Dec 2016 19:39:45 +0000 (20:39 +0100)]
Fix bug #73654
Dmitry Stogov [Mon, 5 Dec 2016 18:49:09 +0000 (21:49 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Mon, 5 Dec 2016 18:45:08 +0000 (21:45 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Anatol Belski [Sun, 4 Dec 2016 21:45:31 +0000 (22:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:42:39 +0000 (22:42 +0100)]
fix test
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
Anatol Belski [Sun, 4 Dec 2016 21:28:34 +0000 (22:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 21:27:17 +0000 (22:27 +0100)]
fix test
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
Anatol Belski [Sun, 4 Dec 2016 19:59:56 +0000 (20:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix ident
Anatol Belski [Sun, 4 Dec 2016 19:59:12 +0000 (20:59 +0100)]
fix ident
Anatol Belski [Sun, 4 Dec 2016 16:29:22 +0000 (17:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sun, 4 Dec 2016 16:28:43 +0000 (17:28 +0100)]
fix test
Anatol Belski [Sun, 4 Dec 2016 13:02:37 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
enforce the test ini usage for the child process
Anatol Belski [Sun, 4 Dec 2016 13:01:40 +0000 (14:01 +0100)]
enforce the test ini usage for the child process
Yasuo Ohgaki [Sun, 4 Dec 2016 08:48:55 +0000 (17:48 +0900)]
Merge branch 'pull-request/2228' into PHP-7.1
* pull-request/2228:
Fix session upgrade documentation
Tobias Schultze [Sun, 4 Dec 2016 06:33:29 +0000 (07:33 +0100)]
Fix session upgrade documentation
Bob Weinand [Sat, 3 Dec 2016 22:42:29 +0000 (23:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 3 Dec 2016 22:37:23 +0000 (23:37 +0100)]
Fix PHP-7.0 build (wrong fix for the branch)
Bob Weinand [Sat, 3 Dec 2016 17:28:47 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 3 Dec 2016 17:23:58 +0000 (18:23 +0100)]
Fix leak when using $this outside of object context
Christoph M. Becker [Sat, 3 Dec 2016 13:18:56 +0000 (14:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Dec 2016 13:18:00 +0000 (14:18 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Adrien Crivelli [Wed, 30 Nov 2016 09:19:35 +0000 (18:19 +0900)]
Fix minor typo
Yasuo Ohgaki [Sat, 3 Dec 2016 05:23:05 +0000 (14:23 +0900)]
Fix typo in php.ini-* comment
Nikita Popov [Fri, 2 Dec 2016 16:03:59 +0000 (17:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 2 Dec 2016 16:03:05 +0000 (17:03 +0100)]
Fix leak in shift_right_function
Bob Weinand [Fri, 2 Dec 2016 14:42:19 +0000 (15:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Fri, 2 Dec 2016 14:41:47 +0000 (15:41 +0100)]
Fix test of wrong operator in self_xor.phpt
Dmitry Stogov [Fri, 2 Dec 2016 12:40:04 +0000 (15:40 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:39:33 +0000 (15:39 +0300)]
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:14:37 +0000 (15:14 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 12:13:55 +0000 (15:13 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 11:00:29 +0000 (14:00 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Dmitry Stogov [Fri, 2 Dec 2016 10:58:44 +0000 (13:58 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Davey Shafik [Fri, 2 Dec 2016 10:14:51 +0000 (02:14 -0800)]
Bump versions and NEWS for 7.1.1-dev
Dmitry Stogov [Fri, 2 Dec 2016 09:35:44 +0000 (12:35 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed possible memory leak in &=, |=, ^=.
Dmitry Stogov [Fri, 2 Dec 2016 09:34:46 +0000 (12:34 +0300)]
Fixed possible memory leak in &=, |=, ^=.
Bob Weinand [Thu, 1 Dec 2016 14:21:49 +0000 (15:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 1 Dec 2016 14:21:28 +0000 (15:21 +0100)]
Fix valgrind issue when throwing due to yield from aborted generator
Anatol Belski [Thu, 1 Dec 2016 13:53:22 +0000 (14:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fork tests
Anatol Belski [Thu, 1 Dec 2016 13:52:18 +0000 (14:52 +0100)]
fork tests
Dmitry Stogov [Thu, 1 Dec 2016 13:22:23 +0000 (16:22 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 13:21:57 +0000 (16:21 +0300)]
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:50:05 +0000 (15:50 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:46:52 +0000 (15:46 +0300)]
Workaround for GCC-4.9.2 bug
Anatol Belski [Thu, 1 Dec 2016 12:33:42 +0000 (13:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:33:27 +0000 (13:33 +0100)]
fix condition
Anatol Belski [Thu, 1 Dec 2016 12:32:10 +0000 (13:32 +0100)]
improve skipif
Anatol Belski [Thu, 1 Dec 2016 12:25:28 +0000 (13:25 +0100)]
improve skipif
Dmitry Stogov [Thu, 1 Dec 2016 10:25:50 +0000 (13:25 +0300)]
Fixed access to uninitialized value
Dmitry Stogov [Thu, 1 Dec 2016 07:34:09 +0000 (10:34 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Simpler overflow check
fix gcov coverage
Dmitry Stogov [Thu, 1 Dec 2016 07:30:02 +0000 (10:30 +0300)]
Simpler overflow check
Anatol Belski [Thu, 1 Dec 2016 00:36:29 +0000 (01:36 +0100)]
fix dir separator
Davey Shafik [Wed, 30 Nov 2016 23:05:45 +0000 (15:05 -0800)]
Update NEWS for the build
Nuno Lopes [Wed, 30 Nov 2016 19:41:26 +0000 (14:41 -0500)]
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
Bob Weinand [Wed, 30 Nov 2016 10:45:18 +0000 (11:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 30 Nov 2016 10:44:10 +0000 (11:44 +0100)]
Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available
Bob Weinand [Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 30 Nov 2016 01:56:47 +0000 (02:56 +0100)]
Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup)
Dmitry Stogov [Mon, 28 Nov 2016 09:57:02 +0000 (12:57 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
Dmitry Stogov [Mon, 28 Nov 2016 09:54:47 +0000 (12:54 +0300)]
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
Dmitry Stogov [Mon, 28 Nov 2016 09:30:01 +0000 (12:30 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed calling generators through magic __call()
Dmitry Stogov [Mon, 28 Nov 2016 09:20:19 +0000 (12:20 +0300)]
Fixed calling generators through magic __call()
Stanislav Malyshev [Mon, 28 Nov 2016 00:11:41 +0000 (16:11 -0800)]
oops, changed in wrong place
Stanislav Malyshev [Sun, 27 Nov 2016 23:38:33 +0000 (15:38 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add NEWS
Fix #68447: grapheme_extract take an extra trailing character
Stanislav Malyshev [Sun, 27 Nov 2016 23:38:22 +0000 (15:38 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add NEWS
Stanislav Malyshev [Sun, 27 Nov 2016 23:38:09 +0000 (15:38 -0800)]
add NEWS
Stanislav Malyshev [Sun, 27 Nov 2016 23:36:29 +0000 (15:36 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #68447: grapheme_extract take an extra trailing character
Stanislav Malyshev [Sun, 27 Nov 2016 23:11:17 +0000 (15:11 -0800)]
Merge branch 'pull-request/1974' into PHP-5.6
* pull-request/1974:
Fix #68447: grapheme_extract take an extra trailing character
Stanislav Malyshev [Sun, 27 Nov 2016 22:53:39 +0000 (14:53 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #73549: Use after free when stream is passed to imagepng
Stanislav Malyshev [Sun, 27 Nov 2016 22:53:27 +0000 (14:53 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #73549: Use after free when stream is passed to imagepng
Christoph M. Becker [Thu, 17 Nov 2016 12:44:30 +0000 (13:44 +0100)]
Fix #73549: Use after free when stream is passed to imagepng
If a stream is passed to imagepng() or other image output functions,
opposed to a filename, we must not close this stream.
Jakub Zelenka [Sun, 27 Nov 2016 19:05:49 +0000 (19:05 +0000)]
Update UPGRADING with info about AEAD changes in openssl_(en|de)crypt
Jakub Zelenka [Sun, 27 Nov 2016 19:00:05 +0000 (19:00 +0000)]
Do not add extra timeval entropy when OpenSSL 1.1 used
It is already added by OpenSSL so it is not needed
Jakub Zelenka [Sun, 27 Nov 2016 18:54:28 +0000 (18:54 +0000)]
Clean up and fix php_openssl_dh_pub_from_priv
Matteo Beccati [Sun, 27 Nov 2016 09:20:50 +0000 (10:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix occasionaly failing test
Matteo Beccati [Sun, 27 Nov 2016 09:20:38 +0000 (10:20 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix occasionaly failing test
Matteo Beccati [Sun, 27 Nov 2016 09:20:13 +0000 (10:20 +0100)]
Fix occasionaly failing test
Matteo Beccati [Sun, 27 Nov 2016 09:08:14 +0000 (10:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added missing array key to $JUNIT
Matteo Beccati [Sun, 27 Nov 2016 09:08:04 +0000 (10:08 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added missing array key to $JUNIT
projects / php / log