You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2014/02/25 18:36:44 UTC
svn commit: r1571762 -
/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java
Author: sobryan
Date: Tue Feb 25 17:36:43 2014
New Revision: 1571762
URL: http://svn.apache.org/r1571762
Log:
TRINIDAD-2456: URL Escaping doubly escapes some urls containing %
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java?rev=1571762&r1=1571761&r2=1571762&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/URLUtils.java Tue Feb 25 17:36:43 2014
@@ -115,6 +115,7 @@ public final class URLUtils
if ((c >= 'A' && c <= 'Z') ||
(c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') ||
+ (c == _URL_ENCODE_CHARACTER) ||
_URL_VALID_CHARS.indexOf(c) > -1
)
{
@@ -122,7 +123,7 @@ public final class URLUtils
sb.append(c);
}
else
- {
+ {
//This is an invalid character, so we encode need to get the bytes
for(byte b: Character.toString(c).getBytes(charset))
{
@@ -257,5 +258,6 @@ public final class URLUtils
private static final String _URL_QUERY_SEPERATOR="?";
private static final String _URL_FRAGMENT_SEPERATOR="#";
private static final String _URL_NAME_VALUE_PAIR_SEPERATOR="=";
+ private static final char _URL_ENCODE_CHARACTER='%';
private static final String _URL_VALID_CHARS="-._~://?#[]@!$&'()*+,;=";
}
\ No newline at end of file