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.

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

If available, use SERVER_PORT variable as well as SERVER_NAME. #16186

Merged
merged 4 commits into from Jul 7, 2020
Merged

If available, use SERVER_PORT variable as well as SERVER_NAME. #16186

merged 4 commits into from Jul 7, 2020

Conversation

diosmosis
Copy link
Member

Otherwise an install on a non-standard port will not pass the trusted hosts check.

@diosmosis diosmosis added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Jul 7, 2020
@diosmosis diosmosis added this to the 4.0.0 milestone Jul 7, 2020
@tsteur
Copy link
Member

tsteur commented Jul 7, 2020

@diosmosis do we need to adjust other places like https://github.com/matomo-org/matomo/pull/16169/files#diff-ab05063f21f4243a15f897801ef47a7cR211 and https://github.com/matomo-org/matomo/pull/16169/files#diff-719a15b635df457515639ff08ee921b3R826 too?

@tsteur
Copy link
Member

tsteur commented Jul 7, 2020

@diosmosis some tests seem to be failing now: eg https://travis-ci.org/github/matomo-org/matomo/jobs/705628957#L669

Otherwise all good to merge

sgiehl
sgiehl reviewed Jul 7, 2020
View reviewed changes
plugins/ScheduledReports/config/tcpdf_config.php Outdated
&& $_SERVER['SERVER_PORT'] != 443
) {
$k_path_url .= ':' . $_SERVER['SERVER_PORT'];
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for not directly using

$k_path_url .= Url::getHostFromServerNameVar();

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this was part of a library so I didn't want it to depend on Matomo, but looking at the path above, I guess it's actually Matomo code?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's our configuration for tcpdf. Even though I think some parts of that config could maybe meanwhile be removed.

@diosmosis
Copy link
Member Author

Updated and fixed the tests.

@tsteur tsteur merged commit 391165a into 4.x-dev Jul 7, 2020
@tsteur tsteur deleted the server-name-port branch July 7, 2020 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgiehl sgiehl sgiehl left review comments

Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@diosmosis @tsteur @sgiehl