com php-src: Implement logic for OpenSSL error storing: ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Sat, 09 Jan 2016 17:45:08 +0000 |
| Subject: | com php-src: Implement logic for OpenSSL error storing: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92454@lists.php.net to get a copy of this message | ||
Commit: 19d40fc2b0d957b82a2045ff5f6a4861ca53f6e1
Author: Jakub Zelenka <bukka@php.net> Sat, 9 Jan 2016 17:45:08 +0000
Parents: 1d111320b947776efe375cedc700e9250e5c6e5a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=19d40fc2b0d957b82a2045ff5f6a4861ca53f6e1
Log:
Implement logic for OpenSSL error storing
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 1b23bd5..ac0b1cd 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1367,9 +1367,27 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
/* {{{ php_openssl_store_errors */
void php_openssl_store_errors()
{
+ struct php_openssl_errors *errors;
+ int error_code = ERR_get_error();
+
+ if (!error_code) {
+ return;
+ }
+
if (!OPENSSL_G(errors)) {
OPENSSL_G(errors) = ecalloc(1, sizeof(struct php_openssl_errors));
}
+
+ errors = OPENSSL_G(errors);
+
+ do {
+ errors->top = (errors->top + 1) % ERR_NUM_ERRORS;
+ if (errors->top == errors->bottom) {
+ errors->bottom = (errors->bottom + 1) % ERR_NUM_ERRORS;
+ }
+ errors->buffer[errors->top] = error_code;
+ } while ((error_code = ERR_get_error()));
+
}
/* }}} */