Added automatic module globals management

diff --git a/NEWS b/NEWS
index c097e48c85867dbd28056cfe84e5894df9ee0110..9b16cf08d5667c24e68c04eb0d832ddaebc05251 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,7 @@ PHP                                                                        NEWS
   . Added readInnerXML(), readOuterXML(), readString(), setSchema(). (2.6.20+)
   . Changed to passing libxml options when loading reader.
 
+- Added automatic module globals management. (Dmitry)
 - Added RFC2397 (data: stream) support. (Marcus)
 - Added new error mode E_RECOVERABLE_ERROR. (Derick, Marcus, Tony)
 - Added support for getenv() input filtering. (Rasmus)

diff --git a/main/php.h b/main/php.h
index e8e81780da59c69c5e09a436824be7bd99ffdb64..4a26408cfc7392f9a0cb256ebf962fb85bfc2944 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -367,12 +367,18 @@ END_EXTERN_C()
 #define PHP_RINIT              ZEND_MODULE_ACTIVATE_N
 #define PHP_RSHUTDOWN  ZEND_MODULE_DEACTIVATE_N
 #define PHP_MINFO              ZEND_MODULE_INFO_N
+#define PHP_GINIT              ZEND_GINIT
+#define PHP_GSHUTDOWN  ZEND_GSHUTDOWN
 
 #define PHP_MINIT_FUNCTION             ZEND_MODULE_STARTUP_D
 #define PHP_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D
 #define PHP_RINIT_FUNCTION             ZEND_MODULE_ACTIVATE_D
 #define PHP_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D
 #define PHP_MINFO_FUNCTION             ZEND_MODULE_INFO_D
+#define PHP_GINIT_FUNCTION             ZEND_GINIT_FUNCTION
+#define PHP_GSHUTDOWN_FUNCTION ZEND_GSHUTDOWN_FUNCTION
+ 
+#define PHP_MODULE_GLOBALS             ZEND_MODULE_GLOBALS
 
 
 /* Output support */