Complete r1764961, missed .h updates

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index aea8507f41b36b0c56c2dc42ffab319d3871cf4f..0457b30a08d837af025d974fc9aeb528e76c48e1 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -546,6 +546,9 @@
  *                         core_server_config
  * 20160629.1 (2.5.0-dev)  Dropped http_whitespace from core_server_config
  * 20160629.2 (2.5.0-dev)  Replaced fold w/multiple flags for ap_[r]getline()
+ * 20160629.3 (2.5.0-dev)  Dropped ap_has_cntrls(), ap_scan_http_uri_safe()
+ *                         and http_stricturi member/directive.
+ *                         Added ap_scan_vchar_obstext()
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */

diff --git a/include/http_core.h b/include/http_core.h
index 91ae01e9c0b8a47c8be2007f47754b5e7ebefe7d..e99816da81639ffd38049795180dffa97998a6e1 100644 (file)
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -744,11 +744,6 @@ typedef struct {
 #define AP_HTTP_METHODS_REGISTERED    2
     char http_methods;
 
-#define AP_HTTP_URI_UNSET             0
-#define AP_HTTP_URI_UNSAFE            1
-#define AP_HTTP_URI_STRICT            2
-    char http_stricturi;
-
 #define AP_HTTP_CL_HEAD_ZERO_UNSET    0
 #define AP_HTTP_CL_HEAD_ZERO_ENABLE   1
 #define AP_HTTP_CL_HEAD_ZERO_DISABLE  2
@@ -759,7 +754,6 @@ typedef struct {
 #define AP_HTTP_EXPECT_STRICT_DISABLE  2
     int http_expect_strict;
 
-
     apr_array_header_t *protocols;
     int protocols_honor_order;
     int async_filter;

diff --git a/include/httpd.h b/include/httpd.h
index 406c62e9d4dce90e84295d8ea9f01fe7e11c0bf6..47437da75fca2d1e8ddbacc0420838c7dcad97b5 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1648,7 +1648,9 @@ 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 visible ASCII (0x21-0x7E) or obstext (0x80+)
- * and return a pointer to the first ctrl/space character encountered.
+ * and return a pointer to the first SP/CTL/NUL character encountered.
+ * @param ptr The string to scan
+ * @return A pointer to the first SP/CTL character.
  */
 AP_DECLARE(const char *) ap_scan_vchar_obstext(const char *ptr);