From: Jakub Zelenka <bukka@php.net>
Date: Sun, 20 Sep 2015 11:38:58 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~40^2~44^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76783a26d207d7a60af7294e371e324a10a82fd4;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

76783a26d207d7a60af7294e371e324a10a82fd4
diff --cc ext/openssl/openssl.c
index 7d3a3f03da,7d55878ed7..818b90e02c
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -353,20 -349,18 +353,20 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_
  ZEND_END_ARG_INFO()
  
  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, data)
+ 	ZEND_ARG_INFO(1, sealdata)
+ 	ZEND_ARG_INFO(1, ekeys) /* arary */
+ 	ZEND_ARG_INFO(0, pubkeys) /* array */
  	ZEND_ARG_INFO(0, method)
 +	ZEND_ARG_INFO(1, iv)
  ZEND_END_ARG_INFO()
  
  ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0)
-     ZEND_ARG_INFO(0, data)
-     ZEND_ARG_INFO(1, opendata)
-     ZEND_ARG_INFO(0, ekey)
-     ZEND_ARG_INFO(0, privkey)
+ 	ZEND_ARG_INFO(0, data)
+ 	ZEND_ARG_INFO(1, opendata)
+ 	ZEND_ARG_INFO(0, ekey)
+ 	ZEND_ARG_INFO(0, privkey)
 +	ZEND_ARG_INFO(0, iv)
  ZEND_END_ARG_INFO()
  
  ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_md_methods, 0, 0, 0)