From c380c743fc2bf44648716bcea7a157d4fea43ad1 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Tue, 28 Jul 2009 08:54:23 +0000
Subject: [PATCH] fix segfault in session/tests/031.phpt by adding optional
 extension dependency (php_hash_hashtable has to be initialized when setting
 session.hash_function)

---
 ext/session/config.m4 |  1 +
 ext/session/session.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 93df332b40..bc8001f85a 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -12,6 +12,7 @@ if test "$PHP_SESSION" != "no"; then
   PHP_PWRITE_TEST
   PHP_PREAD_TEST
   PHP_NEW_EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c, $ext_shared)
+  PHP_ADD_EXTENSION_DEP(session, hash)
   PHP_SUBST(SESSION_SHARED_LIBADD)
   PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h])
   AC_DEFINE(HAVE_PHP_SESSION,1,[ ])
diff --git a/ext/session/session.c b/ext/session/session.c
index 69eedfdcee..8665bbf602 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2107,8 +2107,16 @@ static PHP_MINFO_FUNCTION(session) /* {{{ */
 }
 /* }}} */
 
+static const zend_module_dep session_deps[] = { /* {{{ */
+	ZEND_MOD_OPTIONAL("hash")
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
 zend_module_entry session_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	session_deps,
 	"session",
 	session_functions,
 	PHP_MINIT(session), PHP_MSHUTDOWN(session),
-- 
2.40.0