From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Fri, 29 Jun 2001 05:27:57 +0000 (+0000)
Subject: suppress sending of cookies if session id already came
X-Git-Tag: PRE_TSRM_MERGE_PATCH~310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f08918b87f757d93358903c05a72f9b79e0ad9d;p=php

suppress sending of cookies if session id already came
from a non-cookie source
---

diff --git a/ext/session/session.c b/ext/session/session.c
index d373b5a757..81a4eb0a81 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -832,6 +832,7 @@ static void php_session_start(PSLS_D)
 				zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
 					lensess + 1, (void **) &ppid) == SUCCESS) {
 			PPID2SID;
+			send_cookie = 0;
 		}
 
 		if (!PS(id) &&
@@ -841,6 +842,7 @@ static void php_session_start(PSLS_D)
 				zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
 					lensess + 1, (void **) &ppid) == SUCCESS) {
 			PPID2SID;
+			send_cookie = 0;
 		}
 	}