]>
granicus.if.org Git - php/log
Derick Rethans [Mon, 20 Mar 2017 17:49:34 +0000 (17:49 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Mon, 20 Mar 2017 17:48:15 +0000 (17:48 +0000)]
Fix for #73837: "new DateTime()" with a cast to double
Adam Baratz [Mon, 20 Mar 2017 16:59:21 +0000 (12:59 -0400)]
Remove unused field
Jakub Zelenka [Mon, 20 Mar 2017 16:09:26 +0000 (16:09 +0000)]
Merge branch 'PHP-7.1'
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
Anatol Belski [Mon, 20 Mar 2017 14:41:43 +0000 (15:41 +0100)]
update sdk version for appveyor and set explicit crt
Jakub Zelenka [Mon, 20 Mar 2017 13:54:47 +0000 (13:54 +0000)]
Add note to the UPGRADING about JSON_OBJECT_AS_ARRAY priority changes
Anatol Belski [Sun, 19 Mar 2017 22:19:31 +0000 (23:19 +0100)]
use extra flag to turn on php implementations
Anatol Belski [Sun, 19 Mar 2017 22:10:49 +0000 (23:10 +0100)]
basic support for external libzip
Anatol Belski [Sun, 19 Mar 2017 21:14:14 +0000 (22:14 +0100)]
define corresponding config macros, as we already trick symbols
Sara Golemon [Fri, 17 Mar 2017 22:39:18 +0000 (15:39 -0700)]
Add news entry for bugfix 73991
Sara Golemon [Fri, 17 Mar 2017 22:36:24 +0000 (15:36 -0700)]
Allow JSON_OBJECT_AS_ARRAY option to actually have meaning
Options can only be passed if $assoc is passed, but passing
assoc clobbers any attempt to pass JSON_OBJECT_AS_ARRAY as an
option.
Allow the option to occur in the options field by handling
"null" as default/use-options.
Nikita Popov [Fri, 17 Mar 2017 19:21:28 +0000 (20:21 +0100)]
Merge branch 'PHP-7.1'
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:09:06 +0000 (19:09 +0000)]
Merge branch 'PHP-7.1'
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:13:05 +0000 (18:13 +0000)]
Merge branch 'PHP-7.1'
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:36:03 +0000 (13:36 +0100)]
Merge branch 'PHP-7.1'
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:54:11 +0000 (12:54 +0100)]
Merge branch 'PHP-7.1'
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:13:37 +0000 (18:13 +0000)]
Merge branch 'PHP-7.1'
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:23 +0000 (19:10 +0100)]
Merge branch 'PHP-7.1'
Sebastian Bergmann [Thu, 16 Mar 2017 18:10:07 +0000 (19:10 +0100)]
Fugbix typo
Nikita Popov [Thu, 16 Mar 2017 17:15:13 +0000 (18:15 +0100)]
Merge branch 'PHP-7.1'
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:40:33 +0000 (17:40 +0100)]
Merge branch 'PHP-7.1'
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:43 +0000 (12:57 +0100)]
Merge branch 'PHP-7.1'
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 11:34:36 +0000 (12:34 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 16 Mar 2017 00:26:27 +0000 (01:26 +0100)]
Use call_map to avoid linear call lookup
adrian5 [Wed, 15 Mar 2017 12:16:03 +0000 (13:16 +0100)]
Add comma to comment in php.ini
Thomas Punt [Thu, 16 Mar 2017 08:27:57 +0000 (08:27 +0000)]
Remove more unnecessary checks on Zend's allocator functions
Thomas Punt [Wed, 15 Mar 2017 17:09:26 +0000 (17:09 +0000)]
Remove dead code from BCMath extension
Nikita Popov [Wed, 15 Mar 2017 18:50:26 +0000 (19:50 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 15 Mar 2017 18:06:34 +0000 (19:06 +0100)]
Fix bug #69676
Anatol Belski [Wed, 15 Mar 2017 11:34:36 +0000 (12:34 +0100)]
Use zend_test shared for tests
The snapshot build enables everything it could find. The test run will
load all the shared exts as well, until defined otherwise. So no needs
for an extra action.
Anatol Belski [Wed, 15 Mar 2017 10:43:20 +0000 (11:43 +0100)]
fix shared compilation
Bob Weinand [Tue, 14 Mar 2017 23:09:59 +0000 (00:09 +0100)]
Merge branch 'PHP-7.1'
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:23 +0000 (22:17 +0100)]
Merge branch 'PHP-7.1'
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:47:51 +0000 (18:47 +0000)]
Merge branch 'PHP-7.1'
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
Sara Golemon [Tue, 14 Mar 2017 18:29:22 +0000 (11:29 -0700)]
Remove unnecesary shadow of new_val
Sara Golemon [Tue, 14 Mar 2017 17:30:49 +0000 (10:30 -0700)]
Minor optimizations to array_keys()/array_values()
array_values():
When the input is an empty array or a packed array with no gaps,
return the original array.
array_keys():
When the input is an empty array, return the original array.
When the input is a packed array with no holes
(and no search key specified), populate the return with
a simple range(0, count($input) - 1)
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)
Nikita Popov [Tue, 14 Mar 2017 11:06:58 +0000 (12:06 +0100)]
Fix SKIPIF conditions
Nikita Popov [Sun, 12 Mar 2017 16:19:20 +0000 (17:19 +0100)]
Drop unnecessary allocator return value checks
Anatol Belski [Mon, 13 Mar 2017 11:33:51 +0000 (12:33 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update binary sdk tools version for appveyor
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:59 +0000 (08:17 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
rely on provided openssl.cnf to avoid possible failure with system defaults
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
Nikita Popov [Sun, 12 Mar 2017 21:15:46 +0000 (22:15 +0100)]
Fix __sleep() returning undefined declared properties
Nikita Popov [Sun, 12 Mar 2017 20:32:47 +0000 (21:32 +0100)]
Clean up __sleep() related code
Joe Watkins [Sun, 12 Mar 2017 19:00:06 +0000 (19:00 +0000)]
Merge branch 'pull-request/2414'
* pull-request/2414:
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
Nikita Popov [Fri, 10 Mar 2017 23:33:32 +0000 (00:33 +0100)]
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
David Carlier [Sat, 11 Mar 2017 23:50:50 +0000 (23:50 +0000)]
Drop unnecessary checks of pemalloc() return value
Nikita Popov [Sun, 12 Mar 2017 16:04:02 +0000 (17:04 +0100)]
Merge branch 'PHP-7.1'
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:21:09 +0000 (18:21 +0100)]
Merge branch 'PHP-7.1'
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
Remi Collet [Fri, 10 Mar 2017 10:52:26 +0000 (11:52 +0100)]
Constify to void build warning for C++ ext. [-Wwrite-strings]
Example (with v8js):
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc: In function 'void v8js_execute_script(zval*, v8js_script*, long int, long int, long int, zval**)':
/usr/include/php/Zend/zend.h:204:57: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]
#define zend_bailout() _zend_bailout(__FILE__, __LINE__)
^
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc:633:3: note: in expansion of macro 'zend_bailout'
zend_bailout();
^~~~~~~~~~~~
Xinchen Hui [Fri, 10 Mar 2017 07:17:29 +0000 (15:17 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74218 (ArrayIterator error message is confusing)
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:58:19 +0000 (11:58 -0800)]
Merge branch 'PHP-7.1'
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:32 +0000 (20:48 +0100)]
Merge branch 'PHP-7.1'
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:32:08 +0000 (17:32 +0100)]
Merge branch 'PHP-7.1'
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:45:40 +0000 (16:45 +0100)]
Merge branch 'PHP-7.1'