diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-09-05 03:19:43 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-09-05 03:19:43 +0200 |
| commit | 28e82cc7148cb910c70c3a25b855f4e47992b822 (patch) | |
| tree | d59c90676ca532f162054f574069906a2dcc9a4c | |
| parent | 8355dfc41a43387ee1ab4ba0bbab93b8b297a59e (diff) | |
| parent | f9ece839943cccd7095a38a9962e4d9e15ddc404 (diff) | |
| download | php-git-28e82cc7148cb910c70c3a25b855f4e47992b822.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70395: Missing ARG_INFO for openssl_seal()
| -rw-r--r-- | ext/openssl/openssl.c | 3 | ||||
| -rw-r--r-- | ext/openssl/tests/bug70395.phpt | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 2ba50c9cc5..63958ac571 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -352,11 +352,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_verify, 0, 0, 3) ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_openssl_seal, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_seal, 0, 0, 4) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(1, sealdata) ZEND_ARG_INFO(1, ekeys) /* arary */ ZEND_ARG_INFO(0, pubkeys) /* array */ + ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0) diff --git a/ext/openssl/tests/bug70395.phpt b/ext/openssl/tests/bug70395.phpt new file mode 100644 index 0000000000..bfa881a0cd --- /dev/null +++ b/ext/openssl/tests/bug70395.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #70395 (Missing ARG_INFO for openssl_seal()) +--SKIPIF-- +<?php +if (!extension_loaded("openssl")) die("skip openssl not loaded"); +?> +--FILE-- +<?php +$func = new ReflectionFunction('openssl_seal'); +$param = $func->getParameters()[4]; +var_dump($param); +var_dump($param->isOptional()); +?> +--EXPECTF-- +object(ReflectionParameter)#%d (1) { + ["name"]=> + string(6) "method" +} +bool(true) |