Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: (48 commits)
  Update NEWs
  Unused label
  Fixed bug #72853 (stream_set_blocking doesn't work)
  fix test
  Bug #72663 - part 3
  Bug #72663 - part 2
  Bug #72663 - part 1
  Update NEWS
  BLock test with memory leak
  fix tests
  Fix TSRM build
  Fix bug #72850 - integer overflow in uuencode
  Fixed bug #72849 - integer overflow in urlencode
  Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
  Fix bug #72838 - 	Integer overflow lead to heap corruption in sql_regcase
  Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
  Fix bug #72836 - integer overflow in base64_decode caused heap corruption
  Fix for bug #72807 - do not produce strings with negative length
  Fix for bug #72790 and bug #72799
  Fix bug #72730 - imagegammacorrect allows arbitrary write access
  ...

Conflicts:
	ext/standard/var_unserializer.c

diff --cc Zend/zend_alloc.c
Simple merge

diff --cc ext/bz2/bz2.c
Simple merge

diff --cc ext/curl/interface.c
Simple merge

diff --cc ext/exif/exif.c
Simple merge

diff --cc ext/gd/gd.c
Simple merge

diff --cc ext/mcrypt/mcrypt.c
Simple merge

diff --cc ext/session/session.c
Simple merge

diff --cc ext/snmp/snmp.c
Simple merge

diff --cc ext/standard/base64.c
Simple merge

diff --cc ext/standard/ftp_fopen_wrapper.c
Simple merge

diff --cc ext/standard/php_smart_string.h
Simple merge

diff --cc ext/standard/var_unserializer.c
index f96fdb40d6c008f39a7973c3e1545dc3c2af855b,6b33d84bd2eed5fe26d7914dab362611de051f57..d59231cf89f9728117552a843831fabce9c19b53
--- 1/ext/standard/var_unserializer.c
--- 2/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.16 */
 -/* Generated by re2c 0.13.7.5 */
++/* Generated by re2c 0.13.5 */
  #line 1 "ext/standard/var_unserializer.re"
  /*
    +----------------------------------------------------------------------+
@@@ -549,7 -550,7 +585,7 @@@ static int php_var_unserialize_internal
        start = cursor;
  
  
- #line 553 "ext/standard/var_unserializer.c"
 -#line 554 "ext/standard/var_unserializer.c"
++#line 589 "ext/standard/var_unserializer.c"
  {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@@ -590,29 -592,30 +627,30 @@@
        yych = *YYCURSOR;
        switch (yych) {
        case 'C':
-       case 'O':       goto yy4;
+       case 'O':       goto yy13;
        case 'N':       goto yy5;
-       case 'R':       goto yy6;
-       case 'S':       goto yy7;
-       case 'a':       goto yy8;
-       case 'b':       goto yy9;
-       case 'd':       goto yy10;
-       case 'i':       goto yy11;
+       case 'R':       goto yy2;
+       case 'S':       goto yy10;
+       case 'a':       goto yy11;
+       case 'b':       goto yy6;
+       case 'd':       goto yy8;
+       case 'i':       goto yy7;
        case 'o':       goto yy12;
-       case 'r':       goto yy13;
-       case 's':       goto yy14;
-       case '}':       goto yy15;
-       default:        goto yy2;
+       case 'r':       goto yy4;
+       case 's':       goto yy9;
+       case '}':       goto yy14;
+       default:        goto yy16;
        }
  yy2:
-       ++YYCURSOR;
+       yych = *(YYMARKER = ++YYCURSOR);
+       if (yych == ':') goto yy95;
  yy3:
- #line 919 "ext/standard/var_unserializer.re"
 -#line 884 "ext/standard/var_unserializer.re"
++#line 955 "ext/standard/var_unserializer.re"
        { return 0; }
- #line 613 "ext/standard/var_unserializer.c"
 -#line 580 "ext/standard/var_unserializer.c"
++#line 651 "ext/standard/var_unserializer.c"
  yy4:
        yych = *(YYMARKER = ++YYCURSOR);
-       if (yych == ':') goto yy17;
+       if (yych == ':') goto yy89;
        goto yy3;
  yy5:
        yych = *++YYCURSOR;
@@@ -648,21 -651,20 +686,20 @@@ yy12
        goto yy3;
  yy13:
        yych = *(YYMARKER = ++YYCURSOR);
-       if (yych == ':') goto yy28;
+       if (yych == ':') goto yy17;
        goto yy3;
  yy14:
-       yych = *(YYMARKER = ++YYCURSOR);
-       if (yych == ':') goto yy29;
-       goto yy3;
- yy15:
        ++YYCURSOR;
- #line 913 "ext/standard/var_unserializer.re"
 -#line 878 "ext/standard/var_unserializer.re"
++#line 949 "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");
        return 0; /* not sure if it should be 0 or 1 here? */
  }
- #line 666 "ext/standard/var_unserializer.c"
 -#line 629 "ext/standard/var_unserializer.c"
