diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5336ef6fd..feb100ae77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,7 +122,6 @@ jobs: choco install -y mysql --version 5.7.18 mysql --user=root -e "CREATE DATABASE `myapp_test`;" mysql --user=root -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password';FLUSH PRIVILEGES;" - mysql --user=root --password=password -h 127.0.0.1 -e "SELECT version();" - name: Setup to EC-CUBE env: diff --git a/data/class/SC_Cookie.php b/data/class/SC_Cookie.php index 2cc733a0fa..228c8bd4f1 100644 --- a/data/class/SC_Cookie.php +++ b/data/class/SC_Cookie.php @@ -40,10 +40,13 @@ public function __construct($day = COOKIE_EXPIRE) /** * @param string $key + * @param string $val + * @param bool $secure + * @param bool $httponly */ - public function setCookie($key, $val) + public function setCookie($key, $val, $secure = false, $httponly = true) { - setcookie($key, $val, $this->expire, ROOT_URLPATH, DOMAIN_NAME); + setcookie($key, $val, $this->expire, ROOT_URLPATH, DOMAIN_NAME, $secure, $httponly); } /** diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php index 2655a236ae..6d0422be45 100644 --- a/data/class/SC_Initial.php +++ b/data/class/SC_Initial.php @@ -35,7 +35,7 @@ class SC_Initial public function __construct() { /** EC-CUBEのバージョン */ - define('ECCUBE_VERSION', '2.17.0-RC'); + define('ECCUBE_VERSION', '2.17.0'); } /** diff --git a/data/class/sessionfactory/SC_SessionFactory_UseCookie.php b/data/class/sessionfactory/SC_SessionFactory_UseCookie.php index 4ccae164bc..890a8206ae 100644 --- a/data/class/sessionfactory/SC_SessionFactory_UseCookie.php +++ b/data/class/sessionfactory/SC_SessionFactory_UseCookie.php @@ -46,7 +46,7 @@ public function initSession() ini_set('session.cache_limiter', 'none'); // (session.auto_start などで)セッションが開始されていた場合に備えて閉じる。(FIXME: 保存する必要はない。破棄で良い。) session_write_close(); - session_set_cookie_params(0, ROOT_URLPATH, DOMAIN_NAME); + session_set_cookie_params(0, ROOT_URLPATH, DOMAIN_NAME, false, true); // セッション開始 // FIXME EC-CUBE をネストしてインストールした場合を考慮して、一意とすべき session_name('ECSESSID');