Bugfix for //

sandeepshetty · sandeepshetty · commit bd6f604a2629 · 2014-11-24T05:03:44.000+05:30
diff --git a/http.php b/http.php
@@ -11,7 +11,7 @@ function client($base_uri='', $instance_request_headers=array(), $instance_curl_
 		return function ($method_uri, $query='', $payload='', &$response_headers=array(), $request_headers_override=array(), $curl_opts_override=array()) use ($base_uri, $instance_request_headers, $instance_curl_opts)
 		{
 			list($method, $uri) = explode(' ', $method_uri, 2);
-			$uri = ('/' == $uri[0]) ? rtrim($base_uri).'/'.ltrim($uri, '/') : $uri;
+			$uri = ('/' == $uri[0]) ? rtrim($base_uri, '/').$uri : $uri;
 			$request_headers = $request_headers_override + $instance_request_headers;
 			$curl_opts = $curl_opts_override + $instance_curl_opts;
 			return request("$method $uri", $query, $payload, $response_headers, $request_headers, $curl_opts);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function client($base_uri='', $instance_request_headers=array(), $instance_curl_`
`11`	`11`	`return function ($method_uri, $query='', $payload='', &$response_headers=array(), $request_headers_override=array(), $curl_opts_override=array()) use ($base_uri, $instance_request_headers, $instance_curl_opts)`
`12`	`12`	`{`
`13`	`13`	`list($method, $uri) = explode(' ', $method_uri, 2);`
`14`		`- $uri = ('/' == $uri[0]) ? rtrim($base_uri).'/'.ltrim($uri, '/') : $uri;`
	`14`	`+ $uri = ('/' == $uri[0]) ? rtrim($base_uri, '/').$uri : $uri;`
`15`	`15`	`$request_headers = $request_headers_override + $instance_request_headers;`
`16`	`16`	`$curl_opts = $curl_opts_override + $instance_curl_opts;`
`17`	`17`	`return request("$method $uri", $query, $payload, $response_headers, $request_headers, $curl_opts);`