Merge branch 'refs/heads/replace-guzzle-http' into 0.3

Conflicts:
	composer.lock

Author: cboden

Response.php

@@ -3,7 +3,6 @@
 namespace React\Http;
 
 use Evenement\EventEmitter;
-use Guzzle\Http\Message\Response as GuzzleResponse;
 use React\Socket\ConnectionInterface;
 use React\Stream\WritableStreamInterface;
 
@@ -59,18 +58,37 @@ public function writeHead($status = 200, array $headers = array())
             $this->chunkedEncoding = false;
         }
 
-        $response = new GuzzleResponse($status);
-        $response->setHeader('X-Powered-By', 'React/alpha');
-        $response->addHeaders($headers);
+        $headers = array_merge(
+            array('X-Powered-By' => 'React/alpha'),
+            $headers
+        );
         if ($this->chunkedEncoding) {
-            $response->setHeader('Transfer-Encoding', 'chunked');
+            $headers['Transfer-Encoding'] = 'chunked';
         }
-        $data = (string) $response;
+
+        $data = $this->formatHead($status, $headers);
         $this->conn->write($data);
 
         $this->headWritten = true;
     }
 
+    private function formatHead($status, array $headers)
+    {
+        $status = (int) $status;
+        $text = isset(ResponseCodes::$statusTexts[$status]) ? ResponseCodes::$statusTexts[$status] : '';
+        $data = "HTTP/1.1 $status $text\r\n";
+
+        foreach ($headers as $name => $value) {
+            $name = str_replace(array("\r", "\n"), '', $name);
+            $value = str_replace(array("\r", "\n"), '', $value);
+
+            $data .= "$name: $value\r\n";
+        }
+        $data .= "\r\n";
+
+        return $data;
+    }
+
     public function write($data)
     {
         if (!$this->headWritten) {

ResponseCodes.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace React\Http;
+
+/**
+ * This is copy-pasted from Symfony2's Response class
+ */
+class ResponseCodes
+{
+    public static $statusTexts = array(
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',            // RFC2518
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status',          // RFC4918
+        208 => 'Already Reported',      // RFC5842
+        226 => 'IM Used',               // RFC3229
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => 'Reserved',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',    // RFC-reschke-http-status-308-07
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',                                               // RFC2324
+        422 => 'Unprocessable Entity',                                        // RFC4918
+        423 => 'Locked',                                                      // RFC4918
+        424 => 'Failed Dependency',                                           // RFC4918
+        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
+        426 => 'Upgrade Required',                                            // RFC2817
+        428 => 'Precondition Required',                                       // RFC6585
+        429 => 'Too Many Requests',                                           // RFC6585
+        431 => 'Request Header Fields Too Large',                             // RFC6585
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
+        507 => 'Insufficient Storage',                                        // RFC4918
+        508 => 'Loop Detected',                                               // RFC5842
+        510 => 'Not Extended',                                                // RFC2774
+        511 => 'Network Authentication Required',                             // RFC6585
+    );
+}

composer.json

@@ -5,7 +5,6 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3.3",
-        "guzzle/http": "3.0.*",
         "guzzle/parser": "3.0.*",
         "react/socket": "0.3.*"
     },