Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove more TSRMLS_CC macros

diff --cc ext/openssl/openssl.c
index 2ed60750420f2c77cbf5a649a5115f323f1ed1af,9aec7f9d3a0920194c602ac427eb67c273290cf1..72d0751d7d0c875978cc6d26d6fcb2d2898253df
--- 1/ext/openssl/openssl.c
--- 2/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) &&