cvs: php-src(PHP_5_0) /ext/openssl openssl.c xp_ssl.c

wez Fri Sep 10 07:44:10 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/openssl openssl.c xp_ssl.c Log: MFH: fix for Bug #29296 http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.89&r2=1.89.2.1&ty=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.89 php-src/ext/openssl/openssl.c:1.89.2.1 --- php-src/ext/openssl/openssl.c:1.89 Wed Apr 21 19:02:04 2004 +++ php-src/ext/openssl/openssl.c Fri Sep 10 07:44:09 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.89 2004/04/21 23:02:04 wez Exp $ */ +/* $Id: openssl.c,v 1.89.2.1 2004/09/10 11:44:09 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -632,6 +632,8 @@ } php_stream_xport_register("ssl", php_openssl_ssl_socket_factory TSRMLS_CC); + php_stream_xport_register("sslv3", php_openssl_ssl_socket_factory TSRMLS_CC); + php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory TSRMLS_CC); php_stream_xport_register("tls", php_openssl_ssl_socket_factory TSRMLS_CC); /* override the default tcp socket provider */ http://cvs.php.net/diff.php/php-src/ext/openssl/xp_ssl.c?r1=1.16&r2=1.16.2.1&ty=u Index: php-src/ext/openssl/xp_ssl.c diff -u php-src/ext/openssl/xp_ssl.c:1.16 php-src/ext/openssl/xp_ssl.c:1.16.2.1 --- php-src/ext/openssl/xp_ssl.c:1.16 Sun May 23 06:35:58 2004 +++ php-src/ext/openssl/xp_ssl.c Fri Sep 10 07:44:09 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.16 2004/05/23 10:35:58 wez Exp $ */ +/* $Id: xp_ssl.c,v 1.16.2.1 2004/09/10 11:44:09 wez Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -691,6 +691,12 @@ if (strncmp(proto, "ssl", protolen) == 0) { sslsock->enable_on_connect = 1; sslsock->method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT; + } else if (strncmp(proto, "sslv2", protolen) == 0) { + sslsock->enable_on_connect = 1; + sslsock->method = STREAM_CRYPTO_METHOD_SSLv2_CLIENT; + } else if (strncmp(proto, "sslv3", protolen) == 0) { + sslsock->enable_on_connect = 1; + sslsock->method = STREAM_CRYPTO_METHOD_SSLv3_CLIENT; } else if (strncmp(proto, "tls", protolen) == 0) { sslsock->enable_on_connect = 1; sslsock->method = STREAM_CRYPTO_METHOD_TLS_CLIENT;