hartmfixed and extended the ini parameter and module globals stuff

once again: someone test this please!

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 9f052040fbd4e745e9f57fd085621a2a89386a56..69b09e0604f4b845f3f58c78cd51e8cc4fbf72f1 100644 (file)
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -26,23 +26,24 @@ PHP_FUNCTION(confirm_extname_compiled);     /* For testing, remove later. */
        and END macros here:     
 
 ZEND_BEGIN_MODULE_GLOBALS(extname)
-       int global_variable;
+       int   global_value;
+       char *global_string;
 ZEND_END_MODULE_GLOBALS(extname)
 */
 
 /* In every function that needs to use variables in php_extname_globals,
-   do call EXTNAMELS_FETCH(); after declaring other variables used by
-   that function, and always refer to them as EXTNAMEG(variable).
+   do call EXTNAME_LS_FETCH(); after declaring other variables used by
+   that function, and always refer to them as EXTNAME_G(variable).
    You are encouraged to rename these macros something shorter, see
    examples in any other php module directory.
 */
 
 #ifdef ZTS
-#define EXTNAMEG(v) (extname_globals->v)
-#define EXTNAMELS_FETCH() php_extname_globals *extname_globals = ts_resource(extname_globals_id)
+#define EXTNAME_G(v) (extname_globals->v)
+#define EXTNAME_LS_FETCH() zend_extname_globals *extname_globals = ts_resource(extname_globals_id)
 #else
-#define EXTNAMEG(v) (extname_globals.v)
-#define EXTNAMELS_FETCH()
+#define EXTNAME_G(v) (extname_globals.v)
+#define EXTNAME_LS_FETCH()
 #endif
 
 #endif /* PHP_EXTNAME_H */

diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index 07fba1851887954801a783b0f434591a4e785476..77ac1646549fbf62ed05405ac47f707e35e35a9f 100644 (file)
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -36,6 +36,8 @@ ZEND_GET_MODULE(extname)
 
 /* Remove comments and fill if you need to have entries in php.ini
 PHP_INI_BEGIN()
+    STD_PHP_INI_ENTRY("extname.value",      "42", PHP_INI_ALL, OnUpdateInt, global_value, zend_extname_globals, extname_globals)
+    STD_PHP_INI_ENTRY("extname.string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_extname_globals, extname_globals)
 PHP_INI_END()
 */