Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index d06b6c4ae3c90a78fce68d25851093f776d6ea1c,649fda367e4682a69237ce995725f0530a01d7b2..3a87745959f331b532e23ef1a4c551408a53829e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -53,10 -43,13 +53,12 @@@ PH
      set). (cmb)
  
  - Standard:
-   . Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
-     (Bruce Weirdan)
+   . Fixed bug #73594 (dns_get_record does not populate $additional out
+     parameter). (Bruce Weirdan)
+   . Fixed bug #70213 (Unserialize context shared on double class lookup).
+     (Taoguang Chen)
  
 -
 -- Zlib:
 +- Zlib
    . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
      (Matt Bonneau)
  

diff --cc ext/standard/var_unserializer.c
index f3b997a6ef8c009093b8a9887ffe7ae7e6112eed,d1eb7b4bb0c3ab3a8db06dfe5fb1616fb33b9cdb..4e2bee3c9e406f0e3343b449d3b0b03fc87dc244
--- 1/ext/standard/var_unserializer.c
--- 2/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -647,9 -608,9 +647,9 @@@ static int php_var_unserialize_internal
  yy2:
        ++YYCURSOR;
  yy3:
- #line 959 "ext/standard/var_unserializer.re"
 -#line 922 "ext/standard/var_unserializer.re"
++#line 961 "ext/standard/var_unserializer.re"
        { return 0; }
 -#line 614 "ext/standard/var_unserializer.c"
 +#line 653 "ext/standard/var_unserializer.c"
  yy4:
        yych = *(YYMARKER = ++YYCURSOR);
        if (yych == ':') goto yy17;
@@@ -696,7 -657,7 +696,7 @@@ yy14
        goto yy3;
  yy15:
        ++YYCURSOR;
- #line 953 "ext/standard/var_unserializer.re"
 -#line 916 "ext/standard/var_unserializer.re"
++#line 955 "ext/standard/var_unserializer.re"
        {
        /* this is the case where we have less data than planned */
        php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
@@@ -1274,10 -1237,10 +1276,10 @@@ yy82
  
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
  }
- #line 1278 "ext/standard/var_unserializer.c"
 -#line 1241 "ext/standard/var_unserializer.c"
++#line 1280 "ext/standard/var_unserializer.c"
  yy84:
        ++YYCURSOR;
 -#line 704 "ext/standard/var_unserializer.re"
 +#line 743 "ext/standard/var_unserializer.re"
        {
        size_t len, maxlen;
        zend_string *str;
@@@ -1311,10 -1274,10 +1313,10 @@@
        ZVAL_STR(rval, str);
        return 1;
  }
- #line 1315 "ext/standard/var_unserializer.c"
 -#line 1278 "ext/standard/var_unserializer.c"
++#line 1317 "ext/standard/var_unserializer.c"
  yy86:
        ++YYCURSOR;
 -#line 738 "ext/standard/var_unserializer.re"
 +#line 777 "ext/standard/var_unserializer.re"
        {
        zend_long elements = parse_iv(start + 2);
        /* use iv() not uiv() in order to check data range */
@@@ -1338,7 -1301,7 +1340,7 @@@
  
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
  }
- #line 1342 "ext/standard/var_unserializer.c"
 -#line 1305 "ext/standard/var_unserializer.c"
++#line 1344 "ext/standard/var_unserializer.c"
  yy88:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@@ -1370,10 -1333,10 +1372,10 @@@ yy92
        return object_common2(UNSERIALIZE_PASSTHRU,
                        object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
  }
- #line 1374 "ext/standard/var_unserializer.c"
 -#line 1337 "ext/standard/var_unserializer.c"
++#line 1376 "ext/standard/var_unserializer.c"
  yy94:
        ++YYCURSOR;
 -#line 672 "ext/standard/var_unserializer.re"
 +#line 711 "ext/standard/var_unserializer.re"
        {
        size_t len, maxlen;
        char *str;
@@@ -1405,7 -1368,7 +1407,7 @@@
        ZVAL_STRINGL(rval, str, len);
        return 1;
  }
- #line 1409 "ext/standard/var_unserializer.c"
 -#line 1372 "ext/standard/var_unserializer.c"
++#line 1411 "ext/standard/var_unserializer.c"
  yy96:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
@@@ -1429,9 -1392,9 +1431,9 @@@ yy97
  
        return 1;
  }
- #line 1433 "ext/standard/var_unserializer.c"
 -#line 1396 "ext/standard/var_unserializer.c"
++#line 1435 "ext/standard/var_unserializer.c"
  }
- #line 961 "ext/standard/var_unserializer.re"
 -#line 924 "ext/standard/var_unserializer.re"
++#line 963 "ext/standard/var_unserializer.re"
  
  
        return 0;

diff --cc ext/standard/var_unserializer.re
Simple merge