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/25 14:00:00 UTC
svn commit: r240045 -
/myfaces/impl/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
Author: mmarinschek
Date: Thu Aug 25 04:59:54 2005
New Revision: 240045
URL: http://svn.apache.org/viewcvs?rev=240045&view=rev
Log:
allow multipart/form-data as content-type as well, send text/html back
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=240045&r1=240044&r2=240045&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 Thu Aug 25 04:59:54 2005
@@ -38,7 +38,8 @@
{
private static final Log log = LogFactory.getLog(HtmlRenderKitImpl.class);
private static String HTML_CONTENT_TYPE = "text/html";
- private static String APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
+ private static String FORM_SUBMIT_APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE ="application/x-www-form-urlencoded";
+ private static String FORM_SUBMIT_MULTIPART_FORM_DATA_CONTENT_TYPE="multipart/form-data";
private static String ANY_CONTENT_TYPE ="*/*";
//todo: enable these as soon as myfaces supports proper text/xml
@@ -112,7 +113,9 @@
String[] supportedContentTypeArray = new String[]{HTML_CONTENT_TYPE,
/*todo: enable these as soon as MyFaces supports proper text/xml markup
XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE,*/
- APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE,ANY_CONTENT_TYPE};
+ FORM_SUBMIT_APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE,
+ FORM_SUBMIT_MULTIPART_FORM_DATA_CONTENT_TYPE,
+ ANY_CONTENT_TYPE};
String selectedContentType = null;
@@ -127,7 +130,8 @@
if (contentType.indexOf(supportedContentType) != -1)
{
if (contentType.indexOf(HTML_CONTENT_TYPE) != -1 ||
- contentType.indexOf(APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE) != -1 ||
+ contentType.indexOf(FORM_SUBMIT_APPLICATION_WWW_FORM_URLENCODED_CONTENT_TYPE) != -1 ||
+ contentType.indexOf(FORM_SUBMIT_MULTIPART_FORM_DATA_CONTENT_TYPE) != -1 ||
contentType.indexOf(ANY_CONTENT_TYPE)!=-1) {
selectedContentType = HTML_CONTENT_TYPE;
}