Changeset 262

Timestamp:

08/03/06 13:24:22 (2 years ago)

Author:

bart

Message:

* zend_do_inheritance can't be called with TSRMLS_CC when using

php 4, this also means that eAccelerator won't work with threading!

* ea_info and ea_dasm: if eaccelerator_mm_instance is NULL, just return

null and don't do something.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_dasm.c (modified) (1 diff)
• eaccelerator/trunk/ea_info.c (modified) (8 diffs)
• eaccelerator/trunk/ea_restore.c (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-08-03  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * zend_do_inheritance can't be called with TSRMLS_CC when using 
+          php 4, this also means that eAccelerator won't work with threading!
+        * ea_info and ea_dasm: if eaccelerator_mm_instance is NULL, just return
+          null and don't do something.
+
-2006-07-30  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/ea_dasm.c

@@ -556 +556 @@
-                return;
-
-
+eaccelerator_mm_instance == NULL || 
-                RETURN_NULL();
-        }
-
+
-    p = get_cache_entry(file);
-    if (p == NULL) {

eaccelerator/trunk/ea_info.c

@@ -220 +220 @@
-{
-    zend_bool enable;
-
+
+
+
+
+
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &enable) == FAILURE)
-                return;
@@ -246 +250 @@
-    zend_bool enable;
-    
+        if (eaccelerator_mm_instance == NULL) {
+                RETURN_NULL();
+        }
+
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &enable) == FAILURE)
-                return;
@@ -271 +279 @@
-        time_t t;
-
+        if (eaccelerator_mm_instance == NULL) {
+                RETURN_NULL();
+        }
+
-    if (!isAdminAllowed(TSRMLS_C)) {
-        zend_error(E_WARNING, NOT_ADMIN_WARNING);
@@ -294 +306 @@
-        unsigned int i;
-        ea_cache_entry *p;
+
+        if (eaccelerator_mm_instance == NULL) {
+                RETURN_NULL();
+        }
-
-    if (!isAdminAllowed(TSRMLS_C)) {
@@ -376 +392 @@
-    shm = (char *)mm_shm_type();
-    sem = (char *)mm_sem_type();
+
+        if (eaccelerator_mm_instance == NULL) {
+                RETURN_NULL();
+        }
+
-        available = mm_available (eaccelerator_mm_instance->mm);
-
@@ -409 +430 @@
-    int i;
-
-
+
+
+
+
+
-        zend_error(E_WARNING, NOT_ADMIN_WARNING);
-        RETURN_NULL();
@@ -442 +467 @@
-    zval *script;
-
+        if (eaccelerator_mm_instance == NULL) {
+                RETURN_NULL();
+        }
+
-    if (!isAdminAllowed(TSRMLS_C)) {
-        zend_error(E_WARNING, NOT_ADMIN_WARNING);
@@ -469 +498 @@
-PHP_FUNCTION(eaccelerator_list_keys)
-{
-
+mm_instance == NULL && eaccelerator_
-                return;
-        } else {

eaccelerator/trunk/ea_restore.c

@@ -874 +874 @@
-#endif
-        if (to->parent)
+#ifdef ZEND_ENGINE_2
-                zend_do_inheritance(to, to->parent TSRMLS_CC);
+#else
+        zend_do_inheritance(to, to->parent);
+#endif
-        EAG(class_entry) = old;
-