Show
Ignore:
Timestamp:
07/10/05 10:12:34 (3 years ago)
Author:
zoeloelip
Message:

* Renamed some macros from MMC (mmcache) to EA (eg MMCG is now EAG)
* Added eA file header to mm.c, mm.h and x86-spinlocks.h
* Readded a hack to the loader to prevent zend2 segfaults

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/content.c

    r67 r123  
    8080    while (*ch == ' ') {ch++;} 
    8181    if (strstr(ch, "text") != ch) { 
    82       MMCG(compress_content) = 0; 
     82      EAG(compress_content) = 0; 
    8383      return 0; 
    8484    } 
    8585  } else if (strstr(sapi_header->header, "Content-Encoding") == sapi_header->header) { 
    86     MMCG(compress_content) = 0; 
     86    EAG(compress_content) = 0; 
    8787    return 0; 
    8888  } 
    …… 
    9595 
    9696static int eaccelerator_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC) { 
    97   if (MMCG(content_headers) != NULL) { 
     97  if (EAG(content_headers) != NULL) { 
    9898    sapi_header_struct x; 
    9999    memcpy(&x, sapi_header, sizeof(sapi_header_struct)); 
    100100    x.header = estrndup(sapi_header->header, sapi_header->header_len); 
    101     zend_llist_add_element(MMCG(content_headers), &x); 
     101    zend_llist_add_element(EAG(content_headers), &x); 
    102102  } 
    103103  eaccelerator_check_compression(sapi_header TSRMLS_CC); 
    …… 
    153153  array_init(&cache_array); 
    154154  MAKE_STD_ZVAL(cache_content); 
    155   if (MMCG(content_headers) && (MMCG(content_headers)->count > 0)) { 
    156     zend_llist_element *p = MMCG(content_headers)->head; 
     155  if (EAG(content_headers) && (EAG(content_headers)->count > 0)) { 
     156    zend_llist_element *p = EAG(content_headers)->head; 
    157157    zval *headers; 
    158158    MAKE_STD_ZVAL(headers); 
    …… 
    209209  zval  **server_vars, **encoding; 
    210210 
    211   if (MMCG(compression_enabled) && 
    212       MMCG(compress_content) && 
     211  if (EAG(compression_enabled) && 
     212      EAG(compress_content) && 
    213213      !SG(headers_sent) && 
    214214      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && 
    …… 
    268268    } 
    269269    INIT_ZVAL(level); 
    270     ZVAL_LONG(&level,MMCG(compress_level)); 
     270    ZVAL_LONG(&level,EAG(compress_level)); 
    271271    params[1] = &level; 
    272272    if (zkey != NULL && 
    …… 
    319319 
    320320static void eaccelerator_destroy_headers(TSRMLS_D) { 
    321   if (MMCG(content_headers) != NULL) { 
    322     zend_llist_destroy(MMCG(content_headers)); 
    323     efree(MMCG(content_headers)); 
    324     MMCG(content_headers) = NULL; 
     321  if (EAG(content_headers) != NULL) { 
     322    zend_llist_destroy(EAG(content_headers)); 
     323    efree(EAG(content_headers)); 
     324    EAG(content_headers) = NULL; 
    325325  } 
    326326} 
    …… 
    391391    RETURN_FALSE; 
    392392  } 
    393   if (MMCG(content_headers) != NULL) { 
     393  if (EAG(content_headers) != NULL) { 
    394394    RETURN_FALSE; 
    395395  } 
    396   if (MMCG(compression_enabled) && 
    397       MMCG(compress_content) && 
     396  if (EAG(compression_enabled) && 
     397      EAG(compress_content) && 
    398398      !SG(headers_sent) && 
    399399      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS && 
    …… 
    486486    ZEND_PUTC(ch); 
    487487    /* Init headers cache */ 
    488     MMCG(content_headers) = emalloc(sizeof(zend_llist)); 
    489     zend_llist_init(MMCG(content_headers), sizeof(sapi_header_struct), (void (*)(void *))eaccelerator_free_header, 0); 
     488    EAG(content_headers) = emalloc(sizeof(zend_llist)); 
     489    zend_llist_init(EAG(content_headers), sizeof(sapi_header_struct), (void (*)(void *))eaccelerator_free_header, 0); 
    490490    RETURN_TRUE; 
    491491  }