From eaa95a5ee171f953b24ac4035cf9666b2ab634c7 Mon Sep 17 00:00:00 2001 From: shankar Date: Wed, 24 Feb 2010 05:30:01 +0000 Subject: changing strcasecmp to axutil_strcasecmp. Check AXIS2C-924 for more details git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@915678 13f79535-47bb-0310-9956-ffa450edef68 --- build.sh | 2 +- .../transport/http/server/apache2/apache2_worker.c | 20 ++++++++++---------- src/core/transport/http/server/apache2/mod_axis2.c | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.sh b/build.sh index 5956a54..d88b220 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ export AXIS2C_HOME echo "AXIS2C_HOME = ${AXIS2C_HOME}" -sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes +sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/include/httpd --with-apr=/usr/include/apr-1 make -j 10 make install diff --git a/src/core/transport/http/server/apache2/apache2_worker.c b/src/core/transport/http/server/apache2/apache2_worker.c index 12b05b2..a13e64a 100644 --- a/src/core/transport/http/server/apache2/apache2_worker.c +++ b/src/core/transport/http/server/apache2/apache2_worker.c @@ -530,28 +530,28 @@ axis2_apache2_worker_process_request( i)); temp += strlen(temp); /* Conditions below is to assist down-stream modules */ - if(!strcasecmp(AXIS2_HTTP_PUT, (axis2_char_t *)axutil_array_list_get( + if(!axutil_strcasecmp(AXIS2_HTTP_PUT, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_PUT; } - else if(!strcasecmp(AXIS2_HTTP_POST, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_POST, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_POST; } - else if(!strcasecmp(AXIS2_HTTP_GET, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_GET, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_GET; } - else if(!strcasecmp(AXIS2_HTTP_HEAD, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_HEAD, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { /* Apache Can't differentiate between HEAD and GET */ request->allowed_methods->method_mask |= AP_METHOD_BIT << M_GET; } - else if(!strcasecmp(AXIS2_HTTP_DELETE, + else if(!axutil_strcasecmp(AXIS2_HTTP_DELETE, (axis2_char_t *)axutil_array_list_get(method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_DELETE; @@ -677,28 +677,28 @@ axis2_apache2_worker_process_request( i)); temp += strlen(temp); /* Conditions below is to assist down-stream modules */ - if(!strcasecmp(AXIS2_HTTP_PUT, (axis2_char_t *)axutil_array_list_get( + if(!axutil_strcasecmp(AXIS2_HTTP_PUT, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_PUT; } - else if(!strcasecmp(AXIS2_HTTP_POST, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_POST, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_POST; } - else if(!strcasecmp(AXIS2_HTTP_GET, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_GET, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_GET; } - else if(!strcasecmp(AXIS2_HTTP_HEAD, (axis2_char_t *)axutil_array_list_get( + else if(!axutil_strcasecmp(AXIS2_HTTP_HEAD, (axis2_char_t *)axutil_array_list_get( method_list, env, i))) { /* Apache Can't differentiate between HEAD and GET */ request->allowed_methods->method_mask |= AP_METHOD_BIT << M_GET; } - else if(!strcasecmp(AXIS2_HTTP_DELETE, + else if(!axutil_strcasecmp(AXIS2_HTTP_DELETE, (axis2_char_t *)axutil_array_list_get(method_list, env, i))) { request->allowed_methods->method_mask |= AP_METHOD_BIT << M_DELETE; diff --git a/src/core/transport/http/server/apache2/mod_axis2.c b/src/core/transport/http/server/apache2/mod_axis2.c index d8ff23f..4da15d9 100644 --- a/src/core/transport/http/server/apache2/mod_axis2.c +++ b/src/core/transport/http/server/apache2/mod_axis2.c @@ -260,31 +260,31 @@ axis2_set_log_level( str = ap_getword_conf(cmd->pool, &arg); if(str) { - if(!strcasecmp(str, "crit")) + if(!axutil_strcasecmp(str, "crit")) { level = AXIS2_LOG_LEVEL_CRITICAL; } - else if(!strcasecmp(str, "error")) + else if(!axutil_strcasecmp(str, "error")) { level = AXIS2_LOG_LEVEL_ERROR; } - else if(!strcasecmp(str, "warn")) + else if(!axutil_strcasecmp(str, "warn")) { level = AXIS2_LOG_LEVEL_WARNING; } - else if(!strcasecmp(str, "info")) + else if(!axutil_strcasecmp(str, "info")) { level = AXIS2_LOG_LEVEL_INFO; } - else if(!strcasecmp(str, "debug")) + else if(!axutil_strcasecmp(str, "debug")) { level = AXIS2_LOG_LEVEL_DEBUG; } - else if(!strcasecmp(str, "user")) + else if(!axutil_strcasecmp(str, "user")) { level = AXIS2_LOG_LEVEL_USER; } - else if(!strcasecmp(str, "trace")) + else if(!axutil_strcasecmp(str, "trace")) { level = AXIS2_LOG_LEVEL_TRACE; } -- cgit v1.1-32-gdbae