Merge branch 'master' into develop

Author: chadbean

lib/Doctrine/CouchDB/CouchDBClient.php

@@ -121,7 +121,7 @@ static public function create(array $options)
             'ssl' => false,
             'path' => null,
             'logging' => false,
-            'timeout' => 0.01,
+            'timeout' => 10,
         );
         $options = array_merge($defaults, $options);
 

lib/Doctrine/CouchDB/HTTP/AbstractHTTPClient.php

@@ -25,7 +25,7 @@ abstract class AbstractHTTPClient implements Client
         'port'       => 5984,
         'ip'         => '127.0.0.1',
         'ssl'        => false,
-        'timeout'    => 0.01,
+        'timeout'    => 10,
         'keep-alive' => true,
         'username'   => null,
         'password'   => null,
@@ -47,7 +47,7 @@ abstract class AbstractHTTPClient implements Client
      * @param string $path
      * @return \Doctrine\CouchDB\HTTP\AbstractHTTPClient
      */
-    public function __construct($host = 'localhost', $port = 5984, $username = null, $password = null, $ip = null , $ssl = false, $path = null, $timeout = 0.01)
+    public function __construct($host = 'localhost', $port = 5984, $username = null, $password = null, $ip = null , $ssl = false, $path = null, $timeout = 10)
     {
         $this->options['host']     = (string) $host;
         $this->options['port']     = (int) $port;

lib/Doctrine/CouchDB/HTTP/HTTPException.php

@@ -66,7 +66,7 @@ public static function fromResponse( $path, Response $response )
         }
 
         return new self(
-            "HTTP Error with status " . $response->status . " occoured while "
+            "HTTP Error with status " . $response->status . " occurred while "
                 . "requesting " . $path . ". Error: " . $response->body['error']
                 . " " . $response->body['reason'],
             $response->status );

lib/Doctrine/CouchDB/HTTP/MultipartParserAndSender.php

@@ -178,6 +178,11 @@ protected function parseAndSend($targetPath)
     {
         // Main response boundary of the multipart stream.
         $mainBoundary = trim($this->getNextLineFromSourceConnection());
+        // If on the first line we have the size, then main boundary should be
+        // on the second line.
+        if (is_numeric($mainBoundary)) {
+            $mainBoundary = trim($this->getNextLineFromSourceConnection());
+        }
 
         // Docs that don't have attachment.
         // These should be posted using Bulk upload.
@@ -194,7 +199,6 @@ protected function parseAndSend($targetPath)
 
             } elseif (strpos($line, 'Content-Type') !== false) {
 
-
                 list($header, $value) = explode(':', $line);
                 $header = trim($header);
                 $value = trim($value);

lib/Doctrine/CouchDB/HTTP/SocketClient.php

@@ -141,7 +141,10 @@ protected function buildRequest(
         array $headers = array()
     ) {
         // Create basic request headers
-        $host = "Host: {$this->options['host']}:{$this->options['port']}";
+        $host = "Host: {$this->options['host']}";
+        if ($this->options['port'] != 80) {
+            $host .= ":{$this->options['port']}";
+        }
         $request = "$method $path HTTP/1.1\r\n$host\r\n";
 
         // Add basic auth if set

lib/Doctrine/CouchDB/HTTP/StreamClient.php

@@ -92,8 +92,12 @@ protected function checkConnection($method, $path, $data, $headers)
         }
         if ($this->httpFilePointer == null) {
             // TODO SSL support?
+            $host = $this->options['host'];
+            if ($this->options['port'] != 80) {
+                $host .= ":{$this->options['port']}";
+            }
             $this->httpFilePointer = @fopen(
-                'http://' . $basicAuth . $this->options['host'] . ':' . $this->options['port'] . $path,
+                'http://' . $basicAuth . $host . $path,
                 'r',
                 false,
                 stream_context_create(

tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php

@@ -36,7 +36,7 @@ public function testCreateClientFromUrl()
                 'username' => 'foo',
                 'password' => 'bar',
                 'ssl' => true,
-                'timeout' => 0.01,
+                'timeout' => 10,
                 'keep-alive' => true,
                 'path' => null,
             ),
@@ -57,7 +57,7 @@ public function testCreateClientFromUrlWithPath()
                 'username' => 'foo',
                 'password' => 'bar',
                 'ssl' => true,
-                'timeout' => 0.01,
+                'timeout' => 10,
                 'keep-alive' => true,
                 'path' => 'baz/qux',
             ),

tests/Doctrine/Tests/CouchDB/Functional/CouchDBClientTest.php

@@ -74,7 +74,7 @@ public function testDropMultipleTimesSkips()
     public function testCreateDuplicateDatabaseThrowsException()
     {
         $this->couchClient->createDatabase($this->getTestDatabase());
-        $this->setExpectedException('Doctrine\CouchDB\HTTP\HTTPException', 'HTTP Error with status 412 occoured while requesting /'.$this->getTestDatabase().'. Error: file_exists The database could not be created, the file already exists.');
+        $this->setExpectedException('Doctrine\CouchDB\HTTP\HTTPException', 'HTTP Error with status 412 occurred while requesting /'.$this->getTestDatabase().'. Error: file_exists The database could not be created, the file already exists.');
         $this->couchClient->createDatabase($this->getTestDatabase());
     }
 
@@ -87,7 +87,7 @@ public function testGetDatabaseInfo()
         $this->assertEquals($this->getTestDatabase(), $data['db_name']);
 
         $notExistedDb = 'not_existed_db';
-        $this->setExpectedException('Doctrine\CouchDB\HTTP\HTTPException','HTTP Error with status 404 occoured while requesting /'.$notExistedDb.'. Error: not_found no_db_file');
+        $this->setExpectedException('Doctrine\CouchDB\HTTP\HTTPException','HTTP Error with status 404 occurred while requesting /'.$notExistedDb.'. Error: not_found no_db_file');
         $this->couchClient->getDatabaseInfo($notExistedDb);
     }
 
@@ -670,7 +670,7 @@ public function test404WhenQueryAndNoDesignDocument()
 
         $this->setExpectedException(
             'Doctrine\CouchDB\HTTP\HTTPException',
-            'HTTP Error with status 404 occoured while requesting /doctrine_test_database/_design/foo/_view/not-found?. Error: not_found missing'
+            'HTTP Error with status 404 occurred while requesting /doctrine_test_database/_design/foo/_view/not-found?. Error: not_found missing'
         );
 
         $query->execute();

tests/Doctrine/Tests/CouchDB/Functional/HTTP/MultipartParserAndSenderTest.php

@@ -319,4 +319,60 @@ public function testRequestSuccessWithAttachments()
         $client->createDatabase($this->getTestDatabase());
         $client->deleteDatabase($copyDb);
     }
