Commit 93702f00 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

Being slightly picky: properly namespace protect make_fake_req() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89837 13f79535-47bb-0310-9956-ffa450edef68
parent 7f14d449

modules/proxy/mod_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, canon_handler, (request_rec *r, 


/* proxy_util.c */



PROXY_DECLARE(request_rec *)make_fake_req(conn_rec *c, request_rec *r);

PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r);

PROXY_DECLARE(int) ap_proxy_hex2c(const char *x);

PROXY_DECLARE(void) ap_proxy_c2hex(int ch, char *x);

PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,

modules/proxy/proxy_http.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf, 
     * filter chain

     */



    rp = make_fake_req(origin, r);

    rp = ap_proxy_make_fake_req(origin, r);



    apr_brigade_cleanup(bb);

modules/proxy/proxy_util.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ PROXY_DECLARE(const char *) 
    return q;

}



PROXY_DECLARE(request_rec *)make_fake_req(conn_rec *c, request_rec *r)

PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r)

{

    request_rec *rp = apr_pcalloc(c->pool, sizeof(*r));

    core_request_config *req_cfg;