com php-src: Really fix zts this time: ext/openssl/xp_ssl.c
| From: | Ferenc Kovacs | Date: | Thu, 05 Mar 2015 21:16:05 +0000 |
| Subject: | com php-src: Really fix zts this time: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85277@lists.php.net to get a copy of this message | ||
Commit: 4245c9327be61ba97ccabaefe84d6e5df3ebd1d2
Author: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 14:08:46 -0700
Committer: Ferenc Kovacs <tyrael@php.net> Thu, 5 Mar 2015 22:16:05 +0100
Parents: 4bf74b5af739d26cecee80b581cfdc8df73f6991
Branches: PHP-5.6.7
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4245c9327be61ba97ccabaefe84d6e5df3ebd1d2
Log:
Really fix zts this time
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index bfa46e3..d04b3161 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" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid peer_fingerprint array; [algo =>
fingerprint] form required");
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" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid peer_fingerprint array; [algo =>
fingerprint] form required");
return 0;
}
if (php_x509_fingerprint_cmp(peer, key, Z_STRVAL_PP(current) TSRMLS_CC) != 0) {
@@ -329,8 +329,8 @@ static zend_bool php_x509_fingerprint_match(X509 *peer, zval *val TSRMLS_DC)
return 1;
} else {
- php_error_docref(NULL, E_WARNING,
- "Invalid peer_fingerprint value; fingerprint string or array of the form [algo =>
fingerprint] required" TSRMLS_CC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Invalid peer_fingerprint value; fingerprint string or array of the form [algo =>
fingerprint] required");
}
return 0;