diff options
| author | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
| commit | c00424e427930a33e6d8645cc3f23fb78ed29b9f (patch) | |
| tree | 83190e6ac9d0714fc971fe0925a0d935414de91c /ext/openssl/xp_ssl.c | |
| parent | 382f95e6127d52b079d172ccd017cf306402e015 (diff) | |
| download | php-git-c00424e427930a33e6d8645cc3f23fb78ed29b9f.tar.gz | |
bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
Diffstat (limited to 'ext/openssl/xp_ssl.c')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 62c69c4a5a..54562c22e5 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -232,6 +232,8 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) /* {{{ */ zval *val; zend_ulong allowed_depth = OPENSSL_DEFAULT_STREAM_VERIFY_DEPTH; + TSRMLS_FETCH(); + ret = preverify_ok; /* determine the status for the current cert */ @@ -532,6 +534,8 @@ static int win_cert_verify_callback(X509_STORE_CTX *x509_store_ctx, void *arg) / zval *val; zend_bool is_self_signed = 0; + TSRMLS_FETCH(); + stream = (php_stream*)arg; sslsock = (php_openssl_netstream_data_t*)stream->abstract; @@ -983,6 +987,8 @@ static void limit_handshake_reneg(const SSL *ssl) /* {{{ */ if (sslsock->reneg->tokens > sslsock->reneg->limit) { zval *val; + TSRMLS_FETCH(); + sslsock->reneg->should_close = 1; if (PHP_STREAM_CONTEXT(stream) && (val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), |