You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sh...@apache.org on 2008/10/21 11:49:50 UTC
svn commit: r706567 -
/webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
Author: shankar
Date: Tue Oct 21 02:49:50 2008
New Revision: 706567
URL: http://svn.apache.org/viewvc?rev=706567&view=rev
Log:
Fix for issue AXIS2C-1278
Modified:
webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c?rev=706567&r1=706566&r2=706567&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c Tue Oct 21 02:49:50 2008
@@ -1407,16 +1407,6 @@
char_set = axutil_strltrim(env, char_set, AXIS2_SPACE_TAB_EQ);
}
- if (char_set)
- {
- temp2 = strchr(char_set, AXIS2_COMMA);
- }
-
- if (temp2)
- {
- *temp2 = AXIS2_ESC_NULL;
- }
-
content_type = axutil_strtrim(env, temp, NULL);
if (temp)
@@ -1496,8 +1486,19 @@
AXIS2_FREE(env->allocator, content_type);
}
+ if (char_set)
+ {
+ temp2 = strchr(char_set, AXIS2_EQ);
+ }
+
+ if (temp2)
+ {
+ ++temp2;
+ }
+
if (char_set && accept_charset_header_value &&
- !axutil_strcasestr(accept_charset_header_value, char_set))
+ !axutil_strcasestr(accept_charset_header_value, char_set) &&
+ !axutil_strcasestr(accept_charset_header_value, temp2))
{
/* 406, Not Acceptable */
axis2_http_header_t *cont_len = NULL;