cvs: php4 /ext/session php_session.h session.c

sterling Tue Sep 11 06:13:44 2001 EDT Modified files: /php4/ext/session session.c php_session.h Log: Add an API function for setting the session id from a session module... # The SRM folks wanted/needed this Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.250 php4/ext/session/session.c:1.251 --- php4/ext/session/session.c:1.250 Sun Sep 9 09:29:10 2001 +++ php4/ext/session/session.c Tue Sep 11 06:13:44 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.250 2001/09/09 13:29:10 derick Exp $ */ +/* $Id: session.c,v 1.251 2001/09/11 10:13:44 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -211,6 +211,15 @@ return ret; } +PHPAPI void php_session_set_id(char *id TSRMLS_DC) +{ + if (PS(id)) + efree(PS(id)); + + PS(id) = estrdup(id); +} + + PHP_MINIT_FUNCTION(session); PHP_RINIT_FUNCTION(session); PHP_MSHUTDOWN_FUNCTION(session); @@ -955,7 +964,6 @@ return retval; } - /* {{{ proto void session_set_cookie_params(int lifetime [, string path [, string domain [, bool secure]]]) Set session cookie parameters */ PHP_FUNCTION(session_set_cookie_params) @@ -1132,8 +1140,7 @@ if (ac == 1) { convert_to_string_ex(p_name); - if (PS(id)) efree(PS(id)); - PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name)); + php_session_set_id(Z_STRVAL_PP(p_name) TSRMLS_CC); } RETVAL_STRING(old, 0); Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.59 php4/ext/session/php_session.h:1.60 --- php4/ext/session/php_session.h:1.59 Fri Aug 31 16:03:09 2001 +++ php4/ext/session/php_session.h Tue Sep 11 06:13:44 2001 @@ -156,6 +156,8 @@ int (*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)); +PHPAPI void php_session_set_id(char *id TSRMLS_DC); + #define PS_ADD_VARL(name,namelen) \ zend_hash_add_empty_element(&PS(vars), name, namelen + 1)