diff options
Diffstat (limited to 'uri')
| -rw-r--r-- | uri/apr_uri.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/uri/apr_uri.c b/uri/apr_uri.c index 8b22d462f..21fb38d8d 100644 --- a/uri/apr_uri.c +++ b/uri/apr_uri.c @@ -16,7 +16,7 @@ /* * apr_uri.c: URI related utility things - * + * */ #include <stdlib.h> @@ -87,8 +87,8 @@ APR_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str) /* Unparse a apr_uri_t structure to an URI string. * Optionally suppress the password for security reasons. */ -APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, - const apr_uri_t *uptr, +APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, + const apr_uri_t *uptr, unsigned flags) { char *ret = ""; @@ -110,7 +110,7 @@ APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, : "", ((uptr->user && !(flags & APR_URI_UNP_OMITUSER)) || (uptr->password && !(flags & APR_URI_UNP_OMITPASSWORD))) - ? "@" : "", + ? "@" : "", NULL); } @@ -138,7 +138,7 @@ APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, ret = apr_pstrcat(p, uptr->scheme, ":", ret, NULL); } } - + /* Should we suppress all path info? */ if (!(flags & APR_URI_UNP_OMITPATHINFO)) { /* Append path, query and fragment strings: */ @@ -719,7 +719,7 @@ static const unsigned char uri_delims[256] = { * - fills in fields of uri_components *uptr * - none on any of the r->* fields */ -APR_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, +APR_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, apr_uri_t *uptr) { const char *s; @@ -913,8 +913,8 @@ deal_with_host: * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html * for the format of the "CONNECT host:port HTTP/1.0" request */ -APR_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, - const char *hostinfo, +APR_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, + const char *hostinfo, apr_uri_t *uptr) { const char *s; |