Merge branch 'PHP-5.5' into PHP-5.6

diff --cc Zend/zend_vm_def.h
index aa34efa5b3b91c69b0e331e0e7430817c68c5eba,8954e69cc10707b8e664f9669cf6671ddaccea96..efd98d133e14b3955354fe36e977e24d8db10ec2
--- 1/Zend/zend_vm_def.h
--- 2/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -418,8 -420,10 +417,9 @@@ ZEND_VM_HELPER_EX(zend_binary_assign_op
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (IS_OP2_TMP_FREE()) {

diff --cc Zend/zend_vm_execute.h
index a89e1d558c754b3c7a14907967bf3d70ea3a8839,c0b64b61a31af843c62438ca168a48cc1d3421d5..e9c7f51849e42801aacaa658cbeadf8a1139be81
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -14588,8 -14196,10 +14587,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -17099,8 -16713,10 +17098,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (1) {
@@@ -19197,8 -18810,10 +19196,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -21400,8 -21014,10 +21399,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -22830,8 -22448,10 +22829,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -24789,8 -24406,10 +24788,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -26202,8 -25828,10 +26201,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (1) {
@@@ -27524,8 -27154,10 +27523,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -28847,8 -28481,10 +28846,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -29278,8 -28909,10 +29277,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -32113,8 -31723,10 +32112,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -34393,8 -34005,10 +34392,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (1) {
@@@ -36352,8 -35964,10 +36351,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -38415,8 -38029,10 +38414,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {
@@@ -39696,8 -39315,10 +39695,9 @@@ static int ZEND_FASTCALL zend_binary_as
                                if (RETURN_VALUE_USED(opline)) {
                                        PZVAL_LOCK(&EG(uninitialized_zval));
                                        EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
 -                                      EX_T(opline->result.var).var.ptr_ptr = NULL;
                                }
                        }
+                       zval_ptr_dtor(&object);
                }
  
                if (0) {