From: Sascha Schumann <sas@php.net>
Date: Tue, 11 Sep 2001 10:16:01 +0000 (+0000)
Subject: revert last commit.  Guys, discuss such things first, then commit.  Mkay?
X-Git-Tag: PRE_SUBST_Z_MACROS~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=919e7e9f69722802dec08c78756963df293e4798;p=php

revert last commit.  Guys, discuss such things first, then commit.  Mkay?
---

diff --git a/ext/session/session.c b/ext/session/session.c
index 5edb0d4fd1..3e9f9931f3 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -211,15 +211,6 @@ int php_session_register_module(ps_module *ptr)
 	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 @@ static zend_bool php_session_destroy(TSRMLS_D)
 	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 @@ PHP_FUNCTION(session_id)
 
 	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);