Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

正常に HTTPS 判定されるよう修正 #392

Merged
merged 1 commit into from
May 18, 2020
Merged

正常に HTTPS 判定されるよう修正 #392

merged 1 commit into from
May 18, 2020

Conversation

nanasess
Copy link
Contributor

@nanasess
正常に HTTPS 判定されるよう修正
3930ee7 
- PEAR::Net_URL が正常に HTTPS 判定できないのを修正
- Symfony Local Web Server 対応
  - see https://symfony.com/doc/current/setup/symfony_server.html
  - TLS 有効にした場合, $_SERVER['HTTPS'] = 'On' に設定されるため
- ISAPI/IIS の環境にも対応
  - https://www.php.net/manual/ja/reserved.variables.server.php
@okazy okazy added this to the 2.17.1 milestone May 18, 2020
@okazy okazy merged commit 2d63ec8 into EC-CUBE:master May 18, 2020
@okazy
Copy link
Contributor

okazy commented May 18, 2020

ありがとうございます。マージしました。

@nobuhiko
Copy link
Contributor

HTTPS の判定があちこちにバラバラとありますね・・・

@nanasess
Copy link
Contributor Author

@nobuhiko PEAR::Net_URL の内部で判定してるところを修正すれば、この修正を無くせるんですけどね。
以前、反対意見があったので、 $_SERVER['HTTPS'] の値を正規化するようにしました

@nobuhiko
Copy link
Contributor

@nanasess
data/class/util/SC_Utils.php の sfIsHTTPS とか
data/Smarty/templates/default/site_frame.tpl とか
Net_URLすら使っていないところがゴロゴロと

@nanasess
Copy link
Contributor Author

@nobuhiko
sfIsHTTPS は本体の判定で共通して使っていて、 Net_URL の判定箇所は外部で使用できないのでやむを得ないかなと
https://github.com/EC-CUBE/ec-cube2/blob/master/data/module/Net/URL.php#L146

@nanasess nanasess deleted the fix-symfony-cli branch October 3, 2022 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nobuhiko nobuhiko nobuhiko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.17.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nanasess @okazy @nobuhiko