Changeset 344 for eaccelerator/trunk/eaccelerator.c

Timestamp:

06/19/08 18:01:31 (7 months ago)

Author:

bart

Message:

Remove support for all php versions older than php 5.1

Files:

• eaccelerator/trunk/eaccelerator.c (modified) (14 diffs)

eaccelerator/trunk/eaccelerator.c

@@ -102 +102 @@
-int binary_zend_version[2];
-
-#ifdef ZEND_ENGINE_2
-/* pointer to the properties_info hashtable destructor */
-extern dtor_func_t properties_info_dtor;
-#endif
-
-/* saved original functions */
@@ -1166 +1164 @@
-// segv74: really cheap work around to auto_global problem.
-//         it makes just in time to every time.
-#ifdef ZEND_ENGINE_2
-  zend_is_auto_global("_GET", sizeof("_GET")-1 TSRMLS_CC);
-  zend_is_auto_global("_POST", sizeof("_POST")-1 TSRMLS_CC);
@@ -1174 +1171 @@
-  zend_is_auto_global("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);
-  zend_is_auto_global("_FILES", sizeof("_FILES")-1 TSRMLS_CC);
-#endif
-
-  if (t != NULL) { // restore from cache
@@ -1184 +1180 @@
-
-    zend_llist_add_element(&CG(open_files), file_handle);
-#ifdef ZEND_ENGINE_2
-    if (file_handle->opened_path == NULL && file_handle->type != ZEND_HANDLE_STREAM) {
-      file_handle->handle.stream.handle = (void*)1;
-      file_handle->opened_path = EAG(mem);      /* EAG(mem) = p->realfilename from eaccelerator_restore here */
-    }
-#else
-    if (file_handle->opened_path == NULL && file_handle->type != ZEND_HANDLE_FP) {
-      int dummy = 1;
-      file_handle->opened_path = EAG(mem);      /* EAG(mem) = p->realfilename from eaccelerator_restore here */
-      zend_hash_add(&EG(included_files), file_handle->opened_path, strlen(file_handle->opened_path)+1, (void *)&dummy, sizeof(int), NULL);
-      file_handle->handle.fp = NULL;
-    }
-#endif
-
-    DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: restored (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));
@@ -1237 +1224 @@
-
-    zend_hash_init_ex(&tmp_class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-#ifdef ZEND_ENGINE_2
-                zend_hash_copy(&tmp_class_table, &eaccelerator_global_class_table, (copy_ctor_func_t)zend_class_add_ref, &tmp_class, sizeof(zend_class_entry *));
-#else
-    zend_hash_copy(&tmp_class_table, &eaccelerator_global_class_table, NULL, &tmp_class, sizeof(zend_class_entry));
-#endif
-
-    orig_class_table = CG(class_table);;
-    CG(class_table) = &tmp_class_table;
-#ifdef ZEND_ENGINE_2
-    orig_eg_class_table = EG(class_table);;
-    EG(class_table) = &tmp_class_table;
-#endif
-
-    /* Storing global pre-compiled functions and classes */
@@ -1267 +1248 @@
-      CG(function_table) = orig_function_table;
-      CG(class_table) = orig_class_table;
-#ifdef ZEND_ENGINE_2
-      EG(class_table) = orig_eg_class_table;
-#endif
-      ea_bailout = 1;
-    } zend_end_try();
@@ -1305 +1284 @@
-    CG(function_table) = orig_function_table;
-    CG(class_table) = orig_class_table;
-#ifdef ZEND_ENGINE_2
-    EG(class_table) = orig_eg_class_table;
-    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] restoring CG(class_table)[%08x] != EG(class_table)[%08x]\n", 
-                getpid(), CG(class_table), EG(class_table)));
-#endif
-    while (function_table_tail != NULL) {
-      zend_op_array *op_array = (zend_op_array*)function_table_tail->pData;
@@ -1317 +1294 @@
-          CG(in_compilation) = 1;
-          CG(compiled_filename) = file_handle->opened_path;
-#ifdef ZEND_ENGINE_2
-          CG(zend_lineno) = op_array->line_start;
-#else
-          CG(zend_lineno) = op_array->opcodes[0].lineno;
-#endif
-          zend_error(E_ERROR, "Cannot redeclare %s()", function_table_tail->arKey);
-        }
@@ -1328 +1301 @@
-    }
-    while (class_table_tail != NULL) {
-#ifdef ZEND_ENGINE_2
-      zend_class_entry **ce = (zend_class_entry**)class_table_tail->pData;
-      if ((*ce)->type == ZEND_USER_CLASS) {
@@ -1336 +1308 @@
-          CG(compiled_filename) = file_handle->opened_path;
-          CG(zend_lineno) = (*ce)->line_start;
-#else
-      zend_class_entry *ce = (zend_class_entry*)class_table_tail->pData;
-      if (ce->type == ZEND_USER_CLASS) {
-        if (ce->parent != NULL) {
-          if (zend_hash_find(CG(class_table), (void*)ce->parent->name, ce->parent->name_length+1, (void **)&ce->parent) != SUCCESS) {
-            ce->parent = NULL;
-          }
-        }
-        if (zend_hash_add(CG(class_table), class_table_tail->arKey, class_table_tail->nKeyLength, ce, 
-                    sizeof(zend_class_entry), NULL) == FAILURE && class_table_tail->arKey[0] != '\000') {
-          CG(in_compilation) = 1;
-          CG(compiled_filename) = file_handle->opened_path;
-          CG(zend_lineno) = 0;
-#endif
-          zend_error(E_ERROR, "Cannot redeclare class %s", class_table_tail->arKey);
-        }
@@ -1531 +1489 @@
-  return SUCCESS;
-}
-
-#ifndef ZEND_ENGINE_2
-#define OnUpdateLong OnUpdateInt
-#endif
-
-PHP_INI_BEGIN()
@@ -1874 +1828 @@
-  }
-  
-#ifdef ZEND_ENGINE_2
-  /* cache the properties_info destructor */
-  properties_info_dtor = get_zend_destroy_property_info(TSRMLS_C);
-#endif
-  return SUCCESS;
-}
@@ -2024 +1976 @@
-}
-
-#ifdef ZEND_ENGINE_2
-ZEND_BEGIN_ARG_INFO(eaccelerator_second_arg_force_ref, 0)
-  ZEND_ARG_PASS_INFO(0)
-  ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-#else
-static unsigned char eaccelerator_second_arg_force_ref[] = {2, BYREF_NONE, BYREF_FORCE};
-#endif
-
-function_entry eaccelerator_functions[] = {
@@ -2067 +2015 @@
-  PHP_FE(eaccelerator_dasm_file, NULL)
-#endif
-#ifdef ZEND_ENGINE_2
-  {NULL, NULL, NULL, 0U, 0U}
-#else
-  {NULL, NULL, NULL}
-#endif
-};
-