From: Rainer Jung <rjung@apache.org>
Date: Sat, 15 Oct 2016 23:07:52 +0000 (+0000)
Subject: Followup to r1764961:
X-Git-Tag: 2.5.0-alpha~1094
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57817b058aa96d7ce8fedd6586f860696bc71279;p=thirdparty%2Fapache%2Fhttpd.git

Followup to r1764961:
- ap_scan_http_uri_safe() was removed
- ap_scan_vchar_obstext() was introduced


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

diff --git a/include/httpd.h b/include/httpd.h
index 4defe1b5132..859318677bd 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1647,12 +1647,10 @@ AP_DECLARE(const char *) ap_scan_http_field_content(const char *ptr);
  */
 AP_DECLARE(const char *) ap_scan_http_token(const char *ptr);
 
-/* Scan a string for valid URI characters per RFC3986, and 
- * return a pointer to the first non-URI character encountered.
- * @param ptr The string to scan
- * @return A pointer to the first non-token character.
+/* Scan a string for visible ASCII (0x21-0x7E) or obstext (0x80+)
+ * and return a pointer to the first ctrl/space character encountered.
  */
-AP_DECLARE(const char *) ap_scan_http_uri_safe(const char *ptr);
+AP_DECLARE(const char *) ap_scan_vchar_obstext(const char *ptr)
 
 /* Retrieve a token, advancing the pointer to the first non-token character
  * and returning a copy of the token string.