diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-10-09 19:07:17 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-10-09 19:07:17 +0200 |
| commit | 14db7672ac26edc1db92e65624e1e0839e7147eb (patch) | |
| tree | 67a6065a65c997442f12b2cabeedacb8fae2abe2 /modules | |
| parent | Rebuild various xdocs (diff) | |
| download | apache2-14db7672ac26edc1db92e65624e1e0839e7147eb.tar.xz apache2-14db7672ac26edc1db92e65624e1e0839e7147eb.zip | |
Remove ap_proxy_removestr(). It has been unused for a decade and has quadratic
memory usage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/proxy/NWGNUproxy | 1 | ||||
| -rw-r--r-- | modules/proxy/mod_proxy.h | 1 | ||||
| -rw-r--r-- | modules/proxy/proxy_util.c | 45 |
3 files changed, 0 insertions, 47 deletions
diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index 0a66bba268..a2dd87dd4c 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -306,7 +306,6 @@ $(OBJDIR)/mod_proxy.imp: @echo $(DL) ap_proxy_pre_http_request,$(DL)>> $@ @echo $(DL) ap_proxy_pre_request,$(DL)>> $@ @echo $(DL) ap_proxy_release_connection,$(DL)>> $@ - @echo $(DL) ap_proxy_removestr,$(DL)>> $@ @echo $(DL) ap_proxy_retry_worker,$(DL)>> $@ @echo $(DL) ap_proxy_sec2hex,$(DL)>> $@ @echo $(DL) ap_proxy_set_wstatus,$(DL)>> $@ diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index dc5110f33c..85886e2bf4 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -523,7 +523,6 @@ PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, cha char **passwordp, char **hostp, apr_port_t *port); PROXY_DECLARE(const char *)ap_proxy_date_canon(apr_pool_t *p, const char *x); PROXY_DECLARE(int) ap_proxy_liststr(const char *list, const char *val); -PROXY_DECLARE(char *)ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val); PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x); PROXY_DECLARE(void) ap_proxy_sec2hex(int t, char *y); PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 9c3f5d2b07..3b91d9e97d 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -435,51 +435,6 @@ PROXY_DECLARE(int) ap_proxy_liststr(const char *list, const char *val) } /* - * list is a comma-separated list of case-insensitive tokens, with - * optional whitespace around the tokens. - * if val appears on the list of tokens, it is removed from the list, - * and the new list is returned. - */ -PROXY_DECLARE(char *)ap_proxy_removestr(apr_pool_t *pool, const char *list, const char *val) -{ - int len, i; - const char *p; - char *new = NULL; - - len = strlen(val); - - while (list != NULL) { - p = ap_strchr_c(list, ','); - if (p != NULL) { - i = p - list; - do { - p++; - } while (apr_isspace(*p)); - } - else { - i = strlen(list); - } - - while (i > 0 && apr_isspace(list[i - 1])) { - i--; - } - if (i == len && strncasecmp(list, val, len) == 0) { - /* do nothing */ - } - else { - if (new) { - new = apr_pstrcat(pool, new, ",", apr_pstrndup(pool, list, i), NULL); - } - else { - new = apr_pstrndup(pool, list, i); - } - } - list = p; - } - return new; -} - -/* * Converts 8 hex digits to a time integer */ PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x) |