You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/03 14:38:26 UTC
svn commit: r1209910 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
proxy_util.c
Author: minfrin
Date: Sat Dec 3 13:38:26 2011
New Revision: 1209910
URL: http://svn.apache.org/viewvc?rev=1209910&view=rev
Log:
mod_proxy: Remove dead code.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1209910&r1=1209909&r2=1209910&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Sat Dec 3 13:38:26 2011
@@ -537,8 +537,6 @@ PROXY_DECLARE(char *)ap_proxy_canonenc(a
int forcedec, int proxyreq);
PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,
char **passwordp, char **hostp, apr_port_t *port);
-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);
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);
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1209910&r1=1209909&r2=1209910&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sat Dec 3 13:38:26 2011
@@ -391,56 +391,6 @@ PROXY_DECLARE(request_rec *)ap_proxy_mak
return rp;
}
-/*
- * Converts 8 hex digits to a time integer
- */
-PROXY_DECLARE(int) ap_proxy_hex2sec(const char *x)
-{
- int i, ch;
- unsigned int j;
-
- for (i = 0, j = 0; i < 8; i++) {
- ch = x[i];
- j <<= 4;
- if (apr_isdigit(ch)) {
- j |= ch - '0';
- }
- else if (apr_isupper(ch)) {
- j |= ch - ('A' - 10);
- }
- else {
- j |= ch - ('a' - 10);
- }
- }
- if (j == 0xffffffff) {
- return -1; /* so that it works with 8-byte ints */
- }
- else {
- return j;
- }
-}
-
-/*
- * Converts a time integer to 8 hex digits
- */
-PROXY_DECLARE(void) ap_proxy_sec2hex(int t, char *y)
-{
- int i, ch;
- unsigned int j = t;
-
- for (i = 7; i >= 0; i--) {
- ch = j & 0xF;
- j >>= 4;
- if (ch >= 10) {
- y[i] = ch + ('A' - 10);
- }
- else {
- y[i] = ch + '0';
- }
- }
- y[8] = '\0';
-}
-
PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *message)
{
const char *uri = ap_escape_html(r->pool, r->uri);