← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to Zend/zend_vm_def.h

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-26 14:09:58 UTC
  • mfrom: (1.1.16 upstream) (0.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing.  Remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mcrypt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - main/php_version.h: updated with Ubuntu version info
  - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch
  - debian/rules, debian/source_php5.py: Install apport hook. 
* Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Zend/zend_vm_def.h
18
18
   +----------------------------------------------------------------------+
19
19
*/
20
20
 
21
 
/* $Id: zend_vm_def.h 287466 2009-08-18 20:51:49Z stas $ */
 
21
/* $Id: zend_vm_def.h 291282 2009-11-24 21:54:12Z felipe $ */
22
22
 
23
23
/* If you change this file, please regenerate the zend_vm_execute.h and
24
24
 * zend_vm_opcodes.h files by running:
939
939
 
940
940
        if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
941
941
                retval = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
 
942
                FREE_OP1();
942
943
        } else {
943
944
                target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), type, varname TSRMLS_CC);
944
945
/*
3531
3532
                zend_free_op free_op2;
3532
3533
                zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
3533
3534
 
3534
 
                if (Z_TYPE_PP(container) == IS_ARRAY) {
 
3535
                if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
3535
3536
                        HashTable *ht;
3536
3537
                        int isset = 0;
3537
3538