Changeset 269

Show
Ignore:
Timestamp:
09/15/06 14:49:57 (2 years ago)
Author:
bart
Message:

Reverse changeset 205 (doc-comment exclusion) from Tom Regner

<t.regner at librics.de>.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/branches/0.9.5/ChangeLog

    r268 r269  
     12006-09-15  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     2 
     3        * Reverse changeset 205 (doc-comment exclusion) from Tom Regner  
     4          <t.regner at librics.de>.  
     5 
    162006-08-29  Hans Rakers <hans at parse dot nl> 
    27 
    3        * Skip disk cache creation and clean/clear actions when operating in 
    4          shm_only mode. This fixes ticket #165 
     8        * Skip disk cache creation and clean/clear actions when operating in 
     9          shm_only mode. This fixes ticket #165 
    510 
    6112006-08-23  Hans Rakers <hans at parse dot nl> 
    712 
    8        * Fixes for tickets #157 and #164 
     13        * Fixes for tickets #157 and #164 
    914 
    10152006-08-06  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    …… 
    4954 
    50552006-07-24  Hans Rakers <hans at parse dot nl> 
    51        * Fix for ticket #47 and #63, related to problems restoring empty 
    52          strings and empty string array keys from the disk cache. 
     56        * Fix for ticket #47 and #63, related to problems restoring empty 
     57          strings and empty string array keys from the disk cache. 
    5358 
    54592006-07-23  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    …… 
    87922006-06-30  Hans Rakers <hans at parse dot nl> 
    8893 
    89        * Added ability to sort table columns by clicking on the table 
    90          headings in the control panel 
    91        * Quick & dirty fix for eaccelerator_clear to work with the new 
    92          cache dir hashing. This still needs to be done for win32. 
    93  
    94          eaccelerator_clean still needs some fixing to work with the 
    95          dir hashing. 
     94        * Added ability to sort table columns by clicking on the table 
     95          headings in the control panel 
     96        * Quick & dirty fix for eaccelerator_clear to work with the new 
     97          cache dir hashing. This still needs to be done for win32. 
     98 
     99          eaccelerator_clean still needs some fixing to work with the 
     100          dir hashing. 
    96101 
    971022006-06-27  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 

  • eaccelerator/branches/0.9.5/config.m4

    r257 r269  
    100100]) 
    101101 
     102AC_ARG_WITH(eaccelerator-doc-comment-inclusion, 
     103[  --with-eaccelerator-doc-comment-inclusion  If you want eAccelerator to retain doc-comments in  internal php structures.],[ 
     104    enable_doc_comment_inclusion=$withval 
     105],[ 
     106    enable_doc_comment_inclusion=no 
     107]) 
     108 
    102109dnl PHP_BUILD_SHARED 
    103110if test "$PHP_EACCELERATOR" != "no"; then 
    …… 
    108115 
    109116  AC_DEFINE_UNQUOTED(EA_USERID, $ea_userid, [The userid eAccelerator will be running under.])  
    110      
     117 
     118  if test "$enable_doc_comment_inclusion" = "yes"; then 
     119    AC_DEFINE(INCLUDE_DOC_COMMENTS, 1, [If you want eAccelerator to retain doc-comments in internal php structures (meta-programming)]) 
     120  fi 
    111121  if test "$eaccelerator_crash_detection" = "yes"; then 
    112122    AC_DEFINE(WITH_EACCELERATOR_CRASH_DETECTION, 1, [Define if you like to release eAccelerator resources on PHP crash]) 

  • eaccelerator/branches/0.9.5/ea_restore.c

    r260 r269  
    250250#endif 
    251251        FIXUP(from->filename); 
     252#ifdef INCLUDE_DOC_COMMENTS 
     253#ifdef ZEND_ENGINE_2 
     254    FIXUP(from->doc_comment); 
     255#endif 
     256#endif 
    252257} 
    253258 
    …… 
    258263#ifdef ZEND_ENGINE_2 
    259264        FIXUP(from->filename); 
     265#ifdef INCLUDE_DOC_COMMENTS 
     266    FIXUP(from->doc_comment); 
     267#endif 
    260268        fixup_zval_hash(&from->constants_table); 
    261269        fixup_zval_hash(&from->default_properties); 
    …… 
    638646        to->line_start = from->line_start; 
    639647        to->line_end = from->line_end; 
     648#ifdef INCLUDE_DOC_COMMENTS 
     649        to->doc_comment_len = from->doc_comment_len; 
     650    to->doc_comment = from->doc_comment; 
     651#else 
    640652        to->doc_comment_len = 0; 
    641653        to->doc_comment = NULL; 
     654#endif 
    642655#else 
    643656        to->uses_globals = from->uses_globals; 
    …… 
    693706        memcpy(to->name, from->name, from->name_length + 1); 
    694707#ifdef ZEND_ENGINE_2_1 
     708#ifdef INCLUDE_DOC_COMMENTS 
     709     if (from->doc_comment != NULL) { 
     710     to->doc_comment = emalloc(from->doc_comment_len + 1); 
     711     memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
     712     } 
     713#else 
    695714    to->doc_comment_len = 0; 
    696715    to->doc_comment = NULL; 
     716#endif 
    697717#endif 
    698718        return to; 
    …… 
    834854        to->line_start = from->line_start; 
    835855        to->line_end = from->line_end; 
     856#ifdef INCLUDE_DOC_COMMENTS 
     857        to->doc_comment_len = from->doc_comment_len; 
     858#else 
    836859        to->doc_comment_len = 0; 
    837860    to->doc_comment = NULL; 
     861#endif 
    838862/*      if (from->filename != NULL) { 
    839863                size_t len = strlen(from->filename) + 1; 
    …… 
    842866        }*/ 
    843867        to->filename = from->filename; 
     868#ifdef INCLUDE_DOC_COMMENTS 
     869     if (from->doc_comment != NULL) { 
     870     to->doc_comment = emalloc(from->doc_comment_len + 1); 
     871     memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
     872     } 
     873#endif 
    844874 
    845875        /* restore constants table */ 

  • eaccelerator/branches/0.9.5/ea_store.c

    r231 r269  
    7979        EAG(mem) += sizeof(zend_property_info); 
    8080        calc_string(from->name, from->name_length + 1 TSRMLS_CC); 
     81#ifdef INCLUDE_DOC_COMMENTS 
     82#ifdef ZEND_ENGINE_2_1 
     83     if (from->doc_comment != NULL) { 
     84        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     85     } 
     86#endif 
     87#endif 
    8188} 
    8289 
    …… 
    255262        if (from->filename != NULL) 
    256263                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     264#ifdef INCLUDE_DOC_COMMENTS 
     265#ifdef ZEND_ENGINE_2 
     266    if (from->doc_comment != NULL) 
     267        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     268#endif 
     269#endif 
    257270} 
    258271 
    …… 
    274287        if (from->filename != NULL) 
    275288                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     289#ifdef INCLUDE_DOC_COMMENTS 
     290     if (from->doc_comment != NULL)  
     291        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     292#endif 
    276293         
    277294    calc_zval_hash(&from->constants_table); 
    …… 
    715732        to->line_start = from->line_start; 
    716733        to->line_end = from->line_end; 
     734#ifdef INCLUDE_DOC_COMMENTS 
     735    to->doc_comment_len = from->doc_comment_len; 
     736    if (from->doc_comment != NULL) 
     737        to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     738#endif 
    717739#endif 
    718740        return to; 
    …… 
    729751        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC); 
    730752#ifdef ZEND_ENGINE_2_1 
     753#ifdef INCLUDE_DOC_COMMENTS 
     754to->doc_comment_len = from->doc_comment_len;  
     755if (from->doc_comment != NULL) {  
     756       to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     757} 
     758#else 
    731759        to->doc_comment_len = 0; 
    732760        to->doc_comment = NULL; 
     761#endif 
    733762#endif 
    734763        return to; 
    …… 
    874903        to->line_start = from->line_start; 
    875904        to->line_end = from->line_end; 
     905#ifdef INCLUDE_DOC_COMMENTS 
     906    to->doc_comment_len = from->doc_comment_len; 
     907#endif 
    876908 
    877909        if (from->filename != NULL) 
    878910                to->filename = store_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     911#ifdef INCLUDE_DOC_COMMENTS 
     912    if (from->doc_comment != NULL) 
     913        to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     914#endif 
    879915 
    880916        store_zval_hash(&to->constants_table, &from->constants_table); 

  • eaccelerator/branches/0.9.5/eaccelerator.h

    r266 r269  
    228228        zend_uint line_start; 
    229229        zend_uint line_end; 
     230#ifdef INCLUDE_DOC_COMMENTS 
     231    char *doc_comment; 
     232    zend_uint doc_comment_len; 
     233#endif 
    230234#endif 
    231235} eaccelerator_op_array; 
    …… 
    251255        zend_uint line_start; 
    252256        zend_uint line_end; 
     257#ifdef INCLUDE_DOC_COMMENTS 
     258    char *doc_comment; 
     259    zend_uint doc_comment_len; 
     260#endif 
    253261#endif 
    254262} eaccelerator_class_entry; 

  • eaccelerator/trunk/ChangeLog

    r267 r269  
     12006-09-15  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     2 
     3        * Reverse changeset 205 (doc-comment exclusion) from Tom Regner  
     4          <t.regner at librics.de>.  
     5 
    162006-08-29  Hans Rakers <hans at parse dot nl> 
    27 
    3        * Skip disk cache creation and clean/clear actions when operating in 
    4          shm_only mode. This fixes ticket #165 
     8        * Skip disk cache creation and clean/clear actions when operating in 
     9          shm_only mode. This fixes ticket #165 
    510 
    6112006-08-23  Hans Rakers <hans at parse dot nl> 
    712 
    8        * Fixes for tickets #157 and #164 
     13        * Fixes for tickets #157 and #164 
    914 
    10152006-08-06  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    …… 
    7984 
    80852006-07-24  Hans Rakers <hans at parse dot nl> 
    81            * Fix for ticket #47 and #63, related to problems restoring empty 
    82              strings and empty string array keys from the disk cache. 
     86        * Fix for ticket #47 and #63, related to problems restoring empty 
     87          strings and empty string array keys from the disk cache. 
    8388 
    84892006-07-23  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    …… 
    1171222006-06-30  Hans Rakers <hans at parse dot nl> 
    118123 
    119            * Added ability to sort table columns by clicking on the table 
    120              headings in the control panel 
    121            * Quick & dirty fix for eaccelerator_clear to work with the new 
    122              cache dir hashing. This still needs to be done for win32. 
    123  
    124              eaccelerator_clean still needs some fixing to work with the 
    125              dir hashing. 
     124        * Added ability to sort table columns by clicking on the table 
     125          headings in the control panel 
     126        * Quick & dirty fix for eaccelerator_clear to work with the new 
     127          cache dir hashing. This still needs to be done for win32. 
     128 
     129          eaccelerator_clean still needs some fixing to work with the 
     130          dir hashing. 
    126131 
    1271322006-06-27  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 

  • eaccelerator/trunk/config.m4

    r259 r269  
    8989]) 
    9090 
     91AC_ARG_WITH(eaccelerator-doc-comment-inclusion, 
     92[  --with-eaccelerator-doc-comment-inclusion  If you want eAccelerator to retain doc-comments in  internal php structures.],[ 
     93    enable_doc_comment_inclusion=$withval 
     94],[ 
     95    enable_doc_comment_inclusion=no 
     96]) 
     97 
    9198dnl PHP_BUILD_SHARED 
    9299if test "$PHP_EACCELERATOR" != "no"; then 
    …… 
    97104 
    98105  AC_DEFINE_UNQUOTED(EA_USERID, $ea_userid, [The userid eAccelerator will be running under.])  
    99      
     106 
     107  if test "$enable_doc_comment_inclusion" = "yes"; then 
     108    AC_DEFINE(INCLUDE_DOC_COMMENTS, 1, [If you want eAccelerator to retain doc-comments in internal php structures (meta-programming)]) 
     109  fi 
    100110  if test "$eaccelerator_crash_detection" = "yes"; then 
    101111    AC_DEFINE(WITH_EACCELERATOR_CRASH_DETECTION, 1, [Define if you like to release eAccelerator resources on PHP crash]) 

  • eaccelerator/trunk/ea_restore.c

    r265 r269  
    240240#endif 
    241241        FIXUP(from->filename); 
     242#ifdef INCLUDE_DOC_COMMENTS 
     243#ifdef ZEND_ENGINE_2 
     244    FIXUP(from->doc_comment); 
     245#endif 
     246#endif 
    242247} 
    243248 
    …… 
    604609        to->line_start = from->line_start; 
    605610        to->line_end = from->line_end; 
     611#ifdef INCLUDE_DOC_COMMENTS 
     612        to->doc_comment_len = from->doc_comment_len; 
     613    to->doc_comment = from->doc_comment; 
     614#else 
    606615        to->doc_comment_len = 0; 
    607616        to->doc_comment = NULL; 
     617#endif 
    608618#else 
    609619        to->uses_globals = from->uses_globals; 
    …… 
    658668        memcpy(to->name, from->name, from->name_length + 1); 
    659669#ifdef ZEND_ENGINE_2_1 
     670#ifdef INCLUDE_DOC_COMMENTS 
     671     if (from->doc_comment != NULL) { 
     672     to->doc_comment = emalloc(from->doc_comment_len + 1); 
     673     memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
     674     } 
     675#else 
    660676    to->doc_comment_len = 0; 
    661677    to->doc_comment = NULL; 
    …… 
    805821        to->line_start = from->line_start; 
    806822        to->line_end = from->line_end; 
     823#ifdef INCLUDE_DOC_COMMENTS 
     824        to->doc_comment_len = from->doc_comment_len; 
     825#else 
    807826        to->doc_comment_len = 0; 
    808827    to->doc_comment = NULL; 
     828#endif 
    809829/*      if (from->filename != NULL) { 
    810830                size_t len = strlen(from->filename) + 1; 
    …… 
    813833        }*/ 
    814834        to->filename = from->filename; 
     835#ifdef INCLUDE_DOC_COMMENTS 
     836     if (from->doc_comment != NULL) { 
     837     to->doc_comment = emalloc(from->doc_comment_len + 1); 
     838     memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
     839     } 
     840#endif 
    815841 
    816842        /* restore constants table */ 

  • eaccelerator/trunk/ea_store.c

    r255 r269  
    7878        EAG(mem) += sizeof(zend_property_info); 
    7979        calc_string(from->name, from->name_length + 1 TSRMLS_CC); 
     80#ifdef INCLUDE_DOC_COMMENTS 
     81#ifdef ZEND_ENGINE_2_1 
     82     if (from->doc_comment != NULL) { 
     83        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     84     } 
     85#endif 
     86#endif 
    8087} 
    8188#endif 
    …… 
    222229        if (from->filename != NULL) 
    223230                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     231#ifdef INCLUDE_DOC_COMMENTS 
     232#ifdef ZEND_ENGINE_2 
     233    if (from->doc_comment != NULL) 
     234        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     235#endif 
     236#endif 
    224237} 
    225238 
    …… 
    241254        if (from->filename != NULL) 
    242255                calc_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     256#ifdef INCLUDE_DOC_COMMENTS 
     257     if (from->doc_comment != NULL)  
     258        calc_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     259#endif 
    243260         
    244261    calc_zval_hash(&from->constants_table); 
    …… 
    662679        to->line_start = from->line_start; 
    663680        to->line_end = from->line_end; 
     681#ifdef INCLUDE_DOC_COMMENTS 
     682    to->doc_comment_len = from->doc_comment_len; 
     683    if (from->doc_comment != NULL) 
     684        to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     685#endif 
    664686#endif 
    665687        return to; 
    …… 
    676698        to->name = store_string(from->name, from->name_length + 1 TSRMLS_CC); 
    677699#ifdef ZEND_ENGINE_2_1 
     700#ifdef INCLUDE_DOC_COMMENTS 
     701to->doc_comment_len = from->doc_comment_len;  
     702if (from->doc_comment != NULL) {  
     703       to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     704} 
     705#else 
    678706        to->doc_comment_len = 0; 
    679707        to->doc_comment = NULL; 
     708#endif 
    680709#endif 
    681710        return to; 
    …… 
    825854        to->line_start = from->line_start; 
    826855        to->line_end = from->line_end; 
     856#ifdef INCLUDE_DOC_COMMENTS 
     857    to->doc_comment_len = from->doc_comment_len; 
     858#endif 
    827859 
    828860        if (from->filename != NULL) 
    829861                to->filename = store_string(from->filename, strlen(from->filename) + 1 TSRMLS_CC); 
     862#ifdef INCLUDE_DOC_COMMENTS 
     863    if (from->doc_comment != NULL) 
     864        to->doc_comment = store_string(from->doc_comment, from->doc_comment_len + 1 TSRMLS_CC); 
     865#endif 
    830866 
    831867        store_zval_hash(&to->constants_table, &from->constants_table); 

  • eaccelerator/trunk/eaccelerator.h

    r266 r269  
    230230        zend_uint line_start; 
    231231        zend_uint line_end; 
     232#ifdef INCLUDE_DOC_COMMENTS 
     233    char *doc_comment; 
     234    zend_uint doc_comment_len; 
     235#endif 
    232236#endif 
    233237} ea_op_array; 
    …… 
    253257        zend_uint line_start; 
    254258        zend_uint line_end; 
     259#ifdef INCLUDE_DOC_COMMENTS 
     260    char *doc_comment; 
     261    zend_uint doc_comment_len; 
    255262#endif 
    256263} ea_class_entry;