Commit 9035ab3a authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_proxy: Remove dead code ap_proxy_table_unmerge(). 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209952 13f79535-47bb-0310-9956-ffa450edef68
parent 5b286764

modules/proxy/mod_proxy.h

+0 −1
Changes for modules/proxy/mod_proxy.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -532,7 +532,6 @@ PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, cha 
PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message);

PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr);

PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r);

PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);

/* DEPRECATED (will be replaced with ap_proxy_connect_backend */

PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *);

PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn,

modules/proxy/proxy_util.c

+0 −29
Changes for modules/proxy/proxy_util.c: 0 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -806,35 +806,6 @@ PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r) 
    return OK;

}



/* unmerge an element in the table */

PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key)

{

    apr_off_t offset = 0;

    apr_off_t count = 0;

    char *value = NULL;



    /* get the value to unmerge */

    const char *initial = apr_table_get(t, key);

    if (!initial) {

        return;

    }

    value = apr_pstrdup(p, initial);



    /* remove the value from the headers */

    apr_table_unset(t, key);



    /* find each comma */

    while (value[count]) {

        if (value[count] == ',') {

            value[count] = 0;

            apr_table_add(t, key, value + offset);

            offset = count + 1;

        }

        count++;

    }

    apr_table_add(t, key, value + offset);

}



PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,

                              proxy_dir_conf *conf, const char *url)

{