Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/openssl/openssl.c
index 7d3a3f03daab110286aba9da40e6eb8fd1ebb01d,7d55878ed76c659a6b268cfa44dde9b54975aea2..818b90e02c407b398f2a993b758ac600f251d4a5
--- 1/ext/openssl/openssl.c
--- 2/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)