axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sen...@apache.org
Subject svn commit: r633303 - /webservices/axis2/trunk/c/util/src/uri.c
Date Mon, 03 Mar 2008 22:24:15 GMT
Author: senaka
Date: Mon Mar  3 14:24:13 2008
New Revision: 633303

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

Modified:
    webservices/axis2/trunk/c/util/src/uri.c

Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?rev=633303&r1=633302&r2=633303&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Mon Mar  3 14:24:13 2008
@@ -392,7 +392,6 @@
     {
         s = uri_str; /* restart from beginning as the loop must have ended in
                       * in a wrong place. */
-        uri->scheme = axutil_strdup(env, "http"); /* if no scheme use HTTP */
         goto deal_with_authority;    /* backwards predicted taken! */
     }
 
@@ -851,15 +850,18 @@
             }
             else
             {
-                /* A violation of RFC2396, but it is clear from section 3.2
-                 * that the : belongs above to the scheme, while // belongs
-                 * to the authority, so include the authority prefix while
-                 * omitting the "scheme:" that the user neglected to pass us.
+                /* Fixed to support Abbreviated URLs as in RFC2396.
+                 * Thus, if no scheme, we omit "//" too, eventhough
+                 * it is a part of authority.
                  */
                 ret =
-                    axutil_strcat(env, "//", ret, lbrk, uri->hostname, rbrk,
+                    axutil_strcat(env, ret, lbrk, uri->hostname, rbrk,
                                   is_default_port ? "" : ":",
                                   is_default_port ? "" : uri->port_str, NULL);
+                /*ret =
+                    axutil_strcat(env, "//", ret, lbrk, uri->hostname, rbrk,
+                                  is_default_port ? "" : ":",
+                                  is_default_port ? "" : uri->port_str, NULL);*/
                 if (temp)
                 {
                     AXIS2_FREE(env->allocator, temp);



---------------------------------------------------------------------
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