svn: /php/php-src/trunk/ext/openssl/ openssl.c xp_ssl.c

mj Mon, 25 Apr 2011 16:50:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310476 Log: The project calls itself OpenSSL and not openSSL, so let's keep it that way in our code as well. Changed paths: U php/php-src/trunk/ext/openssl/openssl.c U php/php-src/trunk/ext/openssl/xp_ssl.c Modified: php/php-src/trunk/ext/openssl/openssl.c =================================================================== --- php/php-src/trunk/ext/openssl/openssl.c 2011-04-25 15:22:09 UTC (rev 310475) +++ php/php-src/trunk/ext/openssl/openssl.c 2011-04-25 16:50:30 UTC (rev 310476) @@ -1020,8 +1020,8 @@ ERR_load_crypto_strings(); ERR_load_EVP_strings(); - /* register a resource id number with openSSL so that we can map SSL -> stream structures in - * openSSL callbacks */ + /* register a resource id number with OpenSSL so that we can map SSL -> stream structures in + * OpenSSL callbacks */ ssl_stream_data_index = SSL_get_ex_new_index(0, "PHP stream index", NULL, NULL, NULL); REGISTER_STRING_CONSTANT("OPENSSL_VERSION_TEXT", OPENSSL_VERSION_TEXT, CONST_CS|CONST_PERSISTENT); Modified: php/php-src/trunk/ext/openssl/xp_ssl.c =================================================================== --- php/php-src/trunk/ext/openssl/xp_ssl.c 2011-04-25 15:22:09 UTC (rev 310475) +++ php/php-src/trunk/ext/openssl/xp_ssl.c 2011-04-25 16:50:30 UTC (rev 310476) @@ -330,7 +330,7 @@ break; case STREAM_CRYPTO_METHOD_SSLv2_CLIENT: #ifdef OPENSSL_NO_SSL2 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the OpenSSL library PHP is linked against"); return -1; #else sslsock->is_client = 1; @@ -355,7 +355,7 @@ break; case STREAM_CRYPTO_METHOD_SSLv2_SERVER: #ifdef OPENSSL_NO_SSL2 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the OpenSSL library PHP is linked against"); return -1; #else sslsock->is_client = 0; @@ -923,7 +923,7 @@ sslsock->method = STREAM_CRYPTO_METHOD_SSLv23_CLIENT; } else if (strncmp(proto, "sslv2", protolen) == 0) { #ifdef OPENSSL_NO_SSL2 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the openSSL library PHP is linked against"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSLv2 support is not compiled into the OpenSSL library PHP is linked against"); return NULL; #else sslsock->enable_on_connect = 1;