svn: /php/php-src/ branches/PHP_5_2/ext/session/config.m4 branches/PHP_5_2/ext/session/session.c branches/PHP_5_3/ext/session/config.m4
branches/PHP_5_3/ext/session/session.c trunk/ext/session/config.m4 trunk/ext/session/session.c

tony2001 Tue, 28 Jul 2009 08:54:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286443 Log: fix segfault in session/tests/031.phpt by adding optional extension dependency (php_hash_hashtable has to be initialized when setting session.hash_function) Changed paths: U php/php-src/branches/PHP_5_2/ext/session/config.m4 U php/php-src/branches/PHP_5_2/ext/session/session.c U php/php-src/branches/PHP_5_3/ext/session/config.m4 U php/php-src/branches/PHP_5_3/ext/session/session.c U php/php-src/trunk/ext/session/config.m4 U php/php-src/trunk/ext/session/session.c Modified: php/php-src/branches/PHP_5_2/ext/session/config.m4 =================================================================== --- php/php-src/branches/PHP_5_2/ext/session/config.m4 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/branches/PHP_5_2/ext/session/config.m4 2009-07-28 08:54:23 UTC (rev 286443) @@ -12,6 +12,7 @@ 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,[ ]) Modified: php/php-src/branches/PHP_5_2/ext/session/session.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/session/session.c 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/branches/PHP_5_2/ext/session/session.c 2009-07-28 08:54:23 UTC (rev 286443) @@ -2107,8 +2107,16 @@ } /* }}} */ +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), Modified: php/php-src/branches/PHP_5_3/ext/session/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/session/config.m4 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/branches/PHP_5_3/ext/session/config.m4 2009-07-28 08:54:23 UTC (rev 286443) @@ -12,6 +12,7 @@ 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,[ ]) Modified: php/php-src/branches/PHP_5_3/ext/session/session.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/session/session.c 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/branches/PHP_5_3/ext/session/session.c 2009-07-28 08:54:23 UTC (rev 286443) @@ -2248,8 +2248,16 @@ } /* }}} */ +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), Modified: php/php-src/trunk/ext/session/config.m4 =================================================================== --- php/php-src/trunk/ext/session/config.m4 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/trunk/ext/session/config.m4 2009-07-28 08:54:23 UTC (rev 286443) @@ -12,6 +12,7 @@ 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,[ ]) Modified: php/php-src/trunk/ext/session/session.c =================================================================== --- php/php-src/trunk/ext/session/session.c 2009-07-28 08:39:07 UTC (rev 286442) +++ php/php-src/trunk/ext/session/session.c 2009-07-28 08:54:23 UTC (rev 286443) @@ -2352,8 +2352,16 @@ } /* }}} */ +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),