From f50ef01a9279bd00a5021e84ca44b59941ddf4ea Mon Sep 17 00:00:00 2001 From: nandika Date: Tue, 7 Sep 2010 07:07:43 +0000 Subject: ssl memory issue fixed, patch 1237 applied git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@993243 13f79535-47bb-0310-9956-ffa450edef68 --- src/core/transport/http/sender/ssl/ssl_stream.c | 4 ---- src/core/transport/http/sender/ssl/ssl_stream.h | 5 +++++ src/core/transport/http/sender/ssl/ssl_utils.c | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/core/transport/http/sender/ssl') diff --git a/src/core/transport/http/sender/ssl/ssl_stream.c b/src/core/transport/http/sender/ssl/ssl_stream.c index 9360f1a..f5aec10 100644 --- a/src/core/transport/http/sender/ssl/ssl_stream.c +++ b/src/core/transport/http/sender/ssl/ssl_stream.c @@ -38,10 +38,6 @@ struct ssl_stream_impl #define AXIS2_INTF_TO_IMPL(stream) ((ssl_stream_impl_t *)(stream)) -void AXIS2_CALL axis2_ssl_stream_free( - axutil_stream_t * stream, - const axutil_env_t * env); - axutil_stream_type_t AXIS2_CALL axis2_ssl_stream_get_type( axutil_stream_t * stream, const axutil_env_t * env); diff --git a/src/core/transport/http/sender/ssl/ssl_stream.h b/src/core/transport/http/sender/ssl/ssl_stream.h index 396da5d..696fc47 100644 --- a/src/core/transport/http/sender/ssl/ssl_stream.h +++ b/src/core/transport/http/sender/ssl/ssl_stream.h @@ -41,6 +41,11 @@ extern "C" axis2_char_t * key_file, axis2_char_t * ssl_pp); + void AXIS2_CALL + axis2_ssl_stream_free( + axutil_stream_t *stream, + const axutil_env_t *env); + /** @} */ #ifdef __cplusplus diff --git a/src/core/transport/http/sender/ssl/ssl_utils.c b/src/core/transport/http/sender/ssl/ssl_utils.c index 01fe993..66cb9e7 100644 --- a/src/core/transport/http/sender/ssl/ssl_utils.c +++ b/src/core/transport/http/sender/ssl/ssl_utils.c @@ -215,7 +215,10 @@ axis2_ssl_utils_cleanup_ssl( if (ssl) { - SSL_shutdown(ssl); + if(SSL_shutdown(ssl)==0) + { + SSL_free(ssl); + } } if (ctx) { -- cgit v1.1-32-gdbae