++#line 700 "ext/standard/var_unserializer.c"
+ yy16:
+       yych = *++YYCURSOR;
+       goto yy3;
  yy17:
        yych = *++YYCURSOR;
        if (yybm[0+yych] & 128) {
@@@ -673,131 -675,208 +710,207 @@@ yy18
        YYCURSOR = YYMARKER;
        goto yy3;
  yy19:
-       ++YYCURSOR;
- #line 608 "ext/standard/var_unserializer.re"
-       {
-       *p = YYCURSOR;
-       ZVAL_NULL(rval);
-       return 1;
- }
- #line 684 "ext/standard/var_unserializer.c"
- yy21:
        yych = *++YYCURSOR;
-       if (yych <= ',') {
-               if (yych == '+') goto yy33;
-               goto yy18;
-       } else {
-               if (yych <= '-') goto yy33;
-               if (yych <= '/') goto yy18;
-               if (yych <= '9') goto yy34;
-               goto yy18;
+       if (yybm[0+yych] & 128) {
+               goto yy20;
        }
- yy22:
-       yych = *++YYCURSOR;
-       if (yych == '+') goto yy36;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy37;
        goto yy18;
- yy23:
-       yych = *++YYCURSOR;
-       if (yych == '+') goto yy39;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy40;
-       goto yy18;
- yy24:
-       yych = *++YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych <= '1') goto yy42;
-       goto yy18;
- yy25:
+ yy20:
+       ++YYCURSOR;
+       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       yych = *YYCURSOR;
+       if (yybm[0+yych] & 128) {
+               goto yy20;
+       }
 -      if (yych <= '/') goto yy18;
 -      if (yych >= ';') goto yy18;
++      if (yych != ':') goto yy18;
        yych = *++YYCURSOR;
-       if (yych <= '/') {
-               if (yych <= ',') {
-                       if (yych == '+') goto yy43;
-                       goto yy18;
-               } else {
-                       if (yych <= '-') goto yy44;
-                       if (yych <= '.') goto yy45;
-                       goto yy18;
+       if (yych != '"') goto yy18;
+       ++YYCURSOR;
 -#line 733 "ext/standard/var_unserializer.re"
++#line 804 "ext/standard/var_unserializer.re"
+       {
+       size_t len, len2, len3, maxlen;
+       zend_long elements;
+       char *str;
+       zend_string *class_name;
+       zend_class_entry *ce;
+       int incomplete_class = 0;
+ 
+       int custom_object = 0;
+ 
+       zval user_func;
+       zval retval;
+       zval args[1];
+ 
+     if (!var_hash) return 0;
+       if (*start == 'C') {
+               custom_object = 1;
+       }
+ 
+       len2 = len = parse_uiv(start + 2);
+       maxlen = max - YYCURSOR;
+       if (maxlen < len || len == 0) {
+               *p = start + 2;
+               return 0;
+       }
+ 
+       str = (char*)YYCURSOR;
+ 
+       YYCURSOR += len;
+ 
+       if (*(YYCURSOR) != '"') {
+               *p = YYCURSOR;
+               return 0;
+       }
+       if (*(YYCURSOR+1) != ':') {
+               *p = YYCURSOR+1;
+               return 0;
+       }
+ 
+       len3 = strspn(str, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\");
+       if (len3 != len)
+       {
+               *p = YYCURSOR + len3 - len;
+               return 0;
+       }
+ 
+       class_name = zend_string_init(str, len, 0);
+ 
+       do {
+               if(!unserialize_allowed_class(class_name, classes)) {
+                       incomplete_class = 1;
+                       ce = PHP_IC_ENTRY;
+                       break;
                }
-       } else {
-               if (yych <= 'I') {
-                       if (yych <= '9') goto yy46;
-                       if (yych <= 'H') goto yy18;
-                       goto yy48;
-               } else {
-                       if (yych == 'N') goto yy49;
-                       goto yy18;
+ 
+               /* Try to find class directly */
+               BG(serialize_lock)++;
+               ce = zend_lookup_class(class_name);
+               if (ce) {
+                       BG(serialize_lock)--;
+                       if (EG(exception)) {
+                               zend_string_release(class_name);
+                               return 0;
+                       }
+                       break;
                }
+               BG(serialize_lock)--;
+ 
+               if (EG(exception)) {
+                       zend_string_release(class_name);
+                       return 0;
+               }
+ 
+               /* Check for unserialize callback */
+               if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) {
+                       incomplete_class = 1;
+                       ce = PHP_IC_ENTRY;
+                       break;
+               }
+ 
+               /* Call unserialize callback */
+               ZVAL_STRING(&user_func, PG(unserialize_callback_func));
+ 
+               ZVAL_STR_COPY(&args[0], class_name);
+               BG(serialize_lock)++;
+               if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) {
+                       BG(serialize_lock)--;
+                       if (EG(exception)) {
+                               zend_string_release(class_name);
+                               zval_ptr_dtor(&user_func);
+                               zval_ptr_dtor(&args[0]);
+                               return 0;
+                       }
+                       php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func));
+                       incomplete_class = 1;
+                       ce = PHP_IC_ENTRY;
+                       zval_ptr_dtor(&user_func);
+                       zval_ptr_dtor(&args[0]);
+                       break;
+               }
+               BG(serialize_lock)--;
+               zval_ptr_dtor(&retval);
+               if (EG(exception)) {
+                       zend_string_release(class_name);
+                       zval_ptr_dtor(&user_func);
+                       zval_ptr_dtor(&args[0]);
+                       return 0;
+               }
+ 
+               /* The callback function may have defined the class */
+               if ((ce = zend_lookup_class(class_name)) == NULL) {
+                       php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func));
+                       incomplete_class = 1;
+                       ce = PHP_IC_ENTRY;
+               }
+ 
+               zval_ptr_dtor(&user_func);
+               zval_ptr_dtor(&args[0]);
+               break;
+       } while (1);
+ 
+       *p = YYCURSOR;
+ 
+       if (custom_object) {
+               int ret;
+ 
+               ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
+ 
+               if (ret && incomplete_class) {
+                       php_store_class_name(rval, ZSTR_VAL(class_name), len2);
+               }
+               zend_string_release(class_name);
+               return ret;
        }
