Fixed issue #7579 on the 2.7 branch

[wiserfirst]

Issue #7579 also exists on the 2.7 branch. On master branch, it was fixed by PR #7581. The same code also fix this issue for the 2.7 branch.

[dereuromark]

Looks good to me.

[wiserfirst]

@dereuromark Thanks for the quick reply!

[AD7six]

Why isn't this using parse_url?

I.e.:

[dereuromark]

You will have to ask @markstory .
I could think of performance reasons, even though it would be very minor - and only relevant for a lot of loop calls.

[wiserfirst]

With parse_url the relevant code would look like this:

        $urlParts = parse_url($this->config['host']);
        $this->config['host'] = $urlParts['host'];
        if (isset($urlParts['scheme'])) {
            $this->config['protocol'] = $urlParts['scheme'];
        }

Maybe it is subject to taste, but to me this looks cleaner. Thanks for the reminder @AD7six

Update:

The code wouldn't work if the host doesn't contain the protocol part, for example $this->config['host'] = 'www.cakephp.org'. We need to check if 'host' exists in the parse result:

        $urlParts = parse_url($this->config['host']);
        if (isset($urlParts['host'])) {
            $this->config['host'] = $urlParts['host'];
        }
        if (isset($urlParts['scheme'])) {
            $this->config['protocol'] = $urlParts['scheme'];
        }

I'm not quite sure if parse_url is still a better solution considering this. Please give some advise, @dereuromark @AD7six . Thanks!

[markstory]

I used string slicing because I didn't think of parse_url() when I wrote the code. It looks like parse_url() would be more complicated though.

[AD7six]

Question answered 👍

The hopping from scheme to protocol to scheme is a bit awkward - but not worth worrying about.

[wiserfirst]

Then I'll leave the code as it is now. 😈