Author: lindner
Date: Tue Aug 12 10:59:18 2008
New Revision: 685247
URL: http://svn.apache.org/viewvc?rev=685247&view=rev
Log:
SHINDIG-286 | Fix from Vincent Siveton for rfc compliance for url scheme names
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=685247&r1=685246&r2=685247&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
Tue Aug 12 10:59:18 2008
@@ -106,7 +106,7 @@
if (uri == null) {
return def;
}
- if (!"http".equals(uri.getScheme()) && !"https".equals(uri.getScheme())) {
+ if (!"http".equalsIgnoreCase(uri.getScheme()) &&
!"https".equalsIgnoreCase(uri.getScheme())) {
return def;
}
return uri;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=685247&r1=685246&r2=685247&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
Tue Aug 12 10:59:18 2008
@@ -123,7 +123,7 @@
return;
}
- if (!"http".equals(url.getScheme()) && !"https".equals(url.getScheme())) {
+ if (!"http".equalsIgnoreCase(url.getScheme()) &&
!"https".equalsIgnoreCase(url.getScheme())) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Unsupported scheme (must be http or https).");
return;