- yy26:
-       yych = *++YYCURSOR;
-       if (yych <= ',') {
-               if (yych == '+') goto yy50;
-               goto yy18;
-       } else {
-               if (yych <= '-') goto yy50;
-               if (yych <= '/') goto yy18;
-               if (yych <= '9') goto yy51;
-               goto yy18;
-       }
- yy27:
-       yych = *++YYCURSOR;
-       if (yych <= ',') {
-               if (yych == '+') goto yy53;
-               goto yy18;
-       } else {
-               if (yych <= '-') goto yy53;
-               if (yych <= '/') goto yy18;
-               if (yych <= '9') goto yy54;
-               goto yy18;
+ 
+       elements = object_common1(UNSERIALIZE_PASSTHRU, ce);
+ 
+       if (incomplete_class) {
+               php_store_class_name(rval, ZSTR_VAL(class_name), len2);
        }
- yy28:
+       zend_string_release(class_name);
+ 
+       return object_common2(UNSERIALIZE_PASSTHRU, elements);
+ }
 -#line 805 "ext/standard/var_unserializer.c"
++#line 875 "ext/standard/var_unserializer.c"
+ yy25:
        yych = *++YYCURSOR;
        if (yych <= ',') {
-               if (yych == '+') goto yy56;
-               goto yy18;
+               if (yych != '+') goto yy18;
        } else {
-               if (yych <= '-') goto yy56;
+               if (yych <= '-') goto yy26;
                if (yych <= '/') goto yy18;
-               if (yych <= '9') goto yy57;
+               if (yych <= '9') goto yy27;
                goto yy18;
        }
- yy29:
+ yy26:
        yych = *++YYCURSOR;
-       if (yych == '+') goto yy59;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy60;
-       goto yy18;
- yy30:
-       yych = *++YYCURSOR;
-       if (yybm[0+yych] & 128) {
-               goto yy31;
-       }
-       goto yy18;
- yy31:
+       if (yych >= ':') goto yy18;
+ yy27:
        ++YYCURSOR;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
-       if (yybm[0+yych] & 128) {
-               goto yy31;
-       }
        if (yych <= '/') goto yy18;
-       if (yych <= ':') goto yy62;
-       goto yy18;
- yy33:
+       if (yych <= '9') goto yy27;
+       if (yych >= ';') goto yy18;
        yych = *++YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych >= ':') goto yy18;
- yy34:
+       if (yych != '"') goto yy18;
        ++YYCURSOR;
-       if (YYLIMIT <= YYCURSOR) YYFILL(1);
-       yych = *YYCURSOR;
 -#line 726 "ext/standard/var_unserializer.re"
++#line 797 "ext/standard/var_unserializer.re"
+       {
+     if (!var_hash) return 0;
+ 
+       return object_common2(UNSERIALIZE_PASSTHRU,
+                       object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
+ }
 -#line 837 "ext/standard/var_unserializer.c"
++#line 907 "ext/standard/var_unserializer.c"
+ yy32:
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy33;
        if (yych <= '/') goto yy18;
        if (yych <= '9') goto yy34;
-       if (yych == ';') goto yy63;
        goto yy18;
- yy36:
+ yy33:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
        if (yych >= ':') goto yy18;
@@@ -806,89 -885,43 +919,43 @@@ yy34
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy37;
-       if (yych <= ':') goto yy65;
-       goto yy18;
- yy39:
+       if (yych <= '9') goto yy34;
+       if (yych >= ';') goto yy18;
        yych = *++YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych >= ':') goto yy18;
- yy40:
+       if (yych != '{') goto yy18;
        ++YYCURSOR;
