From: Felipe Pena <felipe@php.net>
Date: Tue, 2 Nov 2010 18:34:56 +0000 (+0000)
Subject: - Fixed bug #53141 (autoload misbehaves if called from closing session)
X-Git-Tag: php-5.4.0alpha1~191^2~741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=477b8a6664f7e5200cf8d5ae4f6733f6893e3d73;p=php

- Fixed bug #53141 (autoload misbehaves if called from closing session)
  patch by: ladislav at marek dot su
---

diff --git a/ext/session/session.c b/ext/session/session.c
index b913b9b05d..a71117554a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2074,6 +2074,7 @@ static PHP_MINFO_FUNCTION(session) /* {{{ */
 
 static const zend_module_dep session_deps[] = { /* {{{ */
 	ZEND_MOD_OPTIONAL("hash")
+	ZEND_MOD_REQUIRED("spl")
 	{NULL, NULL, NULL}
 };
 /* }}} */
diff --git a/ext/session/tests/bug53141.phpt b/ext/session/tests/bug53141.phpt
new file mode 100644
index 0000000000..765d2727e4
--- /dev/null
+++ b/ext/session/tests/bug53141.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Bug #53141 (autoload misbehaves if called from closing session)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+spl_autoload_register(function ($class) {
+    var_dump("Loading $class");
+    eval('class Bar {}');
+});
+
+class Foo
+{
+    function __sleep()
+    {
+        new Bar;
+        return array();
+    }
+}
+
+session_start();
+$_SESSION['foo'] = new Foo;
+
+?>
+--EXPECT--
+string(11) "Loading Bar"
\ No newline at end of file