[Solar-svn] Revision 2820

[pmjones at solarphp.com]

Solar_Http_Request*: use Solar_Uri::get() vice fetch(), and whitespace changes.


Modified: trunk/Solar/Http/Request/Adapter/Stream.php
===================================================================
--- trunk/Solar/Http/Request/Adapter/Stream.php	2007-10-06 15:45:12 UTC (rev 2819)
+++ trunk/Solar/Http/Request/Adapter/Stream.php	2007-10-06 15:47:47 UTC (rev 2820)
@@ -1,18 +1,18 @@
 <?php
 /**
- *
+ * 
  * Wraps an HTTP stream to act as a standalone HTTP request.
  * 
  * @category Solar
- *
+ * 
  * @package Solar_Http
- *
+ * 
  * @author Paul M. Jones <pmjones at solarphp.com>
- *
+ * 
  * @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ * 
  * @version $Id$
- *
+ * 
  */
 
 /**
@@ -20,9 +20,9 @@
  * Wraps an HTTP stream to act as a standalone HTTP request.
  * 
  * @category Solar
- *
+ * 
  * @package Solar_Http
- *
+ * 
  */
 class Solar_Http_Request_Adapter_Stream extends Solar_Http_Request_Adapter {
     

Modified: trunk/Solar/Http/Request/Adapter.php
===================================================================
--- trunk/Solar/Http/Request/Adapter.php	2007-10-06 15:45:12 UTC (rev 2819)
+++ trunk/Solar/Http/Request/Adapter.php	2007-10-06 15:47:47 UTC (rev 2820)
@@ -584,7 +584,7 @@
     public function setProxy($spec)
     {
         if ($spec instanceof Solar_Uri) {
-            $this->_proxy = $spec->fetch(true);
+            $this->_proxy = $spec->get(true);
         } else {
             $this->_proxy = $spec;
         }
@@ -790,7 +790,7 @@
                 // increment to the next response
                 $i ++;
                 $response[$i] = Solar::factory('Solar_Http_Response');
-
+                
                 // set the version, status code, and status text in the response
                 preg_match('/HTTP\/(.+?) ([0-9]+)(.*)/i', $header, $matches);
                 $response[$i]->setVersion($matches[1]);
@@ -980,7 +980,7 @@
         }
         
         // done!
-        return array($uri->fetch(true), $headers, $content);
+        return array($uri->get(true), $headers, $content);
     }
     
     /**

Modified: trunk/Solar/Http/Request.php
===================================================================
--- trunk/Solar/Http/Request.php	2007-10-06 15:45:12 UTC (rev 2819)
+++ trunk/Solar/Http/Request.php	2007-10-06 15:47:47 UTC (rev 2820)
@@ -1,18 +1,18 @@
 <?php
 /**
- *
+ * 
  * Factory to return an HTTP request adapter instance.
  * 
  * @category Solar
- *
+ * 
  * @package Solar_Http
- *
+ * 
  * @author Paul M. Jones <pmjones at solarphp.com>
- *
+ * 
  * @license http://opensource.org/licenses/bsd-license.php BSD
- *
+ * 
  * @version $Id$
- *
+ * 
  */
 
 /**
@@ -20,9 +20,9 @@
  * Factory to return an HTTP request adapter instance.
  * 
  * @category Solar
- *
+ * 
  * @package Solar_Http
- *
+ * 
  */
 class Solar_Http_Request extends Solar_Base {