-       if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-       yych = *YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy40;
-       if (yych <= ':') goto yy66;
-       goto yy18;
- yy42:
-       yych = *++YYCURSOR;
-       if (yych == ';') goto yy67;
-       goto yy18;
- yy43:
-       yych = *++YYCURSOR;
-       if (yych == '.') goto yy45;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy46;
-       goto yy18;
- yy44:
-       yych = *++YYCURSOR;
-       if (yych <= '/') {
-               if (yych != '.') goto yy18;
-       } else {
-               if (yych <= '9') goto yy46;
-               if (yych == 'I') goto yy48;
-               goto yy18;
 -#line 702 "ext/standard/var_unserializer.re"
++#line 773 "ext/standard/var_unserializer.re"
+       {
+       zend_long elements = parse_iv(start + 2);
+       /* use iv() not uiv() in order to check data range */
+       *p = YYCURSOR;
+     if (!var_hash) return 0;
+ 
+       if (elements < 0) {
+               return 0;
        }
- yy45:
-       yych = *++YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy69;
-       goto yy18;
- yy46:
-       ++YYCURSOR;
-       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
-       yych = *YYCURSOR;
-       if (yych <= ':') {
-               if (yych <= '.') {
-                       if (yych <= '-') goto yy18;
-                       goto yy69;
-               } else {
-                       if (yych <= '/') goto yy18;
-                       if (yych <= '9') goto yy46;
-                       goto yy18;
-               }
-       } else {
-               if (yych <= 'E') {
-                       if (yych <= ';') goto yy71;
-                       if (yych <= 'D') goto yy18;
-                       goto yy73;
-               } else {
-                       if (yych == 'e') goto yy73;
-                       goto yy18;
-               }
+ 
+       array_init_size(rval, elements);
+       if (elements) {
+               /* we can't convert from packed to hash during unserialization, because
+                  reference to some zvals might be keept in var_hash (to support references) */
+               zend_hash_real_init(Z_ARRVAL_P(rval), 0);
        }
- yy48:
-       yych = *++YYCURSOR;
-       if (yych == 'N') goto yy74;
-       goto yy18;
- yy49:
-       yych = *++YYCURSOR;
-       if (yych == 'A') goto yy75;
-       goto yy18;
- yy50:
+ 
+       if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) {
+               return 0;
+       }
+ 
+       return finish_nested_data(UNSERIALIZE_PASSTHRU);
+ }
 -#line 882 "ext/standard/var_unserializer.c"
++#line 952 "ext/standard/var_unserializer.c"
+ yy39:
        yych = *++YYCURSOR;
+       if (yych == '+') goto yy40;
        if (yych <= '/') goto yy18;
-       if (yych >= ':') goto yy18;
- yy51:
-       ++YYCURSOR;
-       if (YYLIMIT <= YYCURSOR) YYFILL(1);
-       yych = *YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy51;
-       if (yych == ';') goto yy76;
+       if (yych <= '9') goto yy41;
        goto yy18;
- yy53:
+ yy40:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
        if (yych >= ':') goto yy18;
@@@ -897,22 -930,53 +964,53 @@@ yy41
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy54;
-       if (yych <= ':') goto yy78;
-       goto yy18;
- yy56:
+       if (yych <= '9') goto yy41;
+       if (yych >= ';') goto yy18;
        yych = *++YYCURSOR;
-       if (yych <= '/') goto yy18;
-       if (yych >= ':') goto yy18;
- yy57:
+       if (yych != '"') goto yy18;
        ++YYCURSOR;
-       if (YYLIMIT <= YYCURSOR) YYFILL(1);
-       yych = *YYCURSOR;
 -#line 668 "ext/standard/var_unserializer.re"
++#line 739 "ext/standard/var_unserializer.re"
+       {
+       size_t len, maxlen;
+       zend_string *str;
+ 
+       len = parse_uiv(start + 2);
+       maxlen = max - YYCURSOR;
+       if (maxlen < len) {
+               *p = start + 2;
+               return 0;
+       }
+ 
+       if ((str = unserialize_str(&YYCURSOR, len, maxlen)) == NULL) {
+               return 0;
+       }
+ 
+       if (*(YYCURSOR) != '"') {
+               zend_string_free(str);
+               *p = YYCURSOR;
+               return 0;
+       }
+ 
+       if (*(YYCURSOR + 1) != ';') {
+               efree(str);
+               *p = YYCURSOR + 1;
+               return 0;
+       }
+ 
+       YYCURSOR += 2;
+       *p = YYCURSOR;
+ 
+       ZVAL_STR(rval, str);
+       return 1;
+ }
 -#line 937 "ext/standard/var_unserializer.c"
++#line 1007 "ext/standard/var_unserializer.c"
+ yy46:
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy47;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy57;
-       if (yych == ';') goto yy79;
+       if (yych <= '9') goto yy48;
        goto yy18;
- yy59:
+ yy47:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
        if (yych >= ':') goto yy18;
@@@ -921,60 -985,113 +1019,113 @@@ yy48
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy60;
-       if (yych <= ':') goto yy81;
-       goto yy18;
- yy62:
+       if (yych <= '9') goto yy48;
+       if (yych >= ';') goto yy18;
        yych = *++YYCURSOR;
-       if (yych == '"') goto yy82;
-       goto yy18;
- yy63:
+       if (yych != '"') goto yy18;
        ++YYCURSOR;
- #line 557 "ext/standard/var_unserializer.re"
 -#line 636 "ext/standard/var_unserializer.re"
++#line 707 "ext/standard/var_unserializer.re"
        {
-       zend_long id;
- 
-       *p = YYCURSOR;
-       if (!var_hash) return 0;
+       size_t len, maxlen;
+       char *str;
  
-       id = parse_iv(start + 2) - 1;
-       if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
+       len = parse_uiv(start + 2);
+       maxlen = max - YYCURSOR;
+       if (maxlen < len) {
+               *p = start + 2;
                return 0;
        }
  
-       zval_ptr_dtor(rval);
-       if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
-               ZVAL_UNDEF(rval);
-               return 1;
+       str = (char*)YYCURSOR;
+ 
+       YYCURSOR += len;
+ 
+       if (*(YYCURSOR) != '"') {
+               *p = YYCURSOR;
+               return 0;
        }
-       if (Z_ISREF_P(rval_ref)) {
-               ZVAL_COPY(rval, rval_ref);
-       } else {
-               ZVAL_NEW_REF(rval_ref, rval_ref);
-               ZVAL_COPY(rval, rval_ref);
+ 
+       if (*(YYCURSOR + 1) != ';') {
+               *p = YYCURSOR + 1;
+               return 0;
        }
  
+       YYCURSOR += 2;
+       *p = YYCURSOR;
+ 
+       ZVAL_STRINGL(rval, str, len);
        return 1;
  }
- #line 960 "ext/standard/var_unserializer.c"
- yy65:
 -#line 990 "ext/standard/var_unserializer.c"
++#line 1060 "ext/standard/var_unserializer.c"
+ yy53:
+       yych = *++YYCURSOR;
+       if (yych <= '/') {
+               if (yych <= ',') {
+                       if (yych == '+') goto yy57;
+                       goto yy18;
+               } else {
+                       if (yych <= '-') goto yy55;
+                       if (yych <= '.') goto yy60;
+                       goto yy18;
+               }
+       } else {
+               if (yych <= 'I') {
+                       if (yych <= '9') goto yy58;
+                       if (yych <= 'H') goto yy18;
+                       goto yy56;
+               } else {
+                       if (yych != 'N') goto yy18;
+               }
+       }
        yych = *++YYCURSOR;
-       if (yych == '"') goto yy84;
+       if (yych == 'A') goto yy76;
        goto yy18;
- yy66:
+ yy55:
+       yych = *++YYCURSOR;
+       if (yych <= '/') {
+               if (yych == '.') goto yy60;
+               goto yy18;
+       } else {
+               if (yych <= '9') goto yy58;
+               if (yych != 'I') goto yy18;
+       }
+ yy56:
        yych = *++YYCURSOR;
-       if (yych == '{') goto yy86;
+       if (yych == 'N') goto yy72;
        goto yy18;
- yy67:
+ yy57:
+       yych = *++YYCURSOR;
+       if (yych == '.') goto yy60;
+       if (yych <= '/') goto yy18;
+       if (yych >= ':') goto yy18;
+ yy58:
        ++YYCURSOR;
- #line 614 "ext/standard/var_unserializer.re"
-       {
-       *p = YYCURSOR;
-       ZVAL_BOOL(rval, parse_iv(start + 2));
-       return 1;
- }
- #line 977 "ext/standard/var_unserializer.c"
- yy69:
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+       yych = *YYCURSOR;
+       if (yych <= ':') {
+               if (yych <= '.') {
+                       if (yych <= '-') goto yy18;
+                       goto yy70;
+               } else {
+                       if (yych <= '/') goto yy18;
+                       if (yych <= '9') goto yy58;
+                       goto yy18;
+               }
+       } else {
+               if (yych <= 'E') {
+                       if (yych <= ';') goto yy63;
+                       if (yych <= 'D') goto yy18;
+                       goto yy65;
+               } else {
+                       if (yych == 'e') goto yy65;
+                       goto yy18;
+               }
+       }
+ yy60:
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych >= ':') goto yy18;
+ yy61:
        ++YYCURSOR;
        if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *YYCURSOR;
@@@ -991,9 -1108,9 +1142,9 @@@
                        goto yy18;
                }
        }
