cvs: php4 /ext/session session.c
| From: | Sascha Schumann | Date: | Tue, 11 Sep 2001 10:16:01 +0000 |
| Subject: | cvs: php4 /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7397@lists.php.net to get a copy of this message | ||
sas Tue Sep 11 06:16:01 2001 EDT
Modified files:
/php4/ext/session session.c
Log:
revert last commit. Guys, discuss such things first, then commit. Mkay?
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.251 php4/ext/session/session.c:1.252
--- php4/ext/session/session.c:1.251 Tue Sep 11 06:13:44 2001
+++ php4/ext/session/session.c Tue Sep 11 06:16:01 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.251 2001/09/11 10:13:44 sterling Exp $ */
+/* $Id: session.c,v 1.252 2001/09/11 10:16:01 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -211,15 +211,6 @@
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);
@@ -964,6 +955,7 @@
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)
@@ -1140,7 +1132,8 @@
if (ac == 1) {
convert_to_string_ex(p_name);
- php_session_set_id(Z_STRVAL_PP(p_name) TSRMLS_CC);
+ if (PS(id)) efree(PS(id));
+ PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
}
RETVAL_STRING(old, 0);