Merge branch 'PHP-5.4.45' into PHP-5.5.29

* PHP-5.4.45:
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  5.4.45 next

Conflicts:
	configure.in
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h

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

diff --cc ext/standard/var_unserializer.c
index 188d2da1bd3bda0fccc3b9381d043da46c628a18,ffaf680c516b1e4503e6f81b6de1b0a49169e30d..1aa5ff3e6469b7dc99ce9e83aa24101ade0b8803
--- 1/ext/standard/var_unserializer.c
--- 2/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -480,10 -481,10 +481,8 @@@ PHPAPI int php_var_unserialize(UNSERIAL
  
        start = cursor;
  
-       
-       
  
 -
 -
 -#line 488 "ext/standard/var_unserializer.c"
 +#line 487 "ext/standard/var_unserializer.c"
  {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@@ -1238,10 -1239,10 +1237,10 @@@ yy91
        *rval = *rval_ref;
        Z_ADDREF_PP(rval);
        Z_UNSET_ISREF_PP(rval);
-       
+ 
        return 1;
  }
 -#line 1246 "ext/standard/var_unserializer.c"
 +#line 1245 "ext/standard/var_unserializer.c"
  yy95:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@@ -1282,12 -1283,12 +1281,12 @@@ yy97
        *rval = *rval_ref;
        Z_ADDREF_PP(rval);
        Z_SET_ISREF_PP(rval);
-       
+ 
        return 1;
  }
 -#line 1290 "ext/standard/var_unserializer.c"
 +#line 1289 "ext/standard/var_unserializer.c"
  }
 -#line 841 "ext/standard/var_unserializer.re"
 +#line 840 "ext/standard/var_unserializer.re"
  
  
        return 0;

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

diff --cc ext/xsl/xsltprocessor.c
Simple merge