mkoppanen               Mon Apr 20 09:44:30 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /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.41.2.28&r2=1.98.2.5.2.41.2.29&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28 
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.28    Sun Mar 29 23:32:34 2009
+++ php-src/ext/openssl/openssl.c       Mon Apr 20 09:44:29 2009
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.28 2009/03/29 23:32:34 scottmac Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.29 2009/04/20 09:44:29 mkoppanen Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -4367,6 +4367,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)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to