Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (15852 => 15853)

--- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c	2009-12-08 22:28:52 UTC (rev 15852)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c	2009-12-08 22:51:39 UTC (rev 15853)
@@ -341,15 +341,19 @@
 				
 				if (!domain_name) {
 					if (globals.virtual_host) {
-						domain_name = (char *) r->requestInfo.host;
-						if (!strncasecmp(domain_name, "www.", 3)) {
-							domain_name += 4;
+						if ((domain_name = (char *) r->requestInfo.host)) {
+							if (!strncasecmp(domain_name, "www.", 3)) {
+								domain_name += 4;
+							}
 						}
-					} else if (globals.default_domain) {
-						domain_name = globals.default_domain;
-					} else {
-						domain_name = switch_core_get_variable("domain");
 					}
+					if (!domain_name) {
+						if (globals.default_domain) {
+							domain_name = globals.default_domain;
+						} else {
+							domain_name = switch_core_get_variable("domain");
+						}
+					}
 				}
 
 				if (zstr(user) || zstr(domain_name)) {