- Fix a crash (not a thorough fix).

- Commented old code

diff --git a/Zend/zend.c b/Zend/zend.c
index c17d494e97fe7c76d9c8dc3d38968ef399918e21..40c752e1c0afc1a97e9a74a7821bbe5eeab94d37 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -494,7 +494,7 @@ void zend_shutdown(TSRMLS_D)
        zend_hash_destroy(&module_registry);
 
        zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
-       zend_hash_destroy(GLOBAL_CLASS_TABLE);
+/*     zend_hash_destroy(GLOBAL_CLASS_TABLE); FIXME */
 
        zend_hash_destroy(GLOBAL_AUTO_GLOBALS_TABLE);
        free(GLOBAL_AUTO_GLOBALS_TABLE);

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index c581d751de04b402aa6c59117fb11f7eb8f9b194..efa0d08c9db6b8fd493df0d2850508259bef360a 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1851,11 +1851,13 @@ do_fcall_common:
                                NEXT_OPCODE();
                        case ZEND_NAMESPACE:
                                {
+#if 0
                                        if (EX(opline)->op1.op_type == IS_UNUSED) {
                                                EG(namespace) = NULL;
                                        } else {
                                                EG(namespace) = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry;
                                        }
+#endif
                                        NEXT_OPCODE();
                                }
                        case ZEND_SEND_VAL: