From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 6 Mar 2015 18:31:04 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~781
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c35cb6a52b2898f79d91738094a4d711de2553;p=php

Merge branch 'PHP-5.6'

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

Conflicts:
	ext/openssl/openssl.c
---

00c35cb6a52b2898f79d91738094a4d711de2553
diff --cc ext/openssl/openssl.c
index bce3f202f6,1603009709..dff4cebf06
--- a/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) {