From: Joe Watkins <krakjoe@php.net>
Date: Wed, 18 Jan 2017 10:00:26 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~509
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1fd706d7d3112be71094a28527e6eebeb3a277a;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove more TSRMLS_CC macros
---

a1fd706d7d3112be71094a28527e6eebeb3a277a
diff --cc ext/openssl/openssl.c
index 2ed6075042,9aec7f9d3a..72d0751d7d
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -3915,12 -3916,11 +3915,12 @@@ static EVP_PKEY * php_openssl_generate_
  #ifdef HAVE_EVP_PKEY_EC
  			case OPENSSL_KEYTYPE_EC:
  				{
 +					EC_KEY *eckey;
  					if (req->curve_name == NID_undef) {
- 						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing configuration value: 'curve_name' not set");
+ 						php_error_docref(NULL, E_WARNING, "Missing configuration value: 'curve_name' not set");
  						return NULL;
  					}
 -					EC_KEY *eckey = EC_KEY_new_by_curve_name(req->curve_name);
 +					eckey = EC_KEY_new_by_curve_name(req->curve_name);
  					if (eckey) {
  						EC_KEY_set_asn1_flag(eckey, OPENSSL_EC_NAMED_CURVE);
  						if (EC_KEY_generate_key(eckey) &&