Changeset 23921

Timestamp:

11/05/09 14:43:28 (4 months ago)

Author:

indeyets

Message:

[BREAKING CHANGE] introducing midgard.superglobals_compat ini-setting. by default it is off and superglobals are not registered. should be turned on for ragnaland and other "old" software

Files:

• trunk/midgard/apis/php5/midgard.c (modified) (7 diffs)
• trunk/midgard/apis/php5/php_midgard.h (modified) (1 diff)
• trunk/midgard/apis/php5/php_midgard__helpers.h (modified) (1 diff)
• trunk/midgard/apis/php5/tests/021a-superglobals_on.phpt (added)
• trunk/midgard/apis/php5/tests/021b-superglobals_off.phpt (added)

trunk/midgard/apis/php5/midgard.c

@@ -252 +252 @@
-        NULL,
-        midgard2_deps,
-"midgard2"
+MIDGARD_PACKAGE_NAME
-        midgard2_functions,
-        PHP_MINIT(midgard2),
@@ -268 +268 @@
-
-PHP_INI_BEGIN()
-
-
-
-
-
+
+
+
+
+
+
-        // quota isn't used?
-        // STD_PHP_INI_BOOLEAN("midgard.quota",        "0", PHP_INI_ALL,    OnUpdateBool, midgard_quota,        midgard2_globals *, midgard2_globals)
@@ -336 +337 @@
-
-        ze = zend_get_extension(MIDGARD_PACKAGE_NAME);
+
-        if (ze != NULL) {
-midgard2 already loaded. It's recommended to load it via php.ini"
+%s already loaded. It's recommended to load it via php.ini", MIDGARD_PACKAGE_NAME
-                return SUCCESS;
-        }
-
-        zend_register_auto_global("_MIDGARD", sizeof("_MIDGARD")-1, NULL TSRMLS_CC);
-        zend_register_auto_global("_MIDCOM", sizeof("_MIDCOM")-1, NULL  TSRMLS_CC);
-        zend_register_auto_global("_MIDGARD_CONNECTION", sizeof("_MIDGARD_CONNECTION")-1, NULL  TSRMLS_CC);
-
-        /*
-        zend_module_entry *module;
-        int rv = zend_hash_find(&module_registry, "midgard2", strlen("midgard2")+1, (void**)&module);
-        if (rv == SUCCESS)
-                return SUCCESS;
-        */
-
-        global_loghandler = g_log_set_handler(G_LOG_DOMAIN, G_LOG_LEVEL_MASK, midgard_error_default_log, NULL);
-
-        //g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-  
+
-
-        /* Get DateTime class pointer and set global */
@@ -386 +377 @@
-        ce_midgard_error_exception = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
-
+        // Init various classes
-        php_reflection_workaround_init(module_number);  
-        php_midgard_reflection_property_init(module_number);
@@ -463 +455 @@
-        REGISTER_INI_ENTRIES();
-
+        if (MGDG(superglobals_compat)) {
+                php_error(E_DEPRECATED, "midgard.superglobals_compat option is deprecated and might be removed in next release");
+
+                zend_register_auto_global("_MIDGARD",            sizeof("_MIDGARD")-1,            NULL TSRMLS_CC);
+                zend_register_auto_global("_MIDCOM",             sizeof("_MIDCOM")-1,             NULL TSRMLS_CC);
+                zend_register_auto_global("_MIDGARD_CONNECTION", sizeof("_MIDGARD_CONNECTION")-1, NULL TSRMLS_CC);
+        }
+
-        /* midgard.http is on so we populate list of all available configs */
-        if (php_midgard_is_http_env()) {
@@ -487 +487 @@
-        php_midgard_log_enabled = TRUE;
-
-
+
+
+
-
-        return SUCCESS;
@@ -598 +600 @@
-                 * It simply forces Zend to not unload midgard module */
-                zend_module_entry *module;
-"midgard2", strlen("midgard2")+
+MIDGARD_PACKAGE_NAME, strlen(MIDGARD_PACKAGE_NAME) + 
-                if (rv == SUCCESS) {
-                        php_printf("---> disable module handle\n");

trunk/midgard/apis/php5/php_midgard.h

@@ -108 +108 @@
-        zend_bool midgard_http;
-        zend_bool midgard_memory_debug;
+        zend_bool superglobals_compat;
-ZEND_END_MODULE_GLOBALS(midgard2)
-

trunk/midgard/apis/php5/php_midgard__helpers.h

@@ -13 +13 @@
-/* These macros are available since 5.3, so we add them in 5.2 */
-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 2
+# define E_DEPRECATED E_NOTICE
-# define Z_SET_ISREF_P(ptr) (ptr)->is_ref = 1
-# define Z_REFCOUNT_P(ptr) (ptr)->refcount