You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/22 13:05:33 UTC

svn commit: r234469 - /myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java

Author: mmarinschek
Date: Mon Aug 22 04:05:29 2005
New Revision: 234469

URL: http://svn.apache.org/viewcvs?rev=234469&view=rev
Log:
added support for */*. Thanks to Henri-Philippe Delbrouck for reporting this issue.

Modified:
    myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java

Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=234469&r1=234468&r2=234469&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Mon Aug 22 04:05:29 2005
@@ -42,6 +42,7 @@
     private static String APPLICATION_XML_CONTENT_TYPE = "application/xml";
     private static String TEXT_XML_CONTENT_TYPE = "text/xml";
     private static String APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
+    private static String ANY_CONTENT_TYPE ="*/*";
 
     private static String DEFAULT_CHAR_ENCODING = "ISO-8859-1";
 
@@ -108,7 +109,7 @@
         List contentTypeList = splitContentTypeListString(contentTypeListString);
         String[] supportedContentTypeArray = new String[]{HTML_CONTENT_TYPE,
                 XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE,
-                APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE};
+                APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE,ANY_CONTENT_TYPE};
 
         String selectedContentType = null;
 
@@ -123,7 +124,8 @@
                     if (contentType.indexOf(supportedContentType) != -1)
                     {
                         if (contentType.indexOf(HTML_CONTENT_TYPE) != -1 ||
-                                contentType.indexOf(APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE) != -1) {
+                                contentType.indexOf(APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE) != -1 ||
+                                contentType.indexOf(ANY_CONTENT_TYPE)!=-1) {
                             selectedContentType = HTML_CONTENT_TYPE;
                         }
                         else if (contentType.indexOf(XHTML_CONTENT_TYPE) != -1 ||