cvs: php4 /ext/pfpro pfpro.c php_pfpro.h

jdonagher Mon Jul 24 10:57:03 2000 EDT Modified files: /php4/ext/pfpro pfpro.c php_pfpro.h Log: # Added code to pfpro.c and php_pfpro.h to parse defaults out of php.ini @- For the pfpro extension: defaulthost, defaultport, defaulttimeout, and @ all of the default proxy settings can now be defined in php.ini Index: php4/ext/pfpro/pfpro.c diff -u php4/ext/pfpro/pfpro.c:1.3 php4/ext/pfpro/pfpro.c:1.4 --- php4/ext/pfpro/pfpro.c:1.3 Wed Jul 19 11:55:11 2000 +++ php4/ext/pfpro/pfpro.c Mon Jul 24 10:57:03 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pfpro.c,v 1.3 2000/07/19 18:55:11 david Exp $ */ +/* $Id: pfpro.c,v 1.4 2000/07/24 17:57:03 jdonagher Exp $ */ /* TODO: * @@ -71,16 +71,21 @@ ZEND_GET_MODULE(pfpro) #endif -/* + PHP_INI_BEGIN() -PHP_INI_END() -*/ + STD_PHP_INI_ENTRY("pfpro.defaulthost", "test.signio.com", PHP_INI_ALL, OnUpdateString, defaulthost, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.defaultport", "443", PHP_INI_ALL, OnUpdateInt, defaultport, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.defaulttimeout", "30", PHP_INI_ALL, OnUpdateInt, defaulttimeout, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.proxyaddress", "", PHP_INI_ALL, OnUpdateString, proxyaddress, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.proxyport", "", PHP_INI_ALL, OnUpdateInt, proxyport, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.proxylogon", "", PHP_INI_ALL, OnUpdateString, proxylogon, php_pfpro_globals, pfpro_globals) + STD_PHP_INI_ENTRY("pfpro.proxypassword", "", PHP_INI_ALL, OnUpdateString, proxypassword, php_pfpro_globals, pfpro_globals) +PHP_INI_END() + PHP_MINIT_FUNCTION(pfpro) { -/* REGISTER_INI_ENTRIES(); -*/ return SUCCESS; } @@ -189,12 +194,12 @@ char *parmlist; char *address = NULL; - int port = 443; - int timeout = 30; - char *proxyAddress = NULL; - int proxyPort = 0; - char *proxyLogon = NULL; - char *proxyPassword = NULL; + int port = (int)PFPROG(defaultport); + int timeout = (int)PFPROG(defaulttimeout); + char *proxyAddress = (char*)PFPROG(proxyaddress); + int proxyPort = (int)PFPROG(proxyport); + char *proxyLogon = (char*)PFPROG(proxylogon); + char *proxyPassword = (char*)PFPROG(proxypassword); int freeaddress = 0; @@ -261,7 +266,7 @@ /* Default to signio's test server */ if (address == NULL) { - address = estrdup("test.signio.com"); + address = estrdup(PFPROG(defaulthost)); freeaddress = 1; } @@ -314,12 +319,13 @@ int pass; char *address = NULL; - int port = 443; - int timeout = 30; - char *proxyAddress = NULL; - int proxyPort = 0; - char *proxyLogon = NULL; - char *proxyPassword = NULL; + int port = (int)PFPROG(defaultport); + int timeout = (int)PFPROG(defaulttimeout); + char *proxyAddress = (char*)PFPROG(proxyaddress); + int proxyPort = (int)PFPROG(proxyport); + char *proxyLogon = (char*)PFPROG(proxylogon); + char *proxyPassword = (char*)PFPROG(proxypassword); + int freeaddress = 0; char *parmlist = NULL; @@ -504,7 +510,7 @@ if (address == NULL) { /* is it safe to just do address = "test.signio.com"; here? */ - address = estrdup("test.signio.com"); + address = estrdup(PFPROG(defaulthost)); freeaddress = 1; } @@ -623,7 +629,6 @@ } /* }}} */ - #endif /* HAVE_PFPRO */ Index: php4/ext/pfpro/php_pfpro.h diff -u php4/ext/pfpro/php_pfpro.h:1.3 php4/ext/pfpro/php_pfpro.h:1.4 --- php4/ext/pfpro/php_pfpro.h:1.3 Wed Jul 19 11:51:54 2000 +++ php4/ext/pfpro/php_pfpro.h Mon Jul 24 10:57:03 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pfpro.h,v 1.3 2000/07/19 18:51:54 david Exp $ */ +/* $Id: php_pfpro.h,v 1.4 2000/07/24 17:57:03 jdonagher Exp $ */ #ifndef PHP_PFPRO_H #define PHP_PFPRO_H @@ -47,6 +47,13 @@ typedef struct { int le_pfpro; int initialised; + char *defaulthost; + char *defaultport; + char *defaulttimeout; + char *proxyaddress; + char *proxyport; + char *proxylogon; + char *proxypassword; } php_pfpro_globals; #ifdef ZTS