From 1feeb95ff2f31fd93749bd0ea74c1ffedf884d33 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 26 Sep 2015 01:01:38 -0700
Subject: [PATCH] Encode reserved @ character in URLs.

---
 VERSION                | 2 +-
 flight/net/Request.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index fd9d1a5..1fc5b82 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.14
+1.2.15
diff --git a/flight/net/Request.php b/flight/net/Request.php
index c21ef27..8cae7c2 100644
--- a/flight/net/Request.php
+++ b/flight/net/Request.php
@@ -129,7 +129,7 @@ class Request {
         // Default properties
         if (empty($config)) {
             $config = array(
-                'url' => self::getVar('REQUEST_URI', '/'),
+                'url' => str_replace('@', '%40', self::getVar('REQUEST_URI', '/')),
                 'base' => str_replace(array('\\',' '), array('/','%20'), dirname(self::getVar('SCRIPT_NAME'))),
                 'method' => self::getMethod(),
                 'referrer' => self::getVar('HTTP_REFERER'),