summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansen <mj@php.net>2011-04-25 16:50:30 +0000
committerMartin Jansen <mj@php.net>2011-04-25 16:50:30 +0000
commit0c8438462c3ef6e1481b4d66d723e9c3e19a2800 (patch)
tree5fe50873ed12e750e86df02e0027dd4644b196e6
parentb948b7d8eaf1458afe8cbdcd01d3b5e24625b7b2 (diff)
downloadphp-git-0c8438462c3ef6e1481b4d66d723e9c3e19a2800.tar.gz
The project calls itself OpenSSL and not openSSL, so let's keep it
that way in our code as well.
-rw-r--r--ext/openssl/openssl.c4
-rw-r--r--ext/openssl/xp_ssl.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e9dd60cae6..784049f626 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1020,8 +1020,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);
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index f3efe91245..e825e791e6 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -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;