archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix segfault in session/tests/031.phpt by adding optional extension

Browse source 
dependency (php_hash_hashtable has to be initialized when setting
session.hash_function)
This commit is contained in:
Antony Dovgal 2009-07-28 08:54:23 +00:00
parent bf0ef43d30
commit 69dba3c996
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/session/config.m4
View file

@ -12,6 +12,7 @@ if test "$PHP_SESSION" != "no"; then
PHP_PWRITE_TEST PHP_PWRITE_TEST
PHP_PREAD_TEST PHP_PREAD_TEST
PHP_NEW_EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c, $ext_shared) 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_SUBST(SESSION_SHARED_LIBADD)
PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h]) PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h])
AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) AC_DEFINE(HAVE_PHP_SESSION,1,[ ])

10
ext/session/session.c
View file

@ -2352,8 +2352,16 @@ static int php_session_rfc1867_callback(unsigned int event, void *event_data, vo
} /* }}} */ } /* }}} */
static const zend_module_dep session_deps[] = { /* {{{ */
ZEND_MOD_OPTIONAL("hash")
{NULL, NULL, NULL}
};
/* }}} */
zend_module_entry session_module_entry = { zend_module_entry session_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER_EX,
NULL,
session_deps,
"session", "session",
session_functions, session_functions,
PHP_MINIT(session), PHP_MSHUTDOWN(session), PHP_MINIT(session), PHP_MSHUTDOWN(session),