com php-src: Fix ZTS: ext/openssl/xp_ssl.c
| From: | Daniel Lowrey | Date: | Thu, 05 Mar 2015 19:19:15 +0000 |
| Subject: | com php-src: Fix ZTS: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85270@lists.php.net to get a copy of this message | ||
Commit: c985ec737d8340e941feda05de647cce10b744ea
Author: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 12:19:15 -0700
Parents: 010f17534f6c6a82183253937c75aa689e55e0bc
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c985ec737d8340e941feda05de647cce10b744ea
Log:
Fix ZTS
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 1841770..bfa46e3 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -307,7 +307,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
ulong key_index;
if (!zend_hash_num_elements(Z_ARRVAL_P(val))) {
- php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint]
form required");
+ php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo => fingerprint]
form required" TSRMLS_CC);
return 0;
}
@@ -318,7 +318,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
int key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(val), &key, &key_len,
&key_index, 0, &pos);
if (!(key_type == HASH_KEY_IS_STRING && Z_TYPE_PP(current) == IS_STRING)) {
- php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo =>
fingerprint] form required");
+ php_error_docref(NULL, E_WARNING, "Invalid peer_fingerprint array; [algo =>
fingerprint] form required" TSRMLS_CC);
return 0;
}
if (php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current) TSRMLS_CC) != 0) {
@@ -330,7 +330,7 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
} else {
php_error_docref(NULL, E_WARNING,
- "Invalid peer_fingerprint value; fingerprint string or array of the form [algo =>
fingerprint] required");
+ "Invalid peer_fingerprint value; fingerprint string or array of the form [algo =>
fingerprint] required" TSRMLS_CC);
}
return 0;