From 1688a62e6c03a218e2f18c92650f6157f39a1304 Mon Sep 17 00:00:00 2001 From: Brian Fertig Date: Mon, 11 Sep 2006 12:06:27 +0000 Subject: [PATCH] Yet another fix. PHP now doesnt crash :) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2639 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/languages/mod_php/apptest.php | 6 ++---- src/mod/languages/mod_php/classFreeswitch.php | 2 +- src/mod/languages/mod_php/mod_php.c | 16 +++++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mod/languages/mod_php/apptest.php b/src/mod/languages/mod_php/apptest.php index b0f253d33a..7cd0da6d80 100644 --- a/src/mod/languages/mod_php/apptest.php +++ b/src/mod/languages/mod_php/apptest.php @@ -8,12 +8,10 @@ */ require("classFreeswitch.php"); -echo "uuid: $uuid\n"; - -$fs = new fs_class_api(); +$fs = new fs_class_api($uuid); // $uuid MUST be there for the class to work. $fs->fs_answer(); -$fs->fs_play_file("/ram/sr8k.wav"); +//$fs->fs_play_file("/ram/sr8k.wav"); ?> diff --git a/src/mod/languages/mod_php/classFreeswitch.php b/src/mod/languages/mod_php/classFreeswitch.php index b15ddb95ca..32dcea8bc4 100644 --- a/src/mod/languages/mod_php/classFreeswitch.php +++ b/src/mod/languages/mod_php/classFreeswitch.php @@ -35,7 +35,7 @@ require("freeswitch.php"); // Required for freeswitch driver to be loaded class fs_class_api { Private $uuid; - function fs_class_api() { + function fs_class_api($uuid) { $this->uuid = $uuid; } diff --git a/src/mod/languages/mod_php/mod_php.c b/src/mod/languages/mod_php/mod_php.c index a53375b26f..0f6976b600 100644 --- a/src/mod/languages/mod_php/mod_php.c +++ b/src/mod/languages/mod_php/mod_php.c @@ -241,9 +241,10 @@ static void php_function(switch_core_session_t *session, char *data) // Clean up after PHP and such php_embed_shutdown(tsrm_ls); - // Return back to the Dialplan - return; + + // Return back to the Dialplan + // Buh bye now! } @@ -288,18 +289,19 @@ void*** tsrm_ls = NULL; } /* - Called when the system shuts down + //Called when the system shuts down SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } -*/ -/* - If it exists, this is called in it's own thread when the module-load completes + + + //If it exists, this is called in it's own thread when the module-load completes SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) { return SWITCH_STATUS_SUCCESS; } -*/ + +*/