Changeset 140

Show
Ignore:
Timestamp:
11/29/05 18:19:18 (3 years ago)
Author:
zoeloelip
Message:

* Disabled the cache dir check, to much people complaining
* fixed eLoader

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/ChangeLog

    r139 r140  
     12005-11-22 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     2 
     3        * Disabled the cache dir check, to much people complaining 
     4        * fixed eLoader 
     5 
    162005-11-22 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    27 

  • eaccelerator/trunk/eLoader/Makefile.in

    r34 r140  
    11LTLIBRARY_NAME        = libeloader.la 
    2 LTLIBRARY_SOURCES     = loader.c opcodes.c 
     2LTLIBRARY_SOURCES     = loader.c opcodes.c ea_restore.c debug.c 
    33LTLIBRARY_SHARED_NAME = eloader.la 
    44 

  • eaccelerator/trunk/eLoader/autogen.sh

    r34 r140  
    11#! /bin/sh 
    22 
    3 ln -sf ../loader.c loader.c 
    4 ln -sf ../opcodes.c opcodes.c 
    5 ln -sf ../opcodes.h opcodes.h 
    6 ln -sf ../eaccelerator.h eaccelerator.h 
    7 ln -sf ../eaccelerator_version.h eaccelerator_version.h 
     3ln -sf ../loader.c . 
     4ln -sf ../opcodes.c . 
     5ln -sf ../opcodes.h . 
     6ln -sf ../eaccelerator.h . 
     7ln -sf ../eaccelerator_version.h . 
     8ln -sf ../ea_restore.c . 
     9ln -sf ../ea_restore.h . 
     10ln -sf ../debug.h . 
     11ln -sf ../debug.c . 
    812 
    913if test x$PHP_PREFIX = x; then 

  • eaccelerator/trunk/eaccelerator.c

    r139 r140  
    20232023      eaccelerator_mm_instance->enabled = 0; 
    20242024    } 
    2025  
     2025#if 0 
    20262026    if (!eaccelerator_scripts_shm_only && check_cache_dir(EAG(cache_dir)) == FAILURE) { 
    20272027      zend_error(E_CORE_WARNING,"[%s] Can not init the cache directory", EACCELERATOR_EXTENSION_NAME); 
    …… 
    20292029      eaccelerator_mm_instance->enabled = 0; 
    20302030    } 
    2031  
     2031#endif 
    20322032    mm_saved_zend_compile_file = zend_compile_file; 
    20332033 

  • eaccelerator/trunk/eaccelerator.h

    r124 r140  
    167167#define MAX_DUP_STR_LEN 256 
    168168 
     169/******************************************************************************/ 
     170 
     171#endif /* HAVE_EACCELERATOR_STANDALONE_LOADER */ 
     172 
    169173#ifndef offsetof 
    170174#  define offsetof(str,fld) ((size_t)&(((str*)NULL)->fld)) 
    171175#endif 
    172  
    173 /******************************************************************************/ 
    174176 
    175177typedef struct _eaccelerator_op_array { 
    …… 
    255257        char htabkey[1];                        /* must be last element */ 
    256258} mm_fc_entry; 
     259 
     260#ifndef HAVE_EACCELERATOR_STANDALONE_LOADER 
    257261 
    258262/* 
    …… 
    382386int eaccelerator_md5 (char *s, const char *prefix, const char *key TSRMLS_DC); 
    383387 
    384 void restore_zval (zval * TSRMLS_DC); 
    385388void calc_zval (zval * z TSRMLS_DC); 
    386389void store_zval (zval * z TSRMLS_DC); 
    387390void fixup_zval (zval * z TSRMLS_DC); 
     391void restore_zval (zval * TSRMLS_DC); 
    388392 
    389393unsigned int hash_mm(const char *data, int len);  
    390  
    391 #  ifdef WITH_EACCELERATOR_EXECUTOR 
    392 ZEND_DLEXPORT void eaccelerator_execute (zend_op_array * op_array TSRMLS_DC); 
    393 #  endif 
    394394 
    395395#  ifdef WITH_EACCELERATOR_OPTIMIZER 
    …… 
    400400PHP_FUNCTION (eaccelerator_encode); 
    401401#endif 
    402 #endif /* HAVE_EACCELERATOR_LOADER_STANDALONE */ 
     402#endif /* HAVE_EACCELERATOR_STANDALONE_LOADER */ 
    403403 
    404404#ifdef ZTS 
    …… 
    407407#  define EAG(v) (eaccelerator_globals.v) 
    408408#endif 
    409  
    410 #define MMCG(v) EAG(v) 
    411409 
    412410/*