]>
granicus.if.org Git - php/log
Remi Collet [Wed, 29 Mar 2017 05:38:40 +0000 (07:38 +0200)]
relax more this test
Remi Collet [Wed, 29 Mar 2017 05:25:01 +0000 (07:25 +0200)]
Fix buid with system libsqlite, see bug #74217
SQLITE_DETERMINISTIC only exists in recent version
e.g. missing on 3.7 which is the default on RHEL/CentOS-7
and probably others (wheezy have 3.7, jessie 3.8...)
Remi Collet [Wed, 29 Mar 2017 05:01:14 +0000 (07:01 +0200)]
relax test failing in fast computer
Ben Scholzen [Mon, 27 Mar 2017 17:47:14 +0000 (19:47 +0200)]
Let MessageFormatter and IntlDateFormatter accept DateTimeImmutable as well
Nikita Popov [Tue, 28 Mar 2017 20:08:58 +0000 (22:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 17 Mar 2017 11:48:03 +0000 (12:48 +0100)]
Disable block pass for large functions
(Backport of
7ea261685f179a7cddcc4196fc7f3f12572c3d49 to 7.0.)
Joe Watkins [Tue, 28 Mar 2017 14:22:10 +0000 (15:22 +0100)]
prepare next
Anatol Belski [Tue, 28 Mar 2017 11:14:51 +0000 (13:14 +0200)]
update NEWS
Anatol Belski [Tue, 28 Mar 2017 11:13:24 +0000 (13:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Revert "Fixed bug #61471"
Anatol Belski [Tue, 28 Mar 2017 11:12:27 +0000 (13:12 +0200)]
update NEWS
Anatol Belski [Tue, 28 Mar 2017 11:06:38 +0000 (13:06 +0200)]
Revert "Fixed bug #61471"
This reverts commit
80c8d84af303d2fddc9ba9f181c7117b9040811d .
Anatol Belski [Tue, 28 Mar 2017 09:49:46 +0000 (11:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepare next
Anatol Belski [Tue, 28 Mar 2017 09:49:04 +0000 (11:49 +0200)]
prepare next
Anatol Belski [Tue, 28 Mar 2017 09:44:13 +0000 (11:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 28 Mar 2017 09:43:54 +0000 (11:43 +0200)]
update NEWS
Anatol Belski [Tue, 28 Mar 2017 09:43:02 +0000 (11:43 +0200)]
update NEWS
Anatol Belski [Mon, 27 Mar 2017 17:42:24 +0000 (19:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
deps updated, cherry-pick
88642decf9ab59d206db515990886b0761bfa835
add test for bug #74230
Anatol Belski [Mon, 27 Mar 2017 17:38:20 +0000 (19:38 +0200)]
Anatol Belski [Mon, 27 Mar 2017 17:33:51 +0000 (19:33 +0200)]
add test for bug #74230
x-xiang [Wed, 8 Mar 2017 03:43:14 +0000 (11:43 +0800)]
Don't retain mt_rand() seeds across requests
In particular, this prevents manual seeding of mt_rand() to leak
across requests.
Derick Rethans [Mon, 27 Mar 2017 17:01:30 +0000 (18:01 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Mon, 27 Mar 2017 17:01:22 +0000 (18:01 +0100)]
Forgot to update the output in the test too
Anatol Belski [Mon, 27 Mar 2017 16:49:59 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
always use staging deps for CI, that's what we have a CI for as well
Anatol Belski [Mon, 27 Mar 2017 16:07:16 +0000 (18:07 +0200)]
always use staging deps for CI, that's what we have a CI for as well
Derick Rethans [Mon, 27 Mar 2017 10:28:35 +0000 (11:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Mon, 27 Mar 2017 10:28:16 +0000 (11:28 +0100)]
Fixed test for #33415 due to data fixes.
Derick Rethans [Fri, 24 Mar 2017 12:25:26 +0000 (12:25 +0000)]
Updated to version 2017.2 (2017b)
Derick Rethans [Fri, 24 Mar 2017 12:25:25 +0000 (12:25 +0000)]
Updated to version 2017.2 (2017b)
Derick Rethans [Fri, 24 Mar 2017 12:25:25 +0000 (12:25 +0000)]
Empty merge
Derick Rethans [Fri, 24 Mar 2017 11:39:32 +0000 (11:39 +0000)]
Added a test case to make sure microseconds work.
Nikita Popov [Thu, 23 Mar 2017 21:49:51 +0000 (22:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 23 Mar 2017 21:48:45 +0000 (22:48 +0100)]
Fix sequencing UB
Nikita Popov [Thu, 23 Mar 2017 21:42:57 +0000 (22:42 +0100)]
Fix lineno for AST_ZVAL nodes
Sara Golemon [Thu, 23 Mar 2017 20:38:58 +0000 (13:38 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug where `yield from` is captured too greedily
Sara Golemon [Thu, 23 Mar 2017 19:27:33 +0000 (12:27 -0700)]
Fix bug where `yield from` is captured too greedily
In the following piece of code:
```php
function from1234($x) {
return $x;
}
function foo($x) {
yield from1234($x);
}
```
The statement inside foo is taken as `yield from` `1234($x)`
which is neither the intent, nor even legal syntax for an fcall.
Do a lookahead for breaking non-label characters after the
`yield from` and only accept it if they occur.
Dmitry Stogov [Thu, 23 Mar 2017 15:59:56 +0000 (18:59 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed uninitialized data
Dmitry Stogov [Thu, 23 Mar 2017 15:59:27 +0000 (18:59 +0300)]
Fixed uninitialized data
Anatol Belski [Thu, 23 Mar 2017 12:14:17 +0000 (13:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
adjust deps dir naming scheme
Anatol Belski [Thu, 23 Mar 2017 12:00:14 +0000 (13:00 +0100)]
adjust deps dir naming scheme
not principal, just to have it same way as everywhere
Anatol Belski [Tue, 21 Mar 2017 11:44:36 +0000 (12:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
explicitly ignore php.ini for proc open tests
Anatol Belski [Tue, 21 Mar 2017 11:39:40 +0000 (12:39 +0100)]
explicitly ignore php.ini for proc open tests
In some cases, when an environment is unclean, tests might get stuck fe
when some incorrect ini file is loaded. As the test depends on the core
only, it is safer to explicitly ignore the ini. Any ini can be passed in
the cmd itself, if needed.
Derick Rethans [Mon, 20 Mar 2017 17:48:15 +0000 (17:48 +0000)]
Fix for #73837: "new DateTime()" with a cast to double
Jakub Zelenka [Mon, 20 Mar 2017 16:08:16 +0000 (16:08 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Mon, 20 Mar 2017 16:07:12 +0000 (16:07 +0000)]
Lower timeout in test for but #72333
Nikita Popov [Fri, 17 Mar 2017 19:20:17 +0000 (20:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 17 Mar 2017 19:19:40 +0000 (20:19 +0100)]
Fix bug #74265
Jakub Zelenka [Fri, 17 Mar 2017 19:08:26 +0000 (19:08 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Fri, 17 Mar 2017 19:07:32 +0000 (19:07 +0000)]
Make test 002 for bug #65538 not to use https in cafile
Jakub Zelenka [Fri, 17 Mar 2017 18:12:37 +0000 (18:12 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Fri, 17 Mar 2017 18:11:50 +0000 (18:11 +0000)]
Consume data by server in test for bug #72333
Client should be able to write more data and prevent time out
Nikita Popov [Fri, 17 Mar 2017 12:35:50 +0000 (13:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 17 Mar 2017 12:34:18 +0000 (13:34 +0100)]
Fix AST start lineno for list nodes
If the node is initialized with children, check if a child has a
lower start lineno, similar to what we do for fixed-sized nodes
as well.
Nikita Popov [Fri, 17 Mar 2017 11:48:03 +0000 (12:48 +0100)]
Disable block pass for large functions
This is the last fix for bug #74250.
Jakub Zelenka [Thu, 16 Mar 2017 18:12:54 +0000 (18:12 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Thu, 16 Mar 2017 18:11:56 +0000 (18:11 +0000)]
Make test for bug #72333 a bit more reliable
Sebastian Bergmann [Thu, 16 Mar 2017 18:10:07 +0000 (19:10 +0100)]
Fugbix typo
Nikita Popov [Thu, 16 Mar 2017 17:11:27 +0000 (18:11 +0100)]
Further optimize worklist management
Instead of always popping the first elements, do multiple complete
iterations of the worklist until it is empty.
Nikita Popov [Thu, 16 Mar 2017 16:32:27 +0000 (17:32 +0100)]
Slightly optimize worklist management
Avoid scanning the worklist twice on every iteration.
Nikita Popov [Thu, 16 Mar 2017 16:02:11 +0000 (17:02 +0100)]
Optimize DJ spanning tree back-edge check
Instead of walking the DJ spanning tree upwards, record entry and
exit times during the DFS and use these to determine whether CJ
edges are sp-back edges.
Nikita Popov [Thu, 16 Mar 2017 15:49:36 +0000 (16:49 +0100)]
Sort blocks in loop identification
The previous implementation was doing O(blocks*levels) iterations,
which for a linear-ish domtree is O(blocks^2). Avoid this by sorting
the blocks by decreasing level upfront.
Nikita Popov [Thu, 16 Mar 2017 11:57:36 +0000 (12:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Adam Saponara [Thu, 9 Mar 2017 19:27:01 +0000 (14:27 -0500)]
Return FALSE if error_log fails to write all bytes
Nikita Popov [Thu, 16 Mar 2017 00:26:27 +0000 (01:26 +0100)]
Use call_map to avoid linear call lookup
Nikita Popov [Wed, 15 Mar 2017 18:06:34 +0000 (19:06 +0100)]
Fix bug #69676
Bob Weinand [Tue, 14 Mar 2017 23:09:42 +0000 (00:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Matt Bonneau [Mon, 13 Mar 2017 04:11:30 +0000 (00:11 -0400)]
Fixed bug #74240 (deflate_add can allocate too much memory)
Bob Weinand [Tue, 14 Mar 2017 21:17:10 +0000 (22:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Tue, 14 Mar 2017 21:15:41 +0000 (22:15 +0100)]
Fix stream context changes leaking into copies of previous context
Jakub Zelenka [Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Tue, 14 Mar 2017 18:43:39 +0000 (18:43 +0000)]
Merge branch 'bug72333' into PHP-7.0
Jakub Zelenka [Tue, 14 Mar 2017 18:41:23 +0000 (18:41 +0000)]
Replace NEWS entry for #74159 with #72333
The #74159 is duplicate
Jakub Zelenka [Mon, 13 Mar 2017 21:05:09 +0000 (21:05 +0000)]
Skip bug74159 test for OpenSSL lower than 1.0.1
Jakub Zelenka [Sat, 11 Mar 2017 19:38:26 +0000 (19:38 +0000)]
Tidy up test for bug72333
Jakub Zelenka [Wed, 8 Mar 2017 19:49:39 +0000 (19:49 +0000)]
Speed up test for bug72333
It reliably fails without the xp_ssl.c so it is good with smaller usleep
Jakub Zelenka [Wed, 8 Mar 2017 19:38:54 +0000 (19:38 +0000)]
Fix indent and add comment
Jakub Zelenka [Wed, 8 Mar 2017 19:30:02 +0000 (19:30 +0000)]
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
Jakub Zelenka [Mon, 6 Mar 2017 19:43:25 +0000 (19:43 +0000)]
Remove extra SSL mode settings
Jakub Zelenka [Sun, 22 Jan 2017 20:44:29 +0000 (20:44 +0000)]
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
Anatol Belski [Mon, 13 Mar 2017 11:32:46 +0000 (12:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update binary sdk tools version for appveyor
Anatol Belski [Mon, 13 Mar 2017 11:31:31 +0000 (12:31 +0100)]
update binary sdk tools version for appveyor
Remi Collet [Mon, 13 Mar 2017 07:17:42 +0000 (08:17 +0100)]
rely on provided openssl.cnf to avoid possible failure with system defaults
andrewnester [Fri, 10 Mar 2017 17:34:23 +0000 (20:34 +0300)]
Implement FR #74217: deterministic sqlite functions
Nikita Popov [Fri, 10 Mar 2017 17:20:49 +0000 (18:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 9 Mar 2017 20:09:36 +0000 (21:09 +0100)]
Fixed bug #73960
Xinchen Hui [Fri, 10 Mar 2017 07:16:01 +0000 (15:16 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74218 (ArrayIterator error message is confusing)
Xinchen Hui [Fri, 10 Mar 2017 07:15:31 +0000 (15:15 +0800)]
Fixed bug #74218 (ArrayIterator error message is confusing)
Sara Golemon [Thu, 9 Mar 2017 19:56:54 +0000 (11:56 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add NEWS entry for
bab0b99f
Sara Golemon [Thu, 9 Mar 2017 19:47:29 +0000 (11:47 -0800)]
Add NEWS entry for
bab0b99f
Nikita Popov [Thu, 9 Mar 2017 19:48:14 +0000 (20:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 9 Mar 2017 19:47:06 +0000 (20:47 +0100)]
Fixed bug #73370
If len=0 malloc() is allowed to return NULL.
Nikita Popov [Thu, 9 Mar 2017 16:31:52 +0000 (17:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Thomas Orozco [Thu, 9 Jun 2016 08:45:40 +0000 (10:45 +0200)]
Fixed bug #71003: Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
Nikita Popov [Thu, 9 Mar 2017 15:44:25 +0000 (16:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
mcq8 [Fri, 3 Jun 2016 19:28:20 +0000 (19:28 +0000)]
Fixed bug #72096 Swatch time value incorrect for dates before 1970
Joe Watkins [Thu, 9 Mar 2017 07:42:32 +0000 (07:42 +0000)]
Fix bug #74149 static embed SAPI linkage error
andrewnester [Thu, 2 Mar 2017 13:59:32 +0000 (16:59 +0300)]
Fixed bug #74058
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
Sara Golemon [Tue, 7 Mar 2017 20:11:22 +0000 (12:11 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Detect invalid port in xp_socket parse ip address
Sara Golemon [Tue, 7 Mar 2017 19:27:46 +0000 (11:27 -0800)]
Detect invalid port in xp_socket parse ip address
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)
However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:
fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')
Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.
Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there. atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.
The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.
This diff replaces atoi() with strtol() and inspects the
stop character. If additional "garbage" of any kind is found,
it fails and returns an error.
Anatol Belski [Tue, 7 Mar 2017 14:27:57 +0000 (15:27 +0100)]
sync with the incremental and inter-file analysis option
available as of cppcheck 1.77
Nikita Popov [Tue, 7 Mar 2017 12:17:33 +0000 (13:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1