cvs: php4 /ext/iisfunc iisfunc.cpp setup.c setup.h

fmk Thu Sep 20 13:41:51 2001 EDT Modified files: /php4/ext/iisfunc setup.h setup.c iisfunc.cpp Log: Fixing crash on module init. Renaming functions and adding aliases for compatibility Fixing some prototypes

Index: php4/ext/iisfunc/setup.h diff -u php4/ext/iisfunc/setup.h:1.4 php4/ext/iisfunc/setup.h:1.5 --- php4/ext/iisfunc/setup.h:1.4 Wed Aug 15 08:38:33 2001 +++ php4/ext/iisfunc/setup.h Thu Sep 20 13:41:51 2001 @@ -12,17 +12,17 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Frank M. Kromann <fmk@swwwing.com> | + | Authors: Frank M. Kromann <fmk@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: setup.h,v 1.4 2001/08/15 12:38:33 phanto Exp $ */ +/* $Id: setup.h,v 1.5 2001/09/20 17:41:51 fmk Exp $ */ #ifndef PHP_IIS_SETUP_H #define PHP_IIS_SETUP_H #ifdef PHP_WIN32 -#define HAVE_IISFUNC +//#define HAVE_IISFUNC extern zend_module_entry iisfunc_module_entry; #define iisfunc_module_ptr &iisfunc_module_entry @@ -35,47 +35,41 @@ PHP_RSHUTDOWN_FUNCTION(iisfunc); PHP_MINFO_FUNCTION(iisfunc); -PHP_FUNCTION(iis_getserverbypath); -PHP_FUNCTION(iis_getserverbycomment); -PHP_FUNCTION(iis_addserver); -PHP_FUNCTION(iis_removeserver); -PHP_FUNCTION(iis_setdirsecurity); -PHP_FUNCTION(iis_getdirsecurity); -PHP_FUNCTION(iis_setserverright); -PHP_FUNCTION(iis_getserverright); -PHP_FUNCTION(iis_startserver); -PHP_FUNCTION(iis_stopserver); -PHP_FUNCTION(iis_setscriptmap); -PHP_FUNCTION(iis_getscriptmap); -PHP_FUNCTION(iis_setappsettings); -PHP_FUNCTION(iis_stopservice); -PHP_FUNCTION(iis_startservice); -PHP_FUNCTION(iis_getservicestate); +PHP_FUNCTION(iis_get_server_by_path); +PHP_FUNCTION(iis_get_server_by_comment); +PHP_FUNCTION(iis_add_server); +PHP_FUNCTION(iis_remove_server); +PHP_FUNCTION(iis_set_dir_security); +PHP_FUNCTION(iis_get_dir_security); +PHP_FUNCTION(iis_set_server_rights); +PHP_FUNCTION(iis_get_server_rights); +PHP_FUNCTION(iis_start_server); +PHP_FUNCTION(iis_stop_server); +PHP_FUNCTION(iis_set_script_map); +PHP_FUNCTION(iis_get_script_map); +PHP_FUNCTION(iis_set_app_settings); +PHP_FUNCTION(iis_stop_service); +PHP_FUNCTION(iis_start_service); +PHP_FUNCTION(iis_get_service_state); END_EXTERN_C() -ZEND_BEGIN_MODULE_GLOBALS(iis) +ZEND_BEGIN_MODULE_GLOBALS(iisfunc) void * pIMeta; -ZEND_END_MODULE_GLOBALS(iis) +ZEND_END_MODULE_GLOBALS(iisfunc) -#ifdef ZTS - -int iis_globals_id; -#define IISG(v) TSRMG(iis_globals_id, zend_iis_globals *, v) +ZEND_DECLARE_MODULE_GLOBALS(iisfunc) +#ifdef ZTS +#define IISG(v) TSRMG(iisfunc_globals_id, zend_iisfunc_globals *, v) #else - -#define IISG(v) (iis_globals.v) - +#define IISG(v) (iisfunc_globals.v) #endif - #else #define iisfunc_module_ptr NULL #endif /* PHP_WIN32 */ - -#define phpext_iisfunc_ptr iisfunc_module_ptr #endif /* PHP_IIS_SETUP_H */ Index: php4/ext/iisfunc/setup.c diff -u php4/ext/iisfunc/setup.c:1.7 php4/ext/iisfunc/setup.c:1.8 --- php4/ext/iisfunc/setup.c:1.7 Wed Aug 15 08:38:33 2001 +++ php4/ext/iisfunc/setup.c Thu Sep 20 13:41:51 2001 @@ -12,19 +12,15 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Frank M. Kromann <fmk@swwwing.com> | + | Authors: Frank M. Kromann <fmk@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: setup.c,v 1.7 2001/08/15 12:38:33 phanto Exp $ */ +/* $Id: setup.c,v 1.8 2001/09/20 17:41:51 fmk Exp $ */ #ifdef COMPILE_DL_IISFUNC #define HAVE_IISFUNC 1 #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "php.h" #include "php_globals.h" #include "ext/standard/info.h" @@ -38,22 +34,41 @@ #ifdef HAVE_IISFUNC function_entry iisfunc_functions[] = { - PHP_FE(iis_getserverbypath, NULL) - PHP_FE(iis_getserverbycomment, NULL) - PHP_FE(iis_addserver, NULL) - PHP_FE(iis_removeserver, NULL) - PHP_FE(iis_setdirsecurity, NULL) - PHP_FE(iis_getdirsecurity, NULL) - PHP_FE(iis_setserverright, NULL) - PHP_FE(iis_getserverright, NULL) - PHP_FE(iis_startserver, NULL) - PHP_FE(iis_stopserver, NULL) - PHP_FE(iis_setscriptmap, NULL) - PHP_FE(iis_getscriptmap, NULL) - PHP_FE(iis_setappsettings, NULL) - PHP_FE(iis_stopservice, NULL) - PHP_FE(iis_startservice, NULL) - PHP_FE(iis_getservicestate, NULL) + PHP_FE(iis_get_server_by_path, NULL) + PHP_FE(iis_get_server_by_comment, NULL) + PHP_FE(iis_add_server, NULL) + PHP_FE(iis_remove_server, NULL) + PHP_FE(iis_set_dir_security, NULL) + PHP_FE(iis_get_dir_security, NULL) + PHP_FE(iis_set_server_rights, NULL) + PHP_FE(iis_get_server_rights, NULL) + PHP_FE(iis_start_server, NULL) + PHP_FE(iis_stop_server, NULL) + PHP_FE(iis_set_script_map, NULL) + PHP_FE(iis_get_script_map, NULL) + PHP_FE(iis_set_app_settings, NULL) + PHP_FE(iis_stop_service, NULL) + PHP_FE(iis_start_service, NULL) + PHP_FE(iis_get_service_state, NULL) + +/* Aliases for compatibility */ + PHP_FALIAS(iis_getserverbypath, iis_get_server_by_path, NULL) + PHP_FALIAS(iis_getserverbycomment, iis_get_server_by_comment, NULL) + PHP_FALIAS(iis_addserver, iis_add_server, NULL) + PHP_FALIAS(iis_removeserver, iis_remove_server, NULL) + PHP_FALIAS(iis_setdirsecurity, iis_set_dir_security, NULL) + PHP_FALIAS(iis_getdirsecurity, iis_get_dir_security, NULL) + PHP_FALIAS(iis_setserverright, iis_set_server_rights, NULL) + PHP_FALIAS(iis_getserverright, iis_get_server_rights, NULL) + PHP_FALIAS(iis_startserver, iis_start_server, NULL) + PHP_FALIAS(iis_stopserver, iis_stop_server, NULL) + PHP_FALIAS(iis_setscriptmap, iis_set_script_map, NULL) + PHP_FALIAS(iis_getscriptmap, iis_get_script_map, NULL) + PHP_FALIAS(iis_setappsettings, iis_set_app_settings, NULL) + PHP_FALIAS(iis_stopservice, iis_stop_service, NULL) + PHP_FALIAS(iis_startservice, iis_start_service, NULL) + PHP_FALIAS(iis_getservicestate, iis_get_service_state, NULL) + {NULL, NULL, NULL} }; @@ -74,15 +89,18 @@ PHP_MINIT_FUNCTION(iisfunc) { + ZEND_INIT_MODULE_GLOBALS(iisfunc, NULL, NULL); + fnIisInit(TSRMLS_C); - REGISTER_LONG_CONSTANT("IIS_READ", 0x1, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IIS_WRITE", 0x2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IIS_EXECUTE", 0x4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IIS_SCRIPT", 0x200, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_READ", 0x1, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_WRITE", 0x2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_EXECUTE", 0x4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_SCRIPT", 0x200, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IIS_ANONYMOUS", 0x1, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IIS_BASIC", 0x2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IIS_NTLM", 0x4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_BASIC", 0x2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IIS_NTLM", 0x4, CONST_CS | CONST_PERSISTENT); + return SUCCESS; } @@ -110,9 +128,9 @@ php_info_print_table_end(); } -/* {{{ proto int iis_getserverbypath(string Path) +/* {{{ proto int iis_get_server_by_path(string Path) Return the instance number associated with the Path*/ -PHP_FUNCTION(iis_getserverbypath) +PHP_FUNCTION(iis_get_server_by_path) { pval *ServerPath; int argc, rc; @@ -135,9 +153,9 @@ } /* }}} */ -/* {{{ proto int iis_getserverbycomment(string Comment) +/* {{{ proto int iis_get_server_by_comment(string Comment) Return the instance number associated with the Comment*/ -PHP_FUNCTION(iis_getserverbycomment) +PHP_FUNCTION(iis_get_server_by_comment) { pval *ServerComment; int argc, rc; @@ -160,9 +178,9 @@ } /* }}} */ -/* {{{ proto int iis_addserver(string Path, string Comment, string ServerIP, int ServerPort, string HostName, int ServerRights, int StartServer) +/* {{{ proto int iis_add_server(string Path, string Comment, string ServerIP, int ServerPort, string HostName, int ServerRights, int StartServer) Creates a new virtual web server*/ -PHP_FUNCTION(iis_addserver) +PHP_FUNCTION(iis_add_server) { pval *ServerPath, *ServerComment, *ServerIp, *ServerPort, *ServerHost, *ServerRights, *StartServer; @@ -197,9 +215,9 @@ } /* }}} */ -/* {{{ proto int iis_removeserver(int ServerInstance) +/* {{{ proto int iis_remove_server(int ServerInstance) Removes the virtual web server indicated by ServerInstance*/ -PHP_FUNCTION(iis_removeserver) +PHP_FUNCTION(iis_remove_server) { pval *ServerInstance; int argc, rc; @@ -221,9 +239,9 @@ } /* }}} */ -/* {{{ proto int iis_setdirsecurity(int ServerInstance, string VirtualPath, int DirectoryFlags) +/* {{{ proto int iis_set_dir_security(int ServerInstance, string VirtualPath, int DirectoryFlags) Sets Directory Security*/ -PHP_FUNCTION(iis_setdirsecurity) +PHP_FUNCTION(iis_set_dir_security) { pval *ServerInstance, *VirtualPath, *DirFlags; int argc, rc; @@ -247,9 +265,9 @@ } /* }}} */ -/* {{{ proto int iis_getdirsecurity(int ServerInstance, string VirtualPath) +/* {{{ proto int iis_get_dir_security(int ServerInstance, string VirtualPath) Gets Directory Security*/ -PHP_FUNCTION(iis_getdirsecurity) +PHP_FUNCTION(iis_get_dir_security) { pval *ServerInstance, *VirtualPath; int argc, rc; @@ -273,9 +291,9 @@ } /* }}} */ -/* {{{ proto int iis_setserverright(int ServerInstance, string VirtualPath, int ServerFlags) +/* {{{ proto int iis_set_server_rights(int ServerInstance, string VirtualPath, int ServerFlags) Sets server rights*/ -PHP_FUNCTION(iis_setserverright) +PHP_FUNCTION(iis_set_server_rights) { pval *ServerInstance, *VirtualPath, *ServerFlags; int argc, rc; @@ -299,9 +317,9 @@ } /* }}} */ -/* {{{ proto int iis_getserverright(int ServerInstance, string VirtualPath) - Gets Directory Security*/ -PHP_FUNCTION(iis_getserverright) +/* {{{ proto int iis_get_server_rights(int ServerInstance, string VirtualPath) + Gets server rights*/ +PHP_FUNCTION(iis_get_server_rights) { pval *ServerInstance, *VirtualPath; int argc, rc; @@ -325,9 +343,9 @@ } /* }}} */ -/* {{{ proto int iis_setscriptmap(int ServerInstance, string VirtualPath, string EnginePath, int AllowScripting) +/* {{{ proto int iis_set_script_map(int ServerInstance, string VirtualPath, string ScriptExtention, string EnginePath, int AllowScripting) Sets script mapping on a virtual directory*/ -PHP_FUNCTION(iis_setscriptmap) +PHP_FUNCTION(iis_set_script_map) { pval *ServerInstance, *VirtualPath, *ScriptExtention, *EnginePath, *Scripting; int argc, rc; @@ -356,9 +374,9 @@ } /* }}} */ -/* {{{ proto int iis_setscriptmap(int ServerInstance, string VirtualPath) +/* {{{ proto int iis_set_script_map(int ServerInstance, string VirtualPath, string ScriptExtention) Gets script mapping on a virtual directory for a specific extention*/ -PHP_FUNCTION(iis_getscriptmap) +PHP_FUNCTION(iis_get_script_map) { pval *ServerInstance, *VirtualPath, *ScriptExtention; int argc, rc; @@ -387,9 +405,9 @@ } /* }}} */ -/* {{{ proto int iis_setappsettings(int ServerInstance, string VirtualPath, string Name) +/* {{{ proto int iis_set_app_settings(int ServerInstance, string VirtualPath, string Name) Creates application scope for a virtual directory*/ -PHP_FUNCTION(iis_setappsettings) +PHP_FUNCTION(iis_set_app_settings) { pval *ServerInstance, *VirtualPath, *Name; int argc, rc; @@ -413,9 +431,9 @@ } /* }}} */ -/* {{{ proto int iis_startserver(int ServerInstance) +/* {{{ proto int iis_start_server(int ServerInstance) Starts the virtual web server*/ -PHP_FUNCTION(iis_startserver) +PHP_FUNCTION(iis_start_server) { pval *ServerInstance; int argc, rc; @@ -438,9 +456,9 @@ } /* }}} */ -/* {{{ proto int iis_stopserver(int ServerInstance) +/* {{{ proto int iis_stop_server(int ServerInstance) Stops the virtual web server*/ -PHP_FUNCTION(iis_stopserver) +PHP_FUNCTION(iis_stop_server) { pval *ServerInstance; int argc, rc; @@ -463,9 +481,9 @@ } /* }}} */ -/* {{{ proto int iis_stopservice(string ServiceId) +/* {{{ proto int iis_stop_service(string ServiceId) Stops the service defined by ServiceId*/ -PHP_FUNCTION(iis_stopservice) +PHP_FUNCTION(iis_stop_service) { pval *ServiceId; int argc, rc; @@ -488,9 +506,9 @@ } /* }}} */ -/* {{{ proto int iis_stopservice(string ServiceId) +/* {{{ proto int iis_stop_service(string ServiceId) Starts the service defined by ServiceId*/ -PHP_FUNCTION(iis_startservice) +PHP_FUNCTION(iis_start_service) { pval *ServiceId; int argc, rc; @@ -513,9 +531,9 @@ } /* }}} */ -/* {{{ proto int iis_getservicestate(string ServiceId) +/* {{{ proto int iis_get_service_state(string ServiceId) Returns teh state for the service defined by ServiceId*/ -PHP_FUNCTION(iis_getservicestate) +PHP_FUNCTION(iis_get_service_state) { pval *ServiceId; int argc, rc; Index: php4/ext/iisfunc/iisfunc.cpp diff -u php4/ext/iisfunc/iisfunc.cpp:1.5 php4/ext/iisfunc/iisfunc.cpp:1.6 --- php4/ext/iisfunc/iisfunc.cpp:1.5 Thu Aug 16 09:21:46 2001 +++ php4/ext/iisfunc/iisfunc.cpp Thu Sep 20 13:41:51 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: iisfunc.cpp,v 1.5 2001/08/16 13:21:46 phanto Exp $ */ +/* $Id: iisfunc.cpp,v 1.6 2001/09/20 17:41:51 fmk Exp $ */ /* iisfunc.cpp : Defines the entry point for the DLL application. */ @@ -32,9 +32,8 @@ extern "C" { #include "php.h" -} - #include "setup.h" +} extern "C" void fnIisInit(TSRMLS_D) {