From 4c9c90eea2388d3cbc2cfb46967117b67e65ef18 Mon Sep 17 00:00:00 2001 From: Sterling Hughes Date: Thu, 18 Oct 2001 09:05:16 +0000 Subject: [PATCH] force use of the session.use_trans_sid setting --- ext/session/session.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/session/session.c b/ext/session/session.c index 9e57ae20da..0ab447f5d5 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -835,8 +835,8 @@ static void php_session_start(TSRMLS_D) Z_TYPE_PP(data) == IS_ARRAY && zend_hash_find(Z_ARRVAL_PP(data), PS(session_name), lensess + 1, (void **) &ppid) == SUCCESS) { - PPID2SID; - PS(apply_trans_sid) = 0; + PPID2SID; + PS(apply_trans_sid) = 0; send_cookie = 0; } @@ -891,14 +891,16 @@ static void php_session_start(TSRMLS_D) efree(PS(id)); PS(id) = NULL; send_cookie = 1; - PS(apply_trans_sid) = 1; + if (PS(use_trans_sid)) + PS(apply_trans_sid) = 1; } if (!PS(id)) PS(id) = _php_create_id(NULL TSRMLS_CC); if (!PS(use_cookies) && send_cookie) { - PS(apply_trans_sid) = 1; + if (PS(use_trans_sid)) + PS(apply_trans_sid) = 1; send_cookie = 0; } -- 2.40.0