-}
+
+    /**
+     * Test multipart request with body size in the request body.
+     */
+    public function testMultipartRequestWithSize()
+    {
+        $this->streamClientMock->expects($this->once())
+          ->method('getStreamHeaders')
+          ->willReturn(array('status' => 200));
+        $docs = array(
+          '{"_id": "' . $this->docId . '","_rev": "1-abc","foo":"bar"}',
+          '{"_id": "' . $this->docId . '","_rev": "1-abcd","foo":"baz"}',
+          '{"_id": "' . $this->docId . '","_rev": "1-abcde","foo":"baz"}',
+        );
+        $string = <<<EOT
+--7b1596fc4940bc1be725ad67f11ec1c4
+Content-Type: application/json
+
+$docs[0]
+--7b1596fc4940bc1be725ad67f11ec1c4
+Content-Type: application/json
+
+$docs[1]
+--7b1596fc4940bc1be725ad67f11ec1c4
+Content-Type: application/json
+
+$docs[2]
+--7b1596fc4940bc1be725ad67f11ec1c4
+EOT;
+        $size = strlen($string);
+        // Add the size.
+        $string = <<<EOT
+$size
+$string
+EOT;
+
+        $stream = fopen('data://text/plain,' . $string,'r');
+        $this->streamClientMock->expects($this->once())
+          ->method('getConnection')
+          ->willReturn($stream);
+
+        $response = $this->parserAndSender->request(
+          $this->sourceMethod,
+          $this->sourcePath,
+          $this->targetPath,
+          null,
+          $this->sourceHeaders
+        );
+        // The returned response should have the JSON docs.
+        $this->AssertEquals(2, count($response));
+        $this->AssertEquals(3, count($response[0]));
+        $this->AssertEquals($docs[0], $response[0][0]);
+        $this->AssertEquals($docs[1], $response[0][1]);
+        $this->AssertEquals($docs[2], $response[0][2]);
+    }
+
+}