From 0ea270e148e51a9d83335df9af6219f330b4570b Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Tue, 19 Nov 2013 16:38:35 +1100
Subject: [PATCH 1/2] fix(angular.encodeUriSegment): do not encode semi-colon

RFC 3986 indicates that ; is not encoded as part of the URI, as is the case
with other members of sub-delim. Changed encodeUriSegment to match that
behaviour, along with the corresponding spec.
---
 src/Angular.js      |  1 +
 test/AngularSpec.js | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Angular.js b/src/Angular.js
index 8409f971f2ca..72e5caded2e8 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1065,6 +1065,7 @@ function toKeyValue(obj) {
  */
 function encodeUriSegment(val) {
   return encodeUriQuery(val, true).
+             replace(/%3B/gi, ';').
              replace(/%26/gi, '&').
              replace(/%3D/gi, '=').
              replace(/%2B/gi, '+');
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 1b08a18e078d..106b44baf8c2 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -569,12 +569,12 @@ describe('angular', function() {
         toEqual("-_.!~*'()%20-_.!~*'()");
 
       //don't encode the rest of pchar'
-      expect(encodeUriSegment(':@&=+$, :@&=+$,')).
-        toEqual(':@&=+$,%20:@&=+$,');
+      expect(encodeUriSegment(':;@&=+$, :;@&=+$,')).
+        toEqual(':;@&=+$,%20:;@&=+$,');
 
-      //encode '/', ';' and ' ''
-      expect(encodeUriSegment('/; /;')).
-        toEqual('%2F%3B%20%2F%3B');
+      //encode '/', and ' ''
+      expect(encodeUriSegment('/ /')).
+        toEqual('%2F%20%2F');
     });
   });
 

From f728b7859345791b423c5eba7a71191b9d6f78e3 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Thu, 21 Nov 2013 12:35:14 +1100
Subject: [PATCH 2/2] fix($location): retain original encoded path

Change location to retain the expected path encoding. The decode/encode cycle
for the location path loses data as %3B (a semi-colon in the path) and ; (a
sub-delim in the URI for path parameters) are considered to be different.
---
 src/Angular.js      |  1 -
 src/ng/location.js  | 26 +++++++++++++++-----------
 test/AngularSpec.js | 10 +++++-----
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/Angular.js b/src/Angular.js
index 72e5caded2e8..8409f971f2ca 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1065,7 +1065,6 @@ function toKeyValue(obj) {
  */
 function encodeUriSegment(val) {
   return encodeUriQuery(val, true).
-             replace(/%3B/gi, ';').
              replace(/%26/gi, '&').
              replace(/%3D/gi, '=').
              replace(/%2B/gi, '+');
diff --git a/src/ng/location.js b/src/ng/location.js
index f06a5f811a7d..c1a549b2487a 100644
--- a/src/ng/location.js
+++ b/src/ng/location.js
@@ -37,15 +37,17 @@ function parseAppUrl(relativeUrl, locationObj, appBase) {
     relativeUrl = '/' + relativeUrl;
   }
   var match = urlResolve(relativeUrl, appBase);
-  locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
-      match.pathname.substring(1) : match.pathname);
-  locationObj.$$search = parseKeyValue(match.search);
-  locationObj.$$hash = decodeURIComponent(match.hash);
+  locationObj.pathEncoded = prefixed && match.pathname.charAt(0) === '/' ?
+      match.pathname.substring(1) : match.pathname;
 
   // make sure path starts with '/';
-  if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
-    locationObj.$$path = '/' + locationObj.$$path;
+  if (locationObj.pathEncoded && locationObj.pathEncoded.charAt(0) != '/') {
+    locationObj.pathEncoded = '/' + locationObj.pathEncoded;
   }
+
+  locationObj.$$path = decodeURIComponent(locationObj.pathEncoded);
+  locationObj.$$search = parseKeyValue(match.search);
+  locationObj.$$hash = decodeURIComponent(match.hash);
 }
 
 
@@ -123,7 +125,7 @@ function LocationHtml5Url(appBase, basePrefix) {
     var search = toKeyValue(this.$$search),
         hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
-    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$url = this.pathEncoded + (search ? '?' + search : '') + hash;
     this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
   };
 
@@ -190,7 +192,7 @@ function LocationHashbangUrl(appBase, hashPrefix) {
     var search = toKeyValue(this.$$search),
         hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
-    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$url = this.pathEncoded + (search ? '?' + search : '') + hash;
     this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
   };
 
@@ -350,8 +352,10 @@ LocationHashbangInHtml5Url.prototype =
    * @param {string=} path New path
    * @return {string} path
    */
-  path: locationGetterSetter('$$path', function(path) {
-    return path.charAt(0) == '/' ? path : '/' + path;
+  path: locationGetterSetter('$$path', function(path, locationObj) {
+    path = path.charAt(0) == '/' ? path : '/' + path;
+    locationObj.pathEncoded = encodePath(path);
+    return path;
   }),
 
   /**
@@ -446,7 +450,7 @@ function locationGetterSetter(property, preprocess) {
     if (isUndefined(value))
       return this[property];
 
-    this[property] = preprocess(value);
+    this[property] = preprocess(value, this);
     this.$$compose();
 
     return this;
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
index 106b44baf8c2..1b08a18e078d 100644
--- a/test/AngularSpec.js
+++ b/test/AngularSpec.js
@@ -569,12 +569,12 @@ describe('angular', function() {
         toEqual("-_.!~*'()%20-_.!~*'()");
 
       //don't encode the rest of pchar'
-      expect(encodeUriSegment(':;@&=+$, :;@&=+$,')).
-        toEqual(':;@&=+$,%20:;@&=+$,');
+      expect(encodeUriSegment(':@&=+$, :@&=+$,')).
+        toEqual(':@&=+$,%20:@&=+$,');
 
-      //encode '/', and ' ''
-      expect(encodeUriSegment('/ /')).
-        toEqual('%2F%20%2F');
+      //encode '/', ';' and ' ''
+      expect(encodeUriSegment('/; /;')).
+        toEqual('%2F%3B%20%2F%3B');
     });
   });