Merge pull request #120 from skipperbent/development

Development

src/Pecee/Http/Request.php

@@ -96,6 +96,9 @@ class Request {
      * @return string
      */
     public function getIp() {
+        if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
+            return $_SERVER['HTTP_CF_CONNECTING_IP'];
+        }
         return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null);
     }
 

src/Pecee/SimpleRouter/RouterBase.php

@@ -113,6 +113,8 @@ class RouterBase {
 
         $originalUri = $this->request->getUri();
 
+        $routeNotAllowed = false;
+
         try {
 
             // Initialize boot-managers
@@ -137,8 +139,6 @@ class RouterBase {
                 }
             }
 
-            $routeNotAllowed = false;
-
             $max = count($this->controllerUrlMap);
 
             /* @var $route RouterEntry */