You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/10/11 14:37:10 UTC
svn commit: r583802 - in /httpd/httpd/trunk: include/ap_mmn.h
modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Author: jim
Date: Thu Oct 11 05:37:09 2007
New Revision: 583802
URL: http://svn.apache.org/viewvc?rev=583802&view=rev
Log:
Semi-revert 583466; just remove the ap_proxy_isvalidenc()
function until we canonically set the "allowed" list.
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=583802&r1=583801&r2=583802&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Thu Oct 11 05:37:09 2007
@@ -133,7 +133,6 @@
* 20070823.0 (2.3.0-dev) Removed ap_all_available_mutexes_string,
* ap_available_mutexes_string for macros
* 20070823.1 (2.3.0-dev) add ap_send_interim_response()
- * 20070823.2 (2.3.0-dev) add ap_proxy_isvalidenc()
*
*/
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=583802&r1=583801&r2=583802&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Thu Oct 11 05:37:09 2007
@@ -460,7 +460,6 @@
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(apr_status_t)ap_proxy_isvalidenc(const char *url, const char *allowed);
PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,
int forcedec, int proxyreq);
PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=583802&r1=583801&r2=583802&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Oct 11 05:37:09 2007
@@ -135,33 +135,6 @@
}
/*
- * Confirm that a URL-encoded string only contains
- * valid encoding, valid chars are passed in allowed.
- * If allowed is NULL, we use useful default.
- */
-PROXY_DECLARE(apr_status_t)ap_proxy_isvalidenc(const char *url,
- const char *allowed)
-
-{
- if (!allowed) {
- allowed = "~$-_.+!*'(),;:@&=/"; /* allowed+reserved from
- ap_proxy_canonenc */
- }
-
- for ( ; *url; ++url) {
- if (!apr_isalnum(*url) && !ap_strchr_c(allowed, *url)) {
- if (*url == '%' && apr_isxdigit(url[1]) && apr_isxdigit(url[2])) {
- url += 2; /* an encoded char */
- }
- else {
- return APR_EGENERAL; /* reject bad char in URL */
- }
- }
- }
- return APR_SUCCESS;
-}
-
-/*
* canonicalise a URL-encoded string
*/