Author: senaka
Date: Mon Mar 3 04:46:58 2008
New Revision: 633072
URL: http://svn.apache.org/viewvc?rev=633072&view=rev
Log:
Fixing JIRA Issue AXIS2C-1023
Modified:
webservices/axis2/trunk/c/util/include/axutil_uri.h
webservices/axis2/trunk/c/util/src/uri.c
Modified: webservices/axis2/trunk/c/util/include/axutil_uri.h
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_uri.h?rev=633072&r1=633071&r2=633072&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_uri.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_uri.h Mon Mar 3 04:46:58 2008
@@ -80,26 +80,33 @@
/** Flags passed to unparse_uri_components(): */
/** suppress "scheme://[EMAIL PROTECTED]:port" */
-#define AXIS2_URI_UNP_OMITSITEPART (1U<<0)
+#define AXIS2_URI_UNP_OMITSITEPART (1U<<0)
/** Just omit user */
-#define AXIS2_URI_UNP_OMITUSER (1U<<1)
+#define AXIS2_URI_UNP_OMITUSER (1U<<1)
/** Just omit password */
-#define AXIS2_URI_UNP_OMITPASSWORD (1U<<2)
+#define AXIS2_URI_UNP_OMITPASSWORD (1U<<2)
/** omit "user:password\@" part */
-#define AXIS2_URI_UNP_OMITUSERINFO (AXIS2_URI_UNP_OMITUSER | \
- AXIS2_URI_UNP_OMITPASSWORD)
+#define AXIS2_URI_UNP_OMITUSERINFO (AXIS2_URI_UNP_OMITUSER | \
+ AXIS2_URI_UNP_OMITPASSWORD)
/** Show plain text password (default: show XXXXXXXX) */
-#define AXIS2_URI_UNP_REVEALPASSWORD (1U<<3)
+#define AXIS2_URI_UNP_REVEALPASSWORD (1U<<3)
/** Show "scheme://[EMAIL PROTECTED]:port" only */
-#define AXIS2_URI_UNP_OMITPATHINFO (1U<<4)
+#define AXIS2_URI_UNP_OMITPATHINFO (1U<<4)
/** Omit the "?queryarg" from the path */
-#define AXIS2_URI_UNP_OMITQUERY (1U<<5)
+#define AXIS2_URI_UNP_OMITQUERY_ONLY (1U<<5)
+
+ /** Omit the "#fragment" from the path */
+#define AXIS2_URI_UNP_OMITFRAGMENT_ONLY (1U<<6)
+
+ /** Omit the "?queryarg" and "#fragment" from the path */
+#define AXIS2_URI_UNP_OMITQUERY (AXIS2_URI_UNP_OMITQUERY_ONLY | \
+ AXIS2_URI_UNP_OMITFRAGMENT_ONLY)
/** @see axutil_uri_t */
typedef unsigned short axis2_port_t;
Modified: webservices/axis2/trunk/c/util/src/uri.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?rev=633072&r1=633071&r2=633072&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Mon Mar 3 04:46:58 2008
@@ -829,13 +829,13 @@
ret =
axutil_strcat(env, ret, (uri->path) ? uri->path : "",
(uri->query &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ? "?" : "",
+ !(flags & AXIS2_URI_UNP_OMITQUERY_ONLY)) ? "?" : "",
(uri->query &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->
+ !(flags & AXIS2_URI_UNP_OMITQUERY_ONLY)) ? uri->
query : "", (uri->fragment &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ?
"#"
+ !(flags &
AXIS2_URI_UNP_OMITFRAGMENT_ONLY)) ? "#"
: NULL, (uri->fragment &&
- !(flags & AXIS2_URI_UNP_OMITQUERY)) ? uri->
+ !(flags & AXIS2_URI_UNP_OMITFRAGMENT_ONLY))
? uri->
fragment : NULL, NULL);
if (temp)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
