From 6ccb8905a0f7a5886f4819820aff1853276e7995 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 14 Feb 2020 11:44:04 +0900
Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A1=AC=2080=EB=B2=84=EC=A0=84=20?=
 =?UTF-8?q?=EB=8C=80=EC=9D=91=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.php         | 11 +++++++----
 lib/common.lib.php |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common.php b/common.php
index f7f42bd2a..ba97a952c 100644
--- a/common.php
+++ b/common.php
@@ -230,12 +230,14 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
 	if(!function_exists('session_start_samesite')) {
 		function session_start_samesite($options = array())
 		{
+            global $g5;
+    
 			$res = @session_start($options);
 			
-			// IE 브라우저 또는 엣지브라우저 일때는 secure; SameSite=None 을 설정하지 않습니다.
-			if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) ){
-				return $res;
-			}
+            // IE 브라우저 또는 엣지브라우저 일때는 secure; SameSite=None, http 환경에서는 설정하지 않습니다.
+            if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) || ! (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ){
+                return $res;
+            }
 
 			$headers = headers_list();
 			krsort($headers);
@@ -243,6 +245,7 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
 				if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
 				$header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
 				header($header, false);
+                $g5['session_cookie_samesite'] = 'none';
 				break;
 			}
 			return $res;
diff --git a/lib/common.lib.php b/lib/common.lib.php
index b7a373ab0..432514a24 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -116,11 +116,13 @@ function goto_url($url)
 // 세션변수 생성
 function set_session($session_name, $value)
 {
+	global $g5;
+
 	static $check_cookie = null;
 	
 	if( $check_cookie === null ){
 		$cookie_session_name = session_name();
-		if( ! ($cookie_session_name && isset($_COOKIE[$cookie_session_name]) && $_COOKIE[$cookie_session_name]) && ! headers_sent() ){
+		if( ! isset($g5['session_cookie_samesite']) && ! ($cookie_session_name && isset($_COOKIE[$cookie_session_name]) && $_COOKIE[$cookie_session_name]) && ! headers_sent() ){
 			@session_regenerate_id(false);
 		}