[wiki:sfWebBrowserPlugin] Fixed a few limit case bugs and made the tests pass

git-svn-id: http://svn.symfony-project.com/plugins/sfWebBrowserPlugin/trunk@18167 ee427ae8-e902-0410-961c-c3ed070cd9f9

Author: francois

lib/sfFopenAdapter.class.php

@@ -41,7 +41,7 @@ public function __construct($options = array())
    */  
   public function call($browser, $uri, $method = 'GET', $parameters = array(), $headers = array())
   {    
-    $m_headers = array_merge($browser->getDefaultRequestHeaders(), $browser->initializeRequestHeaders($headers));
+    $m_headers = array_merge(array('Content-Type' => 'application/x-www-form-urlencoded'), $browser->getDefaultRequestHeaders(), $browser->initializeRequestHeaders($headers));
     $request_headers = $browser->prepareHeaders($m_headers);
 
     // Read the response from the server

lib/sfSocketsAdapter.class.php

@@ -41,7 +41,7 @@ public function __construct($options = array())
    */
   public function call($browser, $uri, $method = 'GET', $parameters = array(), $headers = array())
   {
-    $m_headers = array_merge($browser->getDefaultRequestHeaders(), $browser->initializeRequestHeaders($headers));
+    $m_headers = array_merge(array('Content-Type' => 'application/x-www-form-urlencoded'), $browser->getDefaultRequestHeaders(), $browser->initializeRequestHeaders($headers));
     $request_headers = $browser->prepareHeaders($m_headers);
 
     $url_info = parse_url($uri);
@@ -62,14 +62,7 @@ public function call($browser, $uri, $method = 'GET', $parameters = array(), $he
     $request .= $request_headers;
     $request .= "Connection: Close\r\n";
 
-    if ($method == 'POST')
-    {
-      $request .= 'Content-Length: '.strlen($body)."\r\n";
-      $request .= "Content-type: application/x-www-form-urlencoded\r\n";
-      $request .= "\r\n";
-      $request .= http_build_query($parameters, '', '&');
-    }
-    else if ($method == 'PUT')
+    if ($method == 'PUT' && is_array($parameters) && array_key_exists('file', $parameters))
     {
       $fp = fopen($parameters['file'], 'rb');
       $sent = 0;
@@ -90,8 +83,15 @@ public function call($browser, $uri, $method = 'GET', $parameters = array(), $he
       }
       fclose($fp);
     }
+    elseif ($method == 'POST' || $method == 'PUT')
+    {
+      $body = is_array($parameters) ? http_build_query($parameters, '', '&') : $parameters;
+      $request .= 'Content-Length: '.strlen($body)."\r\n";
+      $request .= "\r\n";
+      $request .= $body;
+    }
 
-    $request = "\r\n";
+    $request .= "\r\n";
 
     fwrite($socket, $request);
 
@@ -110,6 +110,7 @@ public function call($browser, $uri, $method = 'GET', $parameters = array(), $he
     $status_line = array_shift($response_lines);
 
     $start_body = false;
+    $response_headers = array();
     for($i=0; $i<count($response_lines); $i++)
     {
       // grab body
@@ -134,12 +135,15 @@ public function call($browser, $uri, $method = 'GET', $parameters = array(), $he
         $response_headers[] = $response_lines[$i];
       }
     }
-
+    
+    $browser->setResponseHeaders($response_headers);
+    
     // grab status code
     preg_match('@(\d{3})@', $status_line, $status_code);
-
-    $browser->setResponseHeaders($response_headers);
-    $browser->setResponseCode($status_code[1]);
+    if(isset($status_code[1]))
+    {
+      $browser->setResponseCode($status_code[1]);
+    }
     $browser->setResponseText(trim($response_body));
 
     return $browser;

lib/sfWebBrowser.class.php

@@ -556,8 +556,15 @@ public function setResponseHeaders($headers = array())
    */  
   public function setResponseCode($firstLine)
   {
-    preg_match('/\d{3}/', $firstLine, $matches); 
-    $this->responseCode = $matches[0];
+    preg_match('/\d{3}/', $firstLine, $matches);
+    if(isset($matches[0]))
+    {
+      $this->responseCode = $matches[0];
+    }
+    else
+    {
+      $this->responseCode = '';
+    }
 
     return $this;
   }  
@@ -614,7 +621,7 @@ public function getResponseBody()
   {
     preg_match('/<body.*?>(.*)<\/body>/si', $this->getResponseText(), $matches);
 
-    return $matches[1];
+    return isset($matches[1]) ? $matches[1] : '';
   }
 
   /**
@@ -793,11 +800,11 @@ public function initializeRequestHeaders($headers = array())
     {
       $encodings = explode(',', $headers['Accept-Encoding']);
     }
-    if (function_exists('gzinflate'))
+    if (function_exists('gzinflate') && !in_array('gzip', $encodings))
     {
       $encodings[] = 'gzip';
     }
-    if (function_exists('gzuncompress'))
+    if (function_exists('gzuncompress') && !in_array('deflate', $encodings))
     {
       $encodings[] = 'deflate';
     }