Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)

Conflicts:
	ext/openssl/openssl.c

diff --cc ext/openssl/openssl.c
index bce3f202f6ca4cbc63271d0e977f6ce10be53b56,1603009709e46f83f03f38dda17e8fe37bc2e865..dff4cebf06da0b586d3c04023a50c749ff7e608e
--- 1/ext/openssl/openssl.c
--- 2/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -4272,16 -4270,16 +4272,16 @@@ PHP_FUNCTION(openssl_pkcs7_sign
        PKCS7 * p7 = NULL;
        BIO * infile = NULL, * outfile = NULL;
        STACK_OF(X509) *others = NULL;
 -      long certresource = -1, keyresource = -1;
 -      ulong intindex;
 -      uint strindexlen;
 -      HashPosition hpos;
 -      char * strindex;
 -      char * infilename;      int infilename_len;
 -      char * outfilename;     int outfilename_len;
 -      char * extracertsfilename = NULL; int extracertsfilename_len;
 -
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppZZa!|lp!",
 +      zend_resource *certresource = NULL, *keyresource = NULL;
 +      zend_string * strindex;
 +      char * infilename;
 +      size_t infilename_len;
 +      char * outfilename;
 +      size_t outfilename_len;
 +      char * extracertsfilename = NULL;
 +      size_t extracertsfilename_len;
 +
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "ppzza!|lp",
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "ppzza!|lp!",
                                &infilename, &infilename_len, &outfilename, &outfilename_len,
                                &zcert, &zprivkey, &zheaders, &flags, &extracertsfilename,
                                &extracertsfilename_len) == FAILURE) {