- yy71:
+ yy63:
        ++YYCURSOR;
- #line 662 "ext/standard/var_unserializer.re"
 -#line 627 "ext/standard/var_unserializer.re"
++#line 698 "ext/standard/var_unserializer.re"
        {
  #if SIZEOF_ZEND_LONG == 4
  use_double:
@@@ -1002,346 -1119,189 +1153,189 @@@
        ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
  }
- #line 1006 "ext/standard/var_unserializer.c"
- yy73:
 -#line 1087 "ext/standard/var_unserializer.c"
++#line 1157 "ext/standard/var_unserializer.c"
+ yy65:
        yych = *++YYCURSOR;
        if (yych <= ',') {
-               if (yych == '+') goto yy88;
-               goto yy18;
+               if (yych != '+') goto yy18;
        } else {
-               if (yych <= '-') goto yy88;
+               if (yych <= '-') goto yy66;
                if (yych <= '/') goto yy18;
-               if (yych <= '9') goto yy89;
+               if (yych <= '9') goto yy67;
                goto yy18;
        }
- yy74:
+ yy66:
        yych = *++YYCURSOR;
-       if (yych == 'F') goto yy91;
+       if (yych <= ',') {
+               if (yych == '+') goto yy69;
+               goto yy18;
+       } else {
+               if (yych <= '-') goto yy69;
+               if (yych <= '/') goto yy18;
+               if (yych >= ':') goto yy18;
+       }
+ yy67:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych <= '9') goto yy67;
+       if (yych == ';') goto yy63;
        goto yy18;
- yy75:
+ yy69:
        yych = *++YYCURSOR;
-       if (yych == 'N') goto yy91;
+       if (yych <= '/') goto yy18;
+       if (yych <= '9') goto yy67;
        goto yy18;
- yy76:
+ yy70:
        ++YYCURSOR;
