Changeset 76

Timestamp:

05/06/05 17:05:15 (4 years ago)

Author:

zoeloelip

Message:

Patch fixing eLoader. eLoader makes php5 segfault, on execution

Files:

• eaccelerator/trunk/eaccelerator.h (modified) (8 diffs)
• eaccelerator/trunk/opcodes.c (modified) (1 diff)

eaccelerator/trunk/eaccelerator.h

@@ -36 +36 @@
-#include "zend_API.h"
-#include "zend_extensions.h"
-#include "mm.h"
-
-/* Handle __attribute__ for nongcc compilers */
@@ -53 +52 @@
-#endif
-
-/* needed to compile eA as a static php module */
-extern zend_module_entry eaccelerator_module_entry;
-#define phpext_eaccelerator_ptr &eaccelerator_module_entry
-
-/* fixes compile errors on php5.1 */
-#ifdef STR_EMPTY_ALLOC
@@ -87 +82 @@
-
-#ifdef HAVE_EACCELERATOR
+#ifndef HAVE_EACCELERATOR_STANDALONE_LOADER 
+
+#include "mm.h"
-
-#ifdef EACCELERATOR_WITHOUT_FILE_LOCKING
@@ -193 +191 @@
-#endif
-
-#define EACCELERATOR_EXTENSION_NAME "eAccelerator"
-#define EACCELERATOR_LOADER_EXTENSION_NAME "eLoader"
-
-#define MMC_ENCODER_VERSION   0x00000003
-#define MMC_ENCODER_END       0x00
-#define MMC_ENCODER_NAMESPACE 0x01
-#define MMC_ENCODER_CLASS     0x02
-#define MMC_ENCODER_FUNCTION  0x03
-
-#define EACCELERATOR_VERSION_GUID   "PHPE8EDA1B6-806A-4851-B1C8-A6B4712F44FB"
-#define EACCELERATOR_LOGO_GUID      "PHPE6F78DE9-13E4-4dee-8518-5FA2DACEA803"
-#define EACCELERATOR_VERSION_STRING ("eAccelerator " EACCELERATOR_VERSION " (PHP " PHP_VERSION ")")
-
-#ifdef ZTS
-#  define MMCG(v) TSRMG(eaccelerator_globals_id, zend_eaccelerator_globals*, v)
-#else
-#  define MMCG(v) (eaccelerator_globals.v)
-#endif
-
-/******************************************************************************/
-
@@ -394 +373 @@
-} eaccelerator_cache_place;
-
+typedef union align_union {
+  double d;
+  void *v;
+  int (*func)(int);
+  long l;
+} align_union;
+
+/******************************************************************************/
+
+#ifdef ZTS
+MUTEX_T mm_mutex;
+#endif
+
+/* needed to compile eA as a static php module */
+extern zend_module_entry eaccelerator_module_entry;
+#define phpext_eaccelerator_ptr &eaccelerator_module_entry
+
+
+void format_size (char *s, unsigned int size, int legend);
+void eaccelerator_prune (time_t t);
+
+int eaccelerator_lock (const char *key, int key_len TSRMLS_DC);
+int eaccelerator_unlock (const char *key, int key_len TSRMLS_DC);
+
+void *eaccelerator_malloc2 (size_t size TSRMLS_DC);
+
+unsigned int eaccelerator_crc32 (const char *p, size_t n);
+int eaccelerator_md5 (char *s, const char *prefix, const char *key TSRMLS_DC);
+
+void restore_zval (zval * TSRMLS_DC);
+void calc_zval (zval * z TSRMLS_DC);
+void store_zval (zval * z TSRMLS_DC);
+void fixup_zval (zval * z TSRMLS_DC);
+
+inline unsigned int hash_mm (const char *data, int len);
+
+#  ifdef WITH_EACCELERATOR_EXECUTOR
+ZEND_DLEXPORT void eaccelerator_execute (zend_op_array * op_array TSRMLS_DC);
+#  endif
+
+#  ifdef WITH_EACCELERATOR_OPTIMIZER
+void eaccelerator_optimize (zend_op_array * op_array);
+#  endif
+
+#ifdef WITH_EACCELERATOR_ENCODER
+PHP_FUNCTION (eaccelerator_encode);
+#endif
+#endif /* HAVE_EACCELERATOR_LOADER_STANDALONE */
+
+#ifdef ZTS
+#  define MMCG(v) TSRMG(eaccelerator_globals_id, zend_eaccelerator_globals*, v)
+#else
+#  define MMCG(v) (eaccelerator_globals.v)
+#endif
+
-/*
- * conditional filter
@@ -404 +438 @@
-} mm_cond_entry;
-
-typedef union align_union {
-  double d;
-  void *v;
-  int (*func)(int);
-  long l;
-} align_union;
-
-/******************************************************************************/
-
-#ifdef ZTS
-MUTEX_T mm_mutex;
-#endif
-
-void format_size (char *s, unsigned int size, int legend);
-void eaccelerator_prune (time_t t);
-
-int eaccelerator_lock (const char *key, int key_len TSRMLS_DC);
-int eaccelerator_unlock (const char *key, int key_len TSRMLS_DC);
-
-void *eaccelerator_malloc2 (size_t size TSRMLS_DC);
-
-unsigned int eaccelerator_crc32 (const char *p, size_t n);
-int eaccelerator_md5 (char *s, const char *prefix, const char *key TSRMLS_DC);
-
-void restore_zval (zval * TSRMLS_DC);
-void calc_zval (zval * z TSRMLS_DC);
-void store_zval (zval * z TSRMLS_DC);
-void fixup_zval (zval * z TSRMLS_DC);
-
-inline unsigned int hash_mm (const char *data, int len);
-
-#  ifdef WITH_EACCELERATOR_EXECUTOR
-ZEND_DLEXPORT void eaccelerator_execute (zend_op_array * op_array TSRMLS_DC);
-#  endif
-
-#  ifdef WITH_EACCELERATOR_OPTIMIZER
-void eaccelerator_optimize (zend_op_array * op_array);
-#  endif
-
-#ifdef WITH_EACCELERATOR_ENCODER
-PHP_FUNCTION (eaccelerator_encode);
-#endif
-
-#ifdef WITH_EACCELERATOR_LOADER
-zend_op_array *eaccelerator_load (char *src, int src_len TSRMLS_DC);
@@ -452 +443 @@
-PHP_FUNCTION (_eaccelerator_loader_file);
-PHP_FUNCTION (_eaccelerator_loader_line);
-#endif
-#endif
-
@@ -509 +499 @@
-
-ZEND_EXTERN_MODULE_GLOBALS (eaccelerator)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

eaccelerator/trunk/opcodes.c

@@ -28 +28 @@
-*/
-
-#include "eaccelerator.h"
-#include "opcodes.h"
-