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 se...@apache.org on 2008/03/19 18:19:23 UTC

svn commit: r638941 - in /webservices/axis2/trunk/c/src/core/transport/http: common/http_worker.c server/apache2/apache2_worker.c

Author: senaka
Date: Wed Mar 19 10:19:15 2008
New Revision: 638941

URL: http://svn.apache.org/viewvc?rev=638941&view=rev
Log:
Making some comparisons case-insensitive.

Modified:
    webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_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=638941&r1=638940&r2=638941&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 Wed Mar 19 10:19:15 2008
@@ -978,7 +978,7 @@
                 {
                     *temp2 = '\0';
                     temp2++;
-                    char_set = strstr(temp2, AXIS2_HTTP_CHAR_SET_ENCODING);
+                    char_set = axutil_strcasestr(temp2, AXIS2_HTTP_CHAR_SET_ENCODING);
                 }
                 if (char_set)
                 {
@@ -1000,7 +1000,7 @@
                     temp = NULL;
                 }
                 if (content_type && accept_header_value &&
-                    !strstr(accept_header_value, content_type))
+                    !axutil_strcasestr(accept_header_value, content_type))
                 {
                     temp2 = strchr(content_type, '/');
                     if (temp2)
@@ -1014,7 +1014,7 @@
                             return AXIS2_FALSE;
                         }
                         sprintf(temp, "%s/*", content_type);
-                        if (!strstr(accept_header_value, temp) &&
+                        if (!axutil_strcasestr(accept_header_value, temp) &&
                             !strstr(accept_header_value, AXIS2_HTTP_HEADER_ACCEPT_ALL))
                         {
                             axis2_http_header_t *cont_len = NULL;
@@ -1056,7 +1056,7 @@
                     AXIS2_FREE(env->allocator, content_type);
                 }
                 if (char_set && accept_charset_header_value && 
-                    !strstr(accept_charset_header_value, char_set))
+                    !axutil_strcasestr(accept_charset_header_value, char_set))
                 {
                     axis2_http_header_t *cont_len = NULL;
                     axis2_http_header_t *cont_type = NULL;
@@ -1096,7 +1096,7 @@
             if (language_header_value)
             {
                 if (accept_language_header_value && 
-                    !strstr(accept_language_header_value, language_header_value))
+                    !axutil_strcasestr(accept_language_header_value, language_header_value))
                 {
                     axis2_http_header_t *cont_len = NULL;
                     axis2_http_header_t *cont_type = NULL;

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c?rev=638941&r1=638940&r2=638941&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c Wed Mar 19 10:19:15 2008
@@ -757,7 +757,7 @@
                 {
                     *temp2 = '\0';
                     temp2++;
-                    char_set = strstr(temp2, AXIS2_HTTP_CHAR_SET_ENCODING);
+                    char_set = axutil_strcasestr(temp2, AXIS2_HTTP_CHAR_SET_ENCODING);
                 }
                 if (char_set)
                 {
@@ -779,7 +779,7 @@
                     temp = NULL;
                 }
                 if (content_type && accept_header_value &&
-                    !strstr(accept_header_value, content_type))
+                    !axutil_strcasestr(accept_header_value, content_type))
                 {
                     temp2 = strchr(content_type, '/');
                     if (temp2)
@@ -793,7 +793,7 @@
                             return AXIS2_FALSE;
                         }
                         sprintf(temp, "%s/*", content_type);
-                        if (!strstr(accept_header_value, temp) &&
+                        if (!axutil_strcasestr(accept_header_value, temp) &&
                             !strstr(accept_header_value, AXIS2_HTTP_HEADER_ACCEPT_ALL))
                         {
                             body_string =
@@ -815,7 +815,7 @@
                     AXIS2_FREE(env->allocator, content_type);
                 }
                 if (char_set && accept_charset_header_value && 
-                    !strstr(accept_charset_header_value, char_set))
+                    !axutil_strcasestr(accept_charset_header_value, char_set))
                 {
                     body_string =
                         axis2_http_transport_utils_get_not_acceptable(env, conf_ctx);
@@ -836,7 +836,7 @@
             if (language_header_value)
             {
                 if (accept_language_header_value &&
-                    !strstr(accept_language_header_value, language_header_value))
+                    !axutil_strcasestr(accept_language_header_value, language_header_value))
                 {
                     body_string =
                         axis2_http_transport_utils_get_not_acceptable(env, conf_ctx);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org