Merge branch '2.6' into 3.0

DavertMik · DavertMik · commit a5fcadaa29ed · 2019-04-24T02:40:41.000+03:00
diff --git a/src/Codeception/Module/REST.php b/src/Codeception/Module/REST.php
@@ -590,7 +590,7 @@ protected function execute($method, $url, $parameters = [], $files = [])
         // allow full url to be requested
         if (strpos($url, '://') === false) {
             $url = $this->config['url'] . $url;
-            if ($this->config['url'] && strpos($url, '://') === false && $this->config['url'][0] !== '/') {
+            if ($this->config['url'] && strpos($url, '://') === false && strpos($url, '/') !== 0 && $this->config['url'][0] !== '/') {
                 $url = '/' . $url;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ protected function execute($method, $url, $parameters = [], $files = [])`
`590`	`590`	`// allow full url to be requested`
`591`	`591`	`if (strpos($url, '://') === false) {`
`592`	`592`	`$url = $this->config['url'] . $url;`
`593`		`- if ($this->config['url'] && strpos($url, '://') === false && $this->config['url'][0] !== '/') {`
	`593`	`+ if ($this->config['url'] && strpos($url, '://') === false && strpos($url, '/') !== 0 && $this->config['url'][0] !== '/') {`
`594`	`594`	`$url = '/' . $url;`
`595`	`595`	`}`
`596`	`596`	`}`