syncronize

1 files changed, 19 insertions, 17 deletions

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 629adbe4a5..b0ca37ed62 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Jul  3 01:22:57 2003 */
-#line 1 "/home/koizumi/src/php-src-5/ext/standard/var_unserializer.re"
+/* Generated by re2c 0.5 on Tue Aug  5 12:19:02 2003 */
+#line 1 "/home/frodo/php5/ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 4                                                        |
@@ -224,9 +224,11 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, int elements)
 		return 0;
 	}
 
-	INIT_PZVAL(&fname);
-	ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
-	call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
+	if(Z_OBJCE_PP(rval) != PHP_IC_ENTRY) {
+		INIT_PZVAL(&fname);
+		ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
+		call_user_function_ex(CG(function_table), rval, &fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
+	}
 
 	if (retval_ptr)
 		zval_ptr_dtor(&retval_ptr);
@@ -339,7 +341,7 @@ yy3:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == ':')	goto yy74;
 yy4:
-#line 443
+#line 445
 	{ return 0; }
 yy5:	yych = *++YYCURSOR;
 	if(yych == ';')	goto yy72;
@@ -374,7 +376,7 @@ yy12:	yyaccept = 0;
 	goto yy4;
 yy13:	yych = *++YYCURSOR;
 yy14:
-#line 437
+#line 439
 	{
 	/* this is the case where we have less data than planned */
 	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
@@ -398,7 +400,7 @@ yy20:	yych = *++YYCURSOR;
 	if(yych != '"')	goto yy2;
 yy21:	yych = *++YYCURSOR;
 yy22:
-#line 352
+#line 354
 	{
 	int len;
 	int elements;
@@ -505,7 +507,7 @@ yy27:	yych = *++YYCURSOR;
 	if(yych != '"')	goto yy2;
 yy28:	yych = *++YYCURSOR;
 yy29:
-#line 344
+#line 346
 	{
 
 	INIT_PZVAL(*rval);
@@ -535,7 +537,7 @@ yy34:	yych = *++YYCURSOR;
 	if(yych != '{')	goto yy2;
 yy35:	yych = *++YYCURSOR;
 yy36:
-#line 326
+#line 328
 	{
 	int elements = parse_iv(start + 2);
 
@@ -575,7 +577,7 @@ yy41:	yych = *++YYCURSOR;
 	if(yych != '"')	goto yy2;
 yy42:	yych = *++YYCURSOR;
 yy43:
-#line 306
+#line 308
 	{
 	int len;
 	char *str;
@@ -652,7 +654,7 @@ yy50:	if(yych <= ';'){
 	}
 yy51:	yych = *++YYCURSOR;
 yy52:
-#line 299
+#line 301
 	{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
@@ -725,7 +727,7 @@ yy63:	if(yych <= '/')	goto yy2;
 	if(yych != ';')	goto yy2;
 yy64:	yych = *++YYCURSOR;
 yy65:
-#line 292
+#line 294
 	{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
@@ -752,7 +754,7 @@ yy69:	if(yych <= '/')	goto yy2;
 	if(yych != ';')	goto yy2;
 yy70:	yych = *++YYCURSOR;
 yy71:
-#line 285
+#line 287
 	{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
@@ -761,7 +763,7 @@ yy71:
 }
 yy72:	yych = *++YYCURSOR;
 yy73:
-#line 278
+#line 280
 	{
 	*p = YYCURSOR;
 	INIT_PZVAL(*rval);
@@ -788,7 +790,7 @@ yy77:	if(yych <= '/')	goto yy2;
 	if(yych != ';')	goto yy2;
 yy78:	yych = *++YYCURSOR;
 yy79:
-#line 257
+#line 259
 	{
 	int id;
 
@@ -810,7 +812,7 @@ yy79:
 	return 1;
 }
 }
-#line 445
+#line 447
 
 
 	return 0;