Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit 56110587661e · 2019-04-15T10:54:31.000+02:00
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -1867,7 +1867,7 @@ static int php_openssl_enable_crypto(php_stream *stream,
 {
 	int n;
 	int retry = 1;
-	int cert_captured;
+	int cert_captured = 0;
 	X509 *peer_cert;
 
 	if (cparam->inputs.activate && !sslsock->ssl_active) {

Original file line number	Diff line number	Diff line change
`@@ -1867,7 +1867,7 @@ static int php_openssl_enable_crypto(php_stream *stream,`
`1867`	`1867`	`{`
`1868`	`1868`	`int n;`
`1869`	`1869`	`int retry = 1;`
`1870`		`- int cert_captured;`
	`1870`	`+ int cert_captured = 0;`
`1871`	`1871`	`X509 *peer_cert;`
`1872`	`1872`
`1873`	`1873`	`if (cparam->inputs.activate && !sslsock->ssl_active) {`