windows warnings fixes and formatting for mod_php.c
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2652 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
parent
941d97f8a2
commit
fb4c59351a
|
|
@ -32,7 +32,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _REENTRANT
|
||||
#define _REENTRANT
|
||||
#endif
|
||||
|
|
@ -41,8 +40,19 @@
|
|||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
//disable warnings for malformed header files
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4127 4311 4133 4244 4201)
|
||||
#define _USE_32BIT_TIME_T 1
|
||||
#endif
|
||||
|
||||
#include <sapi/embed/php_embed.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#ifdef ZTS
|
||||
zend_compiler_globals *compiler_globals;
|
||||
zend_executor_globals *executor_globals;
|
||||
|
|
@ -50,21 +60,18 @@
|
|||
sapi_globals_struct *sapi_globals;
|
||||
#endif
|
||||
|
||||
|
||||
#include <switch.h>
|
||||
|
||||
const char modname[] = "mod_php";
|
||||
|
||||
static int sapi_mod_php_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
|
||||
{
|
||||
|
||||
char buffer[4096];
|
||||
unsigned int i;
|
||||
int j = 0;
|
||||
FILE *fp = fopen("mod_php.log", "a");
|
||||
fwrite(str, str_length, sizeof(char), fp);
|
||||
fclose(fp);
|
||||
|
||||
|
||||
char buffer[4096];
|
||||
int i, j = 0;
|
||||
for(i = 0; i < str_length; i++) {
|
||||
buffer[j++] = str[i];
|
||||
if(str[i] == 10) { /* new line */
|
||||
|
|
@ -157,7 +164,6 @@ void mod_php_error_handler(int type, const char *error_filename, const uint erro
|
|||
efree(buffer);
|
||||
zend_bailout();
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
// Log if necessary
|
||||
|
|
@ -187,24 +193,24 @@ typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...);
|
|||
static void php_function(switch_core_session_t *session, char *data)
|
||||
{
|
||||
char *uuid = switch_core_session_get_uuid(session);
|
||||
uint32_t ulen = strlen(uuid);
|
||||
uint32_t len = strlen((char *) data) + ulen + 2;
|
||||
size_t ulen = strlen(uuid);
|
||||
size_t len = strlen((char *) data) + ulen + 2;
|
||||
char *mydata = switch_core_session_alloc(session, len);
|
||||
int argc, retval;
|
||||
char *argv[5];
|
||||
char php_code[1024];
|
||||
void*** tsrm_ls = NULL;
|
||||
zend_file_handle script;
|
||||
zval *php_uuid;
|
||||
|
||||
snprintf(mydata, len, "%s %s", uuid, data);
|
||||
|
||||
argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0])));
|
||||
|
||||
sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]);
|
||||
//sprintf(php_code, "include('%s');", argv[1]);
|
||||
|
||||
sprintf(php_code, "%s %s", data, uuid);
|
||||
|
||||
zend_file_handle script;
|
||||
script.type = ZEND_HANDLE_FP;
|
||||
script.filename = data;
|
||||
script.opened_path = NULL;
|
||||
|
|
@ -223,19 +229,20 @@ static void php_function(switch_core_session_t *session, char *data)
|
|||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data);
|
||||
|
||||
// Force $uuid and $session to exist in PHPs memory space
|
||||
zval *php_uuid;
|
||||
MAKE_STD_ZVAL(php_uuid);
|
||||
//MAKE_STD_ZVAL(php_session);
|
||||
//php_uuid->type = IS_STRING;
|
||||
//php_uuid->value.str.len = strlen(uuid);
|
||||
//php_uuid->value.str.val = estrdup(uuid);
|
||||
ZVAL_STRING(php_uuid, uuid , 1);
|
||||
//ZVAL_STRING(php_session, session , 1);
|
||||
ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid);
|
||||
//ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session);
|
||||
|
||||
// Force Some INI entries weather the user likes it or not
|
||||
//zend_alter_ini_entry("register_globals", strlen("register_globals")+1, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
|
||||
#ifdef _MSC_VER
|
||||
//disable warnings for malformed macros from header files
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4127 4267)
|
||||
#endif
|
||||
|
||||
ZVAL_STRING(php_uuid, uuid , 1);
|
||||
ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid);
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
// Execute the bloody script
|
||||
retval = php_execute_script(&script TSRMLS_CC);
|
||||
|
|
@ -243,8 +250,6 @@ 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
|
||||
|
||||
// Buh bye now!
|
||||
|
|
@ -270,13 +275,11 @@ static switch_loadable_module_interface_t php_module_interface = {
|
|||
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename)
|
||||
{
|
||||
void*** tsrm_ls = NULL;
|
||||
void*** tsrm_ls = NULL;
|
||||
|
||||
/* connect my internal structure to the blank pointer passed to me */
|
||||
*module_interface = &php_module_interface;
|
||||
|
||||
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n");
|
||||
|
||||
#ifdef ZTS
|
||||
tsrm_startup(1, 1, 0, NULL);
|
||||
compiler_globals = ts_resource(compiler_globals_id);
|
||||
|
|
@ -297,13 +300,10 @@ void*** tsrm_ls = NULL;
|
|||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//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;
|
||||
}
|
||||
|
||||
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue