diff options
| author | Sara Golemon <pollita@php.net> | 2018-09-25 12:09:38 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-09-25 12:09:38 -0400 |
| commit | 4baf4964ad2cd30fbb9173bd4263e6d6eb9e649f (patch) | |
| tree | abe25cac01c19766277f2ee7e03eb168b146d5c6 | |
| parent | 682d0f83252783f474e5a6cd9c6f29e40b69d400 (diff) | |
| parent | b5d0eb44c0c1a452a82054e860e8c6a9420ac5df (diff) | |
| download | php-git-4baf4964ad2cd30fbb9173bd4263e6d6eb9e649f.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
| -rw-r--r-- | ext/hash/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 0984b6b2be..1214688fea 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1362,7 +1362,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_file, 0, 0, 2) ZEND_ARG_INFO(0, context) ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, context) + ZEND_ARG_INFO(0, stream_context) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_final, 0, 0, 1) |