ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-28 14:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix xml_rpc socket shutdown

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9796 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2008-10-02 18:50:09 +00:00
1 parent 70e390c3e8
commit b66e1bad4c
7 files changed
+19 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/formats/mod_shout/Makefile
+1 -1
View File
@@ -11,7 +11,7 @@ MPG123_DIR=$(switch_srcdir)/libs/$(MPG123)
LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la
SHOUTLA=$(SHOUT_DIR)/src/libshout.la
MPG123LA=$(MPG123_DIR)/src/libmpg123/.libs/libmpg123.la
MPG123LA=$(MPG123_DIR)/src/libmpg123/libmpg123.la
LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src
LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA)
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+4 -5
View File
@@ -809,21 +809,19 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime)
ServerCreate(&globals.abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile);
xmlrpc_server_abyss_set_handler(&env, &globals.abyssServer, "/RPC2", registryP);
ServerInit(&globals.abyssServer);
#if 0
if (ServerInit(&globals.abyssServer) != TRUE) {
globals.running = 0;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start HTTP Port %d\n", globals.port);
return SWITCH_STATUS_TERM;
}
#endif
ServerAddHandler(&globals.abyssServer, handler_hook);
ServerAddHandler(&globals.abyssServer, auth_hook);
ServerSetKeepaliveTimeout(&globals.abyssServer, 1);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir);
ServerRun(&globals.abyssServer);
switch_yield(1000000);
globals.running = 0;
return SWITCH_STATUS_TERM;
@@ -834,9 +832,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown)
//globals.abyssServer.running = 0;
//shutdown(globals.abyssServer.listensock, 2);
ServerTerminate(&globals.abyssServer);
while (globals.running) {
do {
switch_yield(100000);
}
} while (globals.running);
return SWITCH_STATUS_SUCCESS;
}