- #line 620 "ext/standard/var_unserializer.re"
-       {
- #if SIZEOF_ZEND_LONG == 4
-       int digits = YYCURSOR - start - 3;
- 
-       if (start[2] == '-' || start[2] == '+') {
-               digits--;
-       }
- 
-       /* Use double for large zend_long values that were serialized on a 64-bit system */
-       if (digits >= MAX_LENGTH_OF_LONG - 1) {
-               if (digits == MAX_LENGTH_OF_LONG - 1) {
-                       int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1);
- 
-                       if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
-                               goto use_double;
-                       }
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+       yych = *YYCURSOR;
+       if (yych <= ';') {
+               if (yych <= '/') goto yy18;
+               if (yych <= '9') goto yy70;
+               if (yych <= ':') goto yy18;
+               goto yy63;
+       } else {
+               if (yych <= 'E') {
+                       if (yych <= 'D') goto yy18;
+                       goto yy65;
                } else {
-                       goto use_double;
+                       if (yych == 'e') goto yy65;
+                       goto yy18;
                }
        }
- #endif
-       *p = YYCURSOR;
-       ZVAL_LONG(rval, parse_iv(start + 2));
-       return 1;
- }
- #line 1054 "ext/standard/var_unserializer.c"
- yy78:
+ yy72:
        yych = *++YYCURSOR;
-       if (yych == '"') goto yy92;
-       goto yy18;
- yy79:
+       if (yych != 'F') goto yy18;
+ yy73:
+       yych = *++YYCURSOR;
+       if (yych != ';') goto yy18;
        ++YYCURSOR;
- #line 583 "ext/standard/var_unserializer.re"
 -#line 611 "ext/standard/var_unserializer.re"
++#line 682 "ext/standard/var_unserializer.re"
        {
-       zend_long id;
- 
-       *p = YYCURSOR;
-       if (!var_hash) return 0;
- 
-       id = parse_iv(start + 2) - 1;
-       if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
-               return 0;
-       }
- 
-       if (rval_ref == rval) {
-               return 0;
-       }
+       *p = YYCURSOR;
  
-       if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
-               ZVAL_UNDEF(rval);
-               return 1;
+       if (!strncmp((char*)start + 2, "NAN", 3)) {
+               ZVAL_DOUBLE(rval, php_get_nan());
+       } else if (!strncmp((char*)start + 2, "INF", 3)) {
+               ZVAL_DOUBLE(rval, php_get_inf());
+       } else if (!strncmp((char*)start + 2, "-INF", 4)) {
+               ZVAL_DOUBLE(rval, -php_get_inf());
+       } else {
+               ZVAL_NULL(rval);
        }
  
-       ZVAL_COPY(rval, rval_ref);
- 
        return 1;
  }
- #line 1086 "ext/standard/var_unserializer.c"
- yy81:
 -#line 1162 "ext/standard/var_unserializer.c"
++#line 1232 "ext/standard/var_unserializer.c"
+ yy76:
        yych = *++YYCURSOR;
-       if (yych == '"') goto yy94;
+       if (yych == 'N') goto yy73;
        goto yy18;
- yy82:
+ yy77:
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy18;
+       } else {
+               if (yych <= '-') goto yy78;
+               if (yych <= '/') goto yy18;
+               if (yych <= '9') goto yy79;
+               goto yy18;
+       }
+ yy78:
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych >= ':') goto yy18;
+ yy79:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych <= '9') goto yy79;
+       if (yych != ';') goto yy18;
        ++YYCURSOR;
- #line 768 "ext/standard/var_unserializer.re"
 -#line 585 "ext/standard/var_unserializer.re"
