From: Brian West <brian@freeswitch.org>
Date: Fri, 16 Jan 2015 15:29:10 +0000 (-0600)
Subject: FS-7156 #resolve
X-Git-Tag: v1.4.16~1^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c880f9a9dda7f7844be5d18a9c242e5ac557e908;p=thirdparty%2Ffreeswitch.git

FS-7156 #resolve
---

diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
index ecce4427b8..5bda3d7c18 100644
--- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
+++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
@@ -337,19 +337,19 @@ static void process_cdr(cdr_data_t *data)
 			switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
 		}
 
-		if (globals.ssl_cert_file) {
+		if (!zstr(globals.ssl_cert_file)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, globals.ssl_cert_file);
 		}
 
-		if (globals.ssl_key_file) {
+		if (!zstr(globals.ssl_key_file)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, globals.ssl_key_file);
 		}
 
-		if (globals.ssl_key_password) {
+		if (!zstr(globals.ssl_key_password)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, globals.ssl_key_password);
 		}
 
-		if (globals.ssl_version) {
+		if (!zstr(globals.ssl_version)) {
 			if (!strcasecmp(globals.ssl_version, "SSLv3")) {
 				switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3);
 			} else if (!strcasecmp(globals.ssl_version, "TLSv1")) {
@@ -357,7 +357,7 @@ static void process_cdr(cdr_data_t *data)
 			}
 		}
 
-		if (globals.ssl_cacert_file) {
+		if (!zstr(globals.ssl_cacert_file)) {
 			switch_curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file);
 		}