axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sen...@apache.org
Subject svn commit: r636986 - /webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
Date Fri, 14 Mar 2008 03:57:27 GMT
Author: senaka
Date: Thu Mar 13 20:57:27 2008
New Revision: 636986

URL: http://svn.apache.org/viewvc?rev=636986&view=rev
Log:
Fixing JIRA Issue AXIS2C-1007

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=636986&r1=636985&r2=636986&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 Thu Mar 13 20:57:27
2008
@@ -334,13 +334,49 @@
             axis2_http_header_t *cont_type = NULL;
             axis2_char_t *body_string = NULL;
             axis2_char_t *wsdl = NULL;
+            axis2_bool_t is_services_path = AXIS2_FALSE;
             axis2_http_simple_response_set_status_line(response, env,
                                                        http_version,
                                                        AXIS2_HTTP_RESPONSE_OK_CODE_VAL,
                                                        "OK");
+            if (is_get)
+            {
+                axis2_char_t *temp = NULL;
+                temp = strstr(axutil_url_get_path(request_url, env), AXIS2_REQUEST_URL_PREFIX);
+                if (temp)
+                {
+                    temp += strlen(AXIS2_REQUEST_URL_PREFIX);
+                    if (*temp == '/')
+                    {
+                        temp++;
+                    }
+                    if (!*temp || *temp == '?' || *temp == '#')
+                    {
+                        is_services_path = AXIS2_TRUE;
+                    }
+                }
+
+            }
             wsdl = strstr(url_external_form, AXIS2_REQUEST_WSDL);
-            if (wsdl)
+            if (is_services_path)
+            {
+                axis2_http_simple_response_set_status_line(response, env,
+                                                           http_version,
+                                                           AXIS2_HTTP_RESPONSE_OK_CODE_VAL,
+                                                           "OK");
+                body_string = axis2_http_transport_utils_get_services_html(env,
+                                                                           conf_ctx);
+                cont_type = axis2_http_header_create(env,
+                                                     AXIS2_HTTP_HEADER_CONTENT_TYPE,
+                                                     AXIS2_HTTP_HEADER_ACCEPT_TEXT_HTML);
+                axis2_http_simple_response_set_header(response, env, cont_type);
+            }
+            else if (wsdl)
             {
+                axis2_http_simple_response_set_status_line(response, env,
+                                                           http_version,
+                                                           AXIS2_HTTP_RESPONSE_OK_CODE_VAL,
+                                                           "OK");
                 body_string =
                     axis2_http_transport_utils_get_services_static_wsdl(env,
                                                                         conf_ctx,
@@ -349,17 +385,20 @@
                                                      AXIS2_HTTP_HEADER_CONTENT_TYPE,
                                                      AXIS2_HTTP_HEADER_APPLICATION_XML);
                 axis2_http_simple_response_set_header(response, env, cont_type);
-
             }
             else
             {
+                axis2_http_simple_response_set_status_line(response, env,
+                                                           http_version,
+                                                           404,
+                                                           "Not Found");
+
                 body_string = axis2_http_transport_utils_get_services_html(env,
                                                                            conf_ctx);
                 cont_type = axis2_http_header_create(env,
                                                      AXIS2_HTTP_HEADER_CONTENT_TYPE,
                                                      AXIS2_HTTP_HEADER_ACCEPT_TEXT_HTML);
                 axis2_http_simple_response_set_header(response, env, cont_type);
-
             }
 
             if (body_string)



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


Mime
View raw message