]> granicus.if.org Git - php/commitdiff
MFH: The project calls itself OpenSSL and not openSSL, so let's keep it
authorMartin Jansen <mj@php.net>
Mon, 25 Apr 2011 16:51:12 +0000 (16:51 +0000)
committerMartin Jansen <mj@php.net>
Mon, 25 Apr 2011 16:51:12 +0000 (16:51 +0000)
that way in our code as well.

ext/openssl/openssl.c
ext/openssl/xp_ssl.c

index 39067ad95047cb4b48fa3e758b443e15a41bbccb..c79d7c37beb1ce7dac9887684b37b6d544a09106 100644 (file)
@@ -988,8 +988,8 @@ PHP_MINIT_FUNCTION(openssl)
        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);
index 58c36ab39273897e0c91cab1d4349cbc7b8710c0..a9c3a86b1d3c007d42ec793cbf4f3f525bfcf87b 100644 (file)
@@ -330,7 +330,7 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
                        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 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
                        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 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
                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;