summaryrefslogtreecommitdiffstats
path: root/server/util_uri.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/util_uri.c')
-rw-r--r--server/util_uri.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/server/util_uri.c b/server/util_uri.c
index 858323aa49..7a6320906a 100644
--- a/server/util_uri.c
+++ b/server/util_uri.c
@@ -107,7 +107,7 @@ API_EXPORT(unsigned short) ap_default_port_for_request(const request_rec *r)
* from a call to gethostbyname() and lives in static storage.
* By creating a copy we can tuck it away for later use.
*/
-API_EXPORT(struct hostent *) ap_pduphostent(ap_context_t *p, const struct hostent *hp)
+API_EXPORT(struct hostent *) ap_pduphostent(ap_pool_t *p, const struct hostent *hp)
{
struct hostent *newent;
char **ptrs;
@@ -160,7 +160,7 @@ API_EXPORT(struct hostent *) ap_pduphostent(ap_context_t *p, const struct hosten
* COPY OF the hostent structure, intended to be stored and used later.
* (gethostbyname() uses static storage that would be overwritten on each call)
*/
-API_EXPORT(struct hostent *) ap_pgethostbyname(ap_context_t *p, const char *hostname)
+API_EXPORT(struct hostent *) ap_pgethostbyname(ap_pool_t *p, const char *hostname)
{
struct hostent *hp = gethostbyname(hostname);
return (hp == NULL) ? NULL : ap_pduphostent(p, hp);
@@ -170,7 +170,7 @@ API_EXPORT(struct hostent *) ap_pgethostbyname(ap_context_t *p, const char *host
/* Unparse a uri_components structure to an URI string.
* Optionally suppress the password for security reasons.
*/
-API_EXPORT(char *) ap_unparse_uri_components(ap_context_t *p, const uri_components *uptr, unsigned flags)
+API_EXPORT(char *) ap_unparse_uri_components(ap_pool_t *p, const uri_components *uptr, unsigned flags)
{
char *ret = "";
@@ -302,7 +302,7 @@ void ap_util_uri_init(void)
* - fills in fields of uri_components *uptr
* - none on any of the r->* fields
*/
-API_EXPORT(int) ap_parse_uri_components(ap_context_t *p, const char *uri, uri_components *uptr)
+API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr)
{
int ret;
regmatch_t match[10]; /* This must have at least as much elements
@@ -444,7 +444,7 @@ void ap_util_uri_init(void)
* - fills in fields of uri_components *uptr
* - none on any of the r->* fields
*/
-API_EXPORT(int) ap_parse_uri_components(ap_context_t *p, const char *uri, uri_components *uptr)
+API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr)
{
const char *s;
const char *s1;
@@ -568,7 +568,7 @@ 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
*/
-API_EXPORT(int) ap_parse_hostinfo_components(ap_context_t *p, const char *hostinfo, uri_components *uptr)
+API_EXPORT(int) ap_parse_hostinfo_components(ap_pool_t *p, const char *hostinfo, uri_components *uptr)
{
const char *s;
char *endstr;