From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 2 Dec 2016 09:35:44 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04500f1fe0106008d9b66f7a11527f45b951c943;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed possible memory leak in &=, |=, ^=.
---

04500f1fe0106008d9b66f7a11527f45b951c943
diff --cc Zend/tests/self_and.phpt
index 44db877e92,e9ddc849eb..071eb509cb
--- a/Zend/tests/self_and.phpt
+++ b/Zend/tests/self_and.phpt
@@@ -20,10 -28,8 +28,12 @@@ echo "Done\n"
  ?>
  --EXPECTF--	
  int(18)
 +
 +Warning: A non-numeric value encountered in %s on line %d
  int(0)
 +
 +Notice: A non well formed numeric value encountered in %s on line %d
  int(33)
+ string(1) " "
+ string(2) "  "
  Done
diff --cc Zend/tests/self_or.phpt
index 8ace518bde,991aafa980..cecf70d795
--- a/Zend/tests/self_or.phpt
+++ b/Zend/tests/self_or.phpt
@@@ -20,10 -28,8 +28,12 @@@ echo "Done\n"
  ?>
  --EXPECTF--
  int(127)
 +
 +Warning: A non-numeric value encountered in %s on line %d
  int(11)
 +
 +Notice: A non well formed numeric value encountered in %s on line %d
  int(45345)
+ string(1) "f"
+ string(2) "ff"
  Done
diff --cc Zend/tests/self_xor.phpt
index c097930d6d,1577690a89..f56177567b
--- a/Zend/tests/self_xor.phpt
+++ b/Zend/tests/self_xor.phpt
@@@ -20,10 -28,8 +28,12 @@@ echo "Done\n"
  ?>
  --EXPECTF--
  int(109)
 +
 +Warning: A non-numeric value encountered in %s on line %d
  int(11)
 +
 +Notice: A non well formed numeric value encountered in %s on line %d
  int(45312)
- Done
+ string(1) "f"
+ string(2) "ff"
+ Done