From 5e5a424ee8528c9a72e857466f0be0cc451ac990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sun, 25 Oct 2015 15:29:14 +0100
Subject: [PATCH] [BUGFIX] Bugfixes

- getUri() method in Request class no longer appends "/".
- Optimised parseParameters method in RouterRoute class for regex matches.
---
 src/Pecee/Http/Request.php             | 2 +-
 src/Pecee/SimpleRouter/RouterRoute.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index dd65683..67aa88e 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -10,7 +10,7 @@ class Request {
 
     public function __construct() {
         $this->host = $_SERVER['HTTP_HOST'];
-        $this->uri = rtrim($_SERVER['REQUEST_URI'], '/') . '/';
+        $this->uri = $_SERVER['REQUEST_URI'];
         $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
         $this->headers = getallheaders();
     }
diff --git a/src/Pecee/SimpleRouter/RouterRoute.php b/src/Pecee/SimpleRouter/RouterRoute.php
index 387f55f..97dd519 100644
--- a/src/Pecee/SimpleRouter/RouterRoute.php
+++ b/src/Pecee/SimpleRouter/RouterRoute.php
@@ -19,6 +19,7 @@ class RouterRoute extends RouterEntry {
     }
 
     protected function parseParameters($url, $multiple = false, $regex = self::PARAMETERS_REGEX_MATCH) {
+        $url = rtrim($url, '/');
         $parameters = array();
 
         if($multiple) {