From: Sascha Schumann <sas@php.net>
Date: Tue, 23 Apr 2002 18:10:06 +0000 (+0000)
Subject: MFH define_sid issue
X-Git-Tag: php-4.2.1RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=544a3a93a9a8d91e505dd89a95acf6c53bc8c9cd;p=php

MFH define_sid issue
---

diff --git a/ext/session/session.c b/ext/session/session.c
index e94ab967aa..9e0993dbf6 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -833,6 +833,7 @@ PHPAPI void php_session_start(TSRMLS_D)
 	zval **data;
 	char *p;
 	int send_cookie = 1;
+	int define_sid = 1;
 	int module_number = PS(module_number);
 	int nrand;
 	int lensess;
@@ -846,7 +847,7 @@ PHPAPI void php_session_start(TSRMLS_D)
 	
 
 	/*
-     * Cookies are preferred, because initially
+	 * Cookies are preferred, because initially
 	 * cookie and get variables will be available. 
 	 */
 
@@ -859,6 +860,7 @@ PHPAPI void php_session_start(TSRMLS_D)
 			PPID2SID;
 			PS(apply_trans_sid) = 0;
 			send_cookie = 0;
+			define_sid = 0;
 		}
 
 		if (!PS(id) &&
@@ -930,8 +932,7 @@ PHPAPI void php_session_start(TSRMLS_D)
 	}
 
 
-	/* define SID always, if the client did not send a cookie */
-	if (send_cookie) {
+	if (define_sid) {
 		smart_str var = {0};
 
 		smart_str_appends(&var, PS(session_name));