++#line 656 "ext/standard/var_unserializer.re"
        {
-       size_t len, len2, len3, maxlen;
-       zend_long elements;
-       char *str;
-       zend_string *class_name;
-       zend_class_entry *ce;
-       int incomplete_class = 0;
- 
-       int custom_object = 0;
- 
-       zval user_func;
-       zval retval;
-       zval args[1];
- 
-     if (!var_hash) return 0;
-       if (*start == 'C') {
-               custom_object = 1;
-       }
- 
-       len2 = len = parse_uiv(start + 2);
-       maxlen = max - YYCURSOR;
-       if (maxlen < len || len == 0) {
-               *p = start + 2;
-               return 0;
-       }
- 
-       str = (char*)YYCURSOR;
- 
-       YYCURSOR += len;
- 
-       if (*(YYCURSOR) != '"') {
-               *p = YYCURSOR;
-               return 0;
-       }
-       if (*(YYCURSOR+1) != ':') {
-               *p = YYCURSOR+1;
-               return 0;
-       }
+ #if SIZEOF_ZEND_LONG == 4
+       int digits = YYCURSOR - start - 3;
  
-       len3 = strspn(str, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\");
-       if (len3 != len)
-       {
-               *p = YYCURSOR + len3 - len;
-               return 0;
+       if (start[2] == '-' || start[2] == '+') {
+               digits--;
        }
  
-       class_name = zend_string_init(str, len, 0);
- 
-       do {
-               if(!unserialize_allowed_class(class_name, classes)) {
-                       incomplete_class = 1;
-                       ce = PHP_IC_ENTRY;
-                       break;
-               }
- 
-               /* Try to find class directly */
-               BG(serialize_lock)++;
-               ce = zend_lookup_class(class_name);
-               if (ce) {
-                       BG(serialize_lock)--;
-                       if (EG(exception)) {
-                               zend_string_release(class_name);
-                               return 0;
-                       }
-                       break;
-               }
-               BG(serialize_lock)--;
- 
-               if (EG(exception)) {
-                       zend_string_release(class_name);
-                       return 0;
-               }
- 
-               /* Check for unserialize callback */
-               if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) {
-                       incomplete_class = 1;
-                       ce = PHP_IC_ENTRY;
-                       break;
-               }
- 
-               /* Call unserialize callback */
-               ZVAL_STRING(&user_func, PG(unserialize_callback_func));
+       /* Use double for large zend_long values that were serialized on a 64-bit system */
+       if (digits >= MAX_LENGTH_OF_LONG - 1) {
+               if (digits == MAX_LENGTH_OF_LONG - 1) {
+                       int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1);
  
-               ZVAL_STR_COPY(&args[0], class_name);
-               BG(serialize_lock)++;
-               if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) {
-                       BG(serialize_lock)--;
-                       if (EG(exception)) {
-                               zend_string_release(class_name);
-                               zval_ptr_dtor(&user_func);
-                               zval_ptr_dtor(&args[0]);
-                               return 0;
+                       if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
+                               goto use_double;
                        }
-                       php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func));
-                       incomplete_class = 1;
-                       ce = PHP_IC_ENTRY;
-                       zval_ptr_dtor(&user_func);
-                       zval_ptr_dtor(&args[0]);
-                       break;
-               }
-               BG(serialize_lock)--;
-               zval_ptr_dtor(&retval);
-               if (EG(exception)) {
-                       zend_string_release(class_name);
-                       zval_ptr_dtor(&user_func);
-                       zval_ptr_dtor(&args[0]);
-                       return 0;
-               }
- 
-               /* The callback function may have defined the class */
-               if ((ce = zend_lookup_class(class_name)) == NULL) {
-                       php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func));
-                       incomplete_class = 1;
-                       ce = PHP_IC_ENTRY;
-               }
- 
-               zval_ptr_dtor(&user_func);
-               zval_ptr_dtor(&args[0]);
-               break;
-       } while (1);
- 
-       *p = YYCURSOR;
- 
-       if (custom_object) {
-               int ret;
- 
-               ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
- 
-               if (ret && incomplete_class) {
-                       php_store_class_name(rval, ZSTR_VAL(class_name), len2);
+               } else {
+                       goto use_double;
                }
-               zend_string_release(class_name);
-               return ret;
-       }
- 
-       elements = object_common1(UNSERIALIZE_PASSTHRU, ce);
- 
-       if (incomplete_class) {
-               php_store_class_name(rval, ZSTR_VAL(class_name), len2);
        }
-       zend_string_release(class_name);
- 
-       return object_common2(UNSERIALIZE_PASSTHRU, elements);
+ #endif
+       *p = YYCURSOR;
+       ZVAL_LONG(rval, parse_iv(start + 2));
+       return 1;
  }
- #line 1238 "ext/standard/var_unserializer.c"
- yy84:
 -#line 1215 "ext/standard/var_unserializer.c"
++#line 1285 "ext/standard/var_unserializer.c"
+ yy83:
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych >= '2') goto yy18;
+       yych = *++YYCURSOR;
+       if (yych != ';') goto yy18;
        ++YYCURSOR;
- #line 703 "ext/standard/var_unserializer.re"
 -#line 579 "ext/standard/var_unserializer.re"
++#line 650 "ext/standard/var_unserializer.re"
        {
-       size_t len, maxlen;
-       zend_string *str;
- 
-       len = parse_uiv(start + 2);
-       maxlen = max - YYCURSOR;
-       if (maxlen < len) {
-               *p = start + 2;
-               return 0;
-       }
- 
-       if ((str = unserialize_str(&YYCURSOR, len, maxlen)) == NULL) {
-               return 0;
-       }
- 
-       if (*(YYCURSOR) != '"') {
-               zend_string_free(str);
-               *p = YYCURSOR;
-               return 0;
-       }
- 
-       if (*(YYCURSOR + 1) != ';') {
-               efree(str);
-               *p = YYCURSOR + 1;
-               return 0;
-       }
- 
-       YYCURSOR += 2;
        *p = YYCURSOR;
- 
-       ZVAL_STR(rval, str);
+       ZVAL_BOOL(rval, parse_iv(start + 2));
        return 1;
  }
- #line 1275 "ext/standard/var_unserializer.c"
- yy86:
 -#line 1229 "ext/standard/var_unserializer.c"
++#line 1299 "ext/standard/var_unserializer.c"
+ yy87:
        ++YYCURSOR;
- #line 737 "ext/standard/var_unserializer.re"
 -#line 573 "ext/standard/var_unserializer.re"
++#line 644 "ext/standard/var_unserializer.re"
        {
-       zend_long elements = parse_iv(start + 2);
-       /* use iv() not uiv() in order to check data range */
        *p = YYCURSOR;
-     if (!var_hash) return 0;
- 
-       if (elements < 0) {
-               return 0;
-       }
- 
-       array_init_size(rval, elements);
-       if (elements) {
-               /* we can't convert from packed to hash during unserialization, because
-                  reference to some zvals might be keept in var_hash (to support references) */
-               zend_hash_real_init(Z_ARRVAL_P(rval), 0);
-       }
- 
-       if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_P(rval), elements, 0)) {
-               return 0;
-       }
- 
-       return finish_nested_data(UNSERIALIZE_PASSTHRU);
+       ZVAL_NULL(rval);
+       return 1;
  }
- #line 1302 "ext/standard/var_unserializer.c"
- yy88:
 -#line 1238 "ext/standard/var_unserializer.c"
++#line 1308 "ext/standard/var_unserializer.c"
+ yy89:
        yych = *++YYCURSOR;
        if (yych <= ',') {
-               if (yych == '+') goto yy96;
-               goto yy18;
+               if (yych != '+') goto yy18;
        } else {
-               if (yych <= '-') goto yy96;
+               if (yych <= '-') goto yy90;
                if (yych <= '/') goto yy18;
-               if (yych >= ':') goto yy18;
+               if (yych <= '9') goto yy91;
+               goto yy18;
        }
- yy89:
+ yy90:
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych >= ':') goto yy18;
+ yy91:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy89;
-       if (yych == ';') goto yy71;
-       goto yy18;
- yy91:
-       yych = *++YYCURSOR;
-       if (yych == ';') goto yy97;
-       goto yy18;
- yy92:
+       if (yych <= '9') goto yy91;
+       if (yych != ';') goto yy18;
        ++YYCURSOR;
- #line 761 "ext/standard/var_unserializer.re"
 -#line 548 "ext/standard/var_unserializer.re"
++#line 619 "ext/standard/var_unserializer.re"
        {
-     if (!var_hash) return 0;
+       zend_long id;
  
-       return object_common2(UNSERIALIZE_PASSTHRU,
-                       object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
- }
- #line 1334 "ext/standard/var_unserializer.c"
- yy94:
-       ++YYCURSOR;
- #line 671 "ext/standard/var_unserializer.re"
-       {
-       size_t len, maxlen;
-       char *str;
+       *p = YYCURSOR;
+       if (!var_hash) return 0;
  
-       len = parse_uiv(start + 2);
-       maxlen = max - YYCURSOR;
-       if (maxlen < len) {
-               *p = start + 2;
+       id = parse_iv(start + 2) - 1;
+       if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
                return 0;
        }
  
@@@ -1354,44 -1309,67 +1343,67 @@@
                return 0;
        }
  
-       if (*(YYCURSOR + 1) != ';') {
-               *p = YYCURSOR + 1;
-               return 0;
+       if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
+               ZVAL_UNDEF(rval);
+               return 1;
        }
  
-       YYCURSOR += 2;
-       *p = YYCURSOR;
+       ZVAL_COPY(rval, rval_ref);
  
-       ZVAL_STRINGL(rval, str, len);
        return 1;
  }
- #line 1369 "ext/standard/var_unserializer.c"
 -#line 1286 "ext/standard/var_unserializer.c"
++#line 1356 "ext/standard/var_unserializer.c"
+ yy95:
+       yych = *++YYCURSOR;
+       if (yych <= ',') {
+               if (yych != '+') goto yy18;
+       } else {
+               if (yych <= '-') goto yy96;
+               if (yych <= '/') goto yy18;
+               if (yych <= '9') goto yy97;
+               goto yy18;
+       }
  yy96:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
-       if (yych <= '9') goto yy89;
-       goto yy18;
+       if (yych >= ':') goto yy18;
  yy97:
        ++YYCURSOR;
- #line 646 "ext/standard/var_unserializer.re"
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       if (yych <= '/') goto yy18;
+       if (yych <= '9') goto yy97;
+       if (yych != ';') goto yy18;
+       ++YYCURSOR;
 -#line 522 "ext/standard/var_unserializer.re"
++#line 593 "ext/standard/var_unserializer.re"
        {
-       *p = YYCURSOR;
+       zend_long id;
  
-       if (!strncmp((char*)start + 2, "NAN", 3)) {
-               ZVAL_DOUBLE(rval, php_get_nan());
-       } else if (!strncmp((char*)start + 2, "INF", 3)) {
-               ZVAL_DOUBLE(rval, php_get_inf());
-       } else if (!strncmp((char*)start + 2, "-INF", 4)) {
-               ZVAL_DOUBLE(rval, -php_get_inf());
+       *p = YYCURSOR;
+       if (!var_hash) return 0;
+ 
+       id = parse_iv(start + 2) - 1;
+       if (id == -1 || (rval_ref = var_access(var_hash, id)) == NULL) {
+               return 0;
+       }
+ 
+       zval_ptr_dtor(rval);
+       if (Z_ISUNDEF_P(rval_ref) || (Z_ISREF_P(rval_ref) && Z_ISUNDEF_P(Z_REFVAL_P(rval_ref)))) {
+               ZVAL_UNDEF(rval);
+               return 1;
+       }
+       if (Z_ISREF_P(rval_ref)) {
+               ZVAL_COPY(rval, rval_ref);
        } else {
-               ZVAL_NULL(rval);
+               ZVAL_NEW_REF(rval_ref, rval_ref);
+               ZVAL_COPY(rval, rval_ref);
        }
  
        return 1;
  }
- #line 1393 "ext/standard/var_unserializer.c"
 -#line 1335 "ext/standard/var_unserializer.c"
++#line 1405 "ext/standard/var_unserializer.c"
  }
- #line 921 "ext/standard/var_unserializer.re"
 -#line 886 "ext/standard/var_unserializer.re"
++#line 957 "ext/standard/var_unserializer.re"
  
  
        return 0;

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

diff --cc ext/wddx/wddx.c
Simple merge

diff --cc main/streams/plain_wrapper.c
Simple merge