[BACK]Return to zend_compile.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_compile.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/10/14 08:02:48 version 1.1.1.5, 2014/06/15 20:04:03
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |      | that is bundled with this package in the file LICENSE, and is        | 
Line 905  static zend_bool opline_is_fetch_this(const zend_op *o Line 905  static zend_bool opline_is_fetch_this(const zend_op *o
 {  {
         if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST)          if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST)
                 && (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING)                  && (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING)
                   && ((opline->extended_value & ZEND_FETCH_STATIC_MEMBER) != ZEND_FETCH_STATIC_MEMBER)
                 && (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL)                  && (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL)
                 && (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1))                  && (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1))
                 && !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) {                  && !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) {
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>