Merge branch 'master' of github.com:fruux/sabre-http

sabre-io · Feb 19, 2015 · d0851b3 · d0851b3
2 parents e6cfa76 + b96b7df
commit d0851b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/ChangeLog.md → CHANGELOG.md b/ChangeLog.md → CHANGELOG.md
diff --git a/README.md b/README.md
@@ -4,8 +4,7 @@ sabre/http
 This library provides a toolkit to make working with the HTTP protocol easier.
 
 Most PHP scripts run within a HTTP request but accessing information about the
-HTTP request is cumbersome at least, mainly do to superglobals and the CGI
-standard.
+HTTP request is cumbersome at least.
 
 There's bad practices, inconsistencies and confusion. This library is
 effectively a wrapper around the following PHP constructs:

diff --git a/lib/Client.php b/lib/Client.php
@@ -99,7 +99,7 @@ function send(RequestInterface $request) {
 
                 $response = $this->doRequest($request);
 
-                $code = (int)$response->getStatus();
+                $code = (int) $response->getStatus();
 
                 // We are doing in-PHP redirects, because curl's
                 // FOLLOW_LOCATION throws errors when PHP is configured with
@@ -133,6 +133,7 @@ function send(RequestInterface $request) {
                 }
 
             } catch (ClientException $e) {
+
                 $this->emit('exception', [$request, $e, &$retry, $retryCount]);
 
                 // If retry was still set to false, it means no event handler
@@ -141,7 +142,9 @@ function send(RequestInterface $request) {
                 if (!$retry) {
                     throw $e;
                 }
+
             }
+
             if ($retry) {
                 $retryCount++;
             }
@@ -212,6 +215,7 @@ function poll() {
                 $this->curlMultiHandle,
                 $messagesInQueue
             );
+
             if ($status && $status['msg'] === CURLMSG_DONE) {
 
                 $resourceId = intval($status['handle']);
@@ -221,23 +225,23 @@ function poll() {
                     $errorCallback,
                     $retryCount,
                 ) = $this->curlMultiMap[$resourceId];
-
                 unset($this->curlMultiMap[$resourceId]);
-
                 $curlResult = $this->parseCurlResult(curl_multi_getcontent($status['handle']), $status['handle']);
-
                 $retry = false;
 
                 if ($curlResult['status'] === self::STATUS_CURLERROR) {
 
                     $e = new ClientException($curlResult['curl_errmsg'], $curlResult['curl_errno']);
                     $this->emit('exception', [$request, $e, &$retry, $retryCount]);
+
                     if ($retry) {
                         $retryCount++;
                         $this->sendASyncInternal($request, $successCallback, $errorCallback, $retryCount);
                         goto messageQueue;
                     }
+
                     $curlResult['request'] = $request;
+
                     if ($errorCallback) {
                         $errorCallback($curlResult);
                     }
@@ -248,21 +252,30 @@ function poll() {
                     $this->emit('error:' . $curlResult['http_code'], [$request, $curlResult['response'], &$retry, $retryCount]);
 
                     if ($retry) {
+
                         $retryCount++;
                         $this->sendASyncInternal($request, $successCallback, $errorCallback, $retryCount);
                         goto messageQueue;
+
                     }
+
                     $curlResult['request'] = $request;
+
                     if ($errorCallback) {
                         $errorCallback($curlResult);
                     }
+
                 } else {
+
                     $this->emit('afterRequest', [$request, $curlResult['response']]);
+
                     if ($successCallback) {
                         $successCallback($curlResult['response']);
                     }
+
                 }
             }
+
         } while ($messagesInQueue > 0);
 
         return $stillRunning;
@@ -334,7 +347,6 @@ protected function doRequest(RequestInterface $request) {
 
         curl_setopt_array($this->curlHandle, $settings);
         $response = $this->curlExec($this->curlHandle);
-
         $response = $this->parseCurlResult($response, $this->curlHandle);
 
         if ($response['status'] === self::STATUS_CURLERROR) {
@@ -485,7 +497,6 @@ protected function parseCurlResult($response, $curlHandle) {
         unset($response);
 
         // In the case of 100 Continue, or redirects we'll have multiple lists
-        //
         // of headers for each separate HTTP response. We can easily split this
         // because they are separated by \r\n\r\n
         $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
@@ -519,7 +530,7 @@ protected function parseCurlResult($response, $curlHandle) {
     }
 
     /**
-     * Sends a asynchrous http request.
+     * Sends an asynchronous HTTP request.
      *
      * We keep this in a separate method, so we can call it without triggering
      * the beforeRequest event and don't do the poll().
@@ -558,7 +569,6 @@ protected function sendAsyncInternal(RequestInterface $request, callable $succes
      *
      * @param resource $curlHandle
      * @return string
-
      */
     protected function curlExec($curlHandle) {