]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 11 Feb 2017 23:20:06 +0000 (00:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 11 Feb 2017 23:19:17 +0000 (00:19 +0100)]
run-tests: Exit 1 on BORKED tests
Nikita Popov [Sat, 11 Feb 2017 23:15:46 +0000 (00:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Adam Saponara [Sat, 11 Feb 2017 04:58:25 +0000 (23:58 -0500)]
Fixed bug #73118
Nikita Popov [Sat, 11 Feb 2017 23:06:20 +0000 (00:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Denis Yeldandi [Thu, 9 Feb 2017 07:22:37 +0000 (10:22 +0300)]
Fixed bug #69860
Anatol Belski [Sat, 11 Feb 2017 13:51:15 +0000 (14:51 +0100)]
add missing datatype as sync for
5113909
Derick Rethans [Sat, 11 Feb 2017 11:10:01 +0000 (11:10 +0000)]
Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
Xinchen Hui [Fri, 10 Feb 2017 16:01:38 +0000 (00:01 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:09 +0000 (00:01 +0800)]
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 06:26:18 +0000 (14:26 +0800)]
Update NEWs
Xinchen Hui [Fri, 10 Feb 2017 06:24:44 +0000 (14:24 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:24:01 +0000 (14:24 +0800)]
Fixed bug #74019 (Segfault with list)
Nikita Popov [Wed, 8 Feb 2017 00:10:37 +0000 (01:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Zheng SHAO [Wed, 18 Jan 2017 09:50:21 +0000 (18:50 +0900)]
Fixed bug #61471
Nikita Popov [Wed, 8 Feb 2017 00:00:46 +0000 (01:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
dreamsxin [Tue, 7 Feb 2017 03:36:22 +0000 (11:36 +0800)]
Add #ifndef restrict
Nikita Popov [Tue, 7 Feb 2017 23:53:36 +0000 (00:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christian Schmidt [Thu, 2 Feb 2017 17:52:27 +0000 (18:52 +0100)]
Fix detection of isnan and isinf
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
Anatol Belski [Tue, 7 Feb 2017 12:18:38 +0000 (13:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use some dynamically generated NAN as well
Anatol Belski [Tue, 7 Feb 2017 12:16:30 +0000 (13:16 +0100)]
use some dynamically generated NAN as well
Anatol Belski [Tue, 7 Feb 2017 11:03:21 +0000 (12:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
switch to smart str conversion routine to hide exact NAN type
Anatol Belski [Tue, 7 Feb 2017 11:01:14 +0000 (12:01 +0100)]
switch to smart str conversion routine to hide exact NAN type
see https://github.com/php/php-src/pull/2356#issuecomment-
277564135
Nikita Popov [Mon, 6 Feb 2017 00:46:01 +0000 (01:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 6 Feb 2017 00:45:53 +0000 (01:45 +0100)]
Revert "Fix detection of isnan and isinf"
This reverts commit
9ea0949f43959ff0cf519e7a10ef9de7a538cde3 .
Nikita Popov [Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christian Schmidt [Thu, 2 Feb 2017 17:52:27 +0000 (18:52 +0100)]
Fix detection of isnan and isinf
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
Andrea Faulds [Sun, 5 Feb 2017 01:31:42 +0000 (01:31 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Sun, 5 Feb 2017 01:30:20 +0000 (01:30 +0000)]
Fix bug #73954
Nikita Popov [Fri, 3 Feb 2017 17:42:19 +0000 (18:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 3 Feb 2017 17:41:36 +0000 (18:41 +0100)]
Revert "Merge branch 'pull-request/2344' into PHP-7.0"
This reverts commit
6988d070ea8c7d44452d8c98e594d65ea722a1d8 , reversing
changes made to
75ad2b301a047209e7b5a6b5912eb589cfbc773d .
Nikita Popov [Fri, 3 Feb 2017 17:29:58 +0000 (18:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
andrewnester [Fri, 3 Feb 2017 08:57:16 +0000 (11:57 +0300)]
Fixed bug #74035
Nikita Popov [Fri, 3 Feb 2017 16:54:39 +0000 (17:54 +0100)]
Fixed bug #74041
Joe Watkins [Fri, 3 Feb 2017 06:12:20 +0000 (06:12 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
Joe Watkins [Fri, 3 Feb 2017 06:10:19 +0000 (06:10 +0000)]
Merge branch 'pull-request/2344' into PHP-7.0
* pull-request/2344:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
somedaysummer [Fri, 27 Jan 2017 20:20:07 +0000 (15:20 -0500)]
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
Joe Watkins [Fri, 3 Feb 2017 06:00:53 +0000 (06:00 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_9.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 06:00:34 +0000 (06:00 +0000)]
Merge branch 'pull-request/2359' into PHP-7.0
* pull-request/2359:
increase wait time in timeout_variation_9.phpt by 1 second
Rodrigo Prado [Wed, 1 Feb 2017 23:12:05 +0000 (21:12 -0200)]
increase wait time in timeout_variation_9.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_10.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 05:54:50 +0000 (05:54 +0000)]
Merge branch 'pull-request/2360' into PHP-7.0
* pull-request/2360:
increase wait time in timeout_variation_10.phpt by 1 second
Rodrigo Prado [Wed, 1 Feb 2017 23:22:35 +0000 (15:22 -0800)]
increase wait time in timeout_variation_10.phpt by 1 second
Nikita Popov [Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Tue, 31 Jan 2017 17:25:05 +0000 (09:25 -0800)]
BUG #73998: Numeric properties are not accessible from get_object_vars
Nikita Popov [Thu, 2 Feb 2017 17:14:50 +0000 (18:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Matěj Humpál [Thu, 2 Feb 2017 09:24:00 +0000 (10:24 +0100)]
Fix bug #74031
Fix incorrect parameter count for imagepng function
Nikita Popov [Thu, 2 Feb 2017 17:06:47 +0000 (18:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 2 Feb 2017 15:04:02 +0000 (16:04 +0100)]
Fix bug #73807
Anatol Belski [Thu, 2 Feb 2017 13:21:31 +0000 (14:21 +0100)]
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 13:20:53 +0000 (14:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 13:19:35 +0000 (14:19 +0100)]
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 12:06:31 +0000 (13:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
Anatol Belski [Thu, 2 Feb 2017 11:48:12 +0000 (12:48 +0100)]
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
Anatol Belski [Thu, 2 Feb 2017 00:35:22 +0000 (01:35 +0100)]
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 00:34:48 +0000 (01:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Thu, 2 Feb 2017 00:33:41 +0000 (01:33 +0100)]
update NEWS
Anatol Belski [Wed, 1 Feb 2017 19:02:20 +0000 (20:02 +0100)]
remove the reverted NEWS entry
Anatol Belski [Wed, 1 Feb 2017 19:01:40 +0000 (20:01 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS with the reverted stuff
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
Anatol Belski [Wed, 1 Feb 2017 19:00:32 +0000 (20:00 +0100)]
sync NEWS with the reverted stuff
Anatol Belski [Wed, 1 Feb 2017 18:59:24 +0000 (19:59 +0100)]
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
This reverts commit
2fcf1259c6a9c1d70bcdfb96aeabc54c47e2a4a0 .
Anatol Belski [Wed, 1 Feb 2017 18:59:18 +0000 (19:59 +0100)]
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
This reverts commit
62938bf08806129b42b17e74d79a450c30d4ff30 .
Joe Watkins [Wed, 1 Feb 2017 18:33:58 +0000 (18:33 +0000)]
Revert "Inheritance checks should not ignore parents if these implement an interface"
This reverts commit
b67eb3440bb244adf6957bf2c68aeeaa6efc8c8d .
Joe Watkins [Wed, 1 Feb 2017 18:33:47 +0000 (18:33 +0000)]
Revert "Added tests demonstrating the same effect with abstracts"
This reverts commit
c11b2b809d349399c8f4b54c6bf24078dece455e .
Dmitry Stogov [Wed, 1 Feb 2017 14:37:40 +0000 (17:37 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
typo
Dmitry Stogov [Wed, 1 Feb 2017 14:36:55 +0000 (17:36 +0300)]
typo
Dmitry Stogov [Wed, 1 Feb 2017 13:05:57 +0000 (16:05 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fixed macro
Dmitry Stogov [Wed, 1 Feb 2017 13:05:33 +0000 (16:05 +0300)]
fixed macro
Anatol Belski [Wed, 1 Feb 2017 12:45:45 +0000 (13:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix possible NULL dereference
Anatol Belski [Wed, 1 Feb 2017 12:43:33 +0000 (13:43 +0100)]
fix possible NULL dereference
Anatol Belski [Wed, 1 Feb 2017 11:57:02 +0000 (12:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove unused var
use zend_string API
Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
Anatol Belski [Wed, 1 Feb 2017 11:49:32 +0000 (12:49 +0100)]
remove unused var
Anatol Belski [Wed, 1 Feb 2017 11:45:19 +0000 (12:45 +0100)]
use zend_string API
Anatol Belski [Wed, 1 Feb 2017 11:36:14 +0000 (12:36 +0100)]
Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
Anatol Belski [Wed, 1 Feb 2017 11:00:39 +0000 (12:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test for 32bits (int -> float)
Anatol Belski [Wed, 1 Feb 2017 10:59:44 +0000 (11:59 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test for 32bits (int -> float)
Remi Collet [Wed, 1 Feb 2017 09:25:30 +0000 (10:25 +0100)]
fix test for 32bits (int -> float)
(cherry picked from commit
0f1ae93bfa2feb3d0fd0b8d3036148df8ef856e2 )
Remi Collet [Wed, 1 Feb 2017 09:25:54 +0000 (10:25 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test for 32bits (int -> float)
Remi Collet [Wed, 1 Feb 2017 09:25:30 +0000 (10:25 +0100)]
fix test for 32bits (int -> float)
Anatol Belski [Tue, 31 Jan 2017 17:28:29 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add a primitive debug facility to sendmail
Anatol Belski [Tue, 31 Jan 2017 17:25:36 +0000 (18:25 +0100)]
add a primitive debug facility to sendmail
Anatol Belski [Tue, 31 Jan 2017 13:22:30 +0000 (14:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "backport
51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0"
Anatol Belski [Tue, 31 Jan 2017 13:21:20 +0000 (14:21 +0100)]
Joe Watkins [Tue, 31 Jan 2017 12:48:31 +0000 (12:48 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
bump versions for next in dev
Joe Watkins [Tue, 31 Jan 2017 12:48:05 +0000 (12:48 +0000)]
bump versions
Anatol Belski [Tue, 31 Jan 2017 10:20:10 +0000 (11:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
bump versions for next in dev
Anatol Belski [Tue, 31 Jan 2017 10:18:23 +0000 (11:18 +0100)]
bump versions for next in dev
Joe Watkins [Tue, 31 Jan 2017 05:36:16 +0000 (05:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
removed additional ";" from run-tests.php
Rodrigo Prado [Mon, 30 Jan 2017 22:06:09 +0000 (20:06 -0200)]
removed additional ";" from run-tests.php
Anatol Belski [Mon, 30 Jan 2017 21:35:46 +0000 (22:35 +0100)]
update NEWS
Anatol Belski [Mon, 30 Jan 2017 21:35:14 +0000 (22:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 30 Jan 2017 21:34:14 +0000 (22:34 +0100)]
update NEWS
Sara Golemon [Mon, 30 Jan 2017 17:02:42 +0000 (09:02 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Securely zero the hash context key
Sara Golemon [Mon, 30 Jan 2017 16:57:17 +0000 (08:57 -0800)]
Securely zero the hash context key
Anatol Belski [Mon, 30 Jan 2017 11:46:11 +0000 (12:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73983 crash on finish work with phar in cli + opcache
Anatol Belski [Mon, 30 Jan 2017 11:25:50 +0000 (12:25 +0100)]
Fixed bug #73983 crash on finish work with phar in cli + opcache
The file_cache_only option causes the storage to be per process,
furthermore the arena is destroyed per request. Thus, zend_string's
can't survive between request and the permanent flag should not
be set. This is already done with the file cache part, but the
persistency part is used in various scenarios and should respect
this case as well. In this particular bug, the pcre pattern cache
needs to survive between requests and uses pattern strings as hash
keys. One more case relevant here would be various situations where
the flow disables the use of shared memory.
Joe Watkins [Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
Joe Watkins [Mon, 30 Jan 2017 11:26:02 +0000 (11:26 +0000)]
Merge branch 'pull-request/2348' into PHP-7.0
* pull-request/2348:
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
jhdxr [Mon, 30 Jan 2017 09:48:00 +0000 (17:48 +0800)]
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
Anatol Belski [Mon, 30 Jan 2017 10:41:59 +0000 (11:41 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move id initialization into ctor