cvs: php-src(PHP_5_2) /ext/openssl openssl.c
| From: | Mikko Koppanen | Date: | Mon, 20 Apr 2009 10:00:41 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57104@lists.php.net to get a copy of this message | ||
mkoppanen Mon Apr 20 10:00:41 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
Log:
MFH: Closes #47991 SSL streams fail if error stack contains items
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.52&r2=1.98.2.5.2.53&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.52 php-src/ext/openssl/openssl.c:1.98.2.5.2.53
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.52 Sun Mar 29 23:33:01 2009
+++ php-src/ext/openssl/openssl.c Mon Apr 20 10:00:41 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.52 2009/03/29 23:33:01 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.53 2009/04/20 10:00:41 mkoppanen Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3894,6 +3894,7 @@
char *cipherlist = NULL;
int ok = 1;
+ ERR_clear_error();
/* look at context options in the stream and set appropriate verification flags */
if (GET_VER_OPT("verify_peer") && zval_is_true(*val)) {