Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/validator-db-abstractdb-tableIdentifier

test/ClientTest.php

@@ -539,7 +539,7 @@ public function testGettingAllMethodSignaturesDefaultsToMulticall()
      */
     public function testSettingUriOnHttpClientIsNotOverwrittenByXmlRpcClient()
     {
-        $changedUri = 'http://bar:80';
+        $changedUri = 'http://bar:80/';
         // Overwrite: http://foo:80
         $this->setServerResponseTo(array());
         $this->xmlrpcClient->getHttpClient()->setUri($changedUri);
@@ -554,7 +554,7 @@ public function testSettingUriOnHttpClientIsNotOverwrittenByXmlRpcClient()
      */
     public function testSettingNoHttpClientUriForcesClientToSetUri()
     {
-        $baseUri = 'http://foo:80';
+        $baseUri = 'http://foo:80/';
         $this->httpAdapter = new Adapter\Test();
         $this->httpClient = new Http\Client(null, array('adapter' => $this->httpAdapter));