You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2016/10/16 02:09:45 UTC
svn commit: r1765115 - in /httpd/httpd/trunk/include: ap_mmn.h http_core.h
httpd.h
Author: wrowe
Date: Sun Oct 16 02:09:45 2016
New Revision: 1765115
URL: http://svn.apache.org/viewvc?rev=1765115&view=rev
Log:
Complete r1764961, missed .h updates
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/include/http_core.h
httpd/httpd/trunk/include/httpd.h
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1765115&r1=1765114&r2=1765115&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Sun Oct 16 02:09:45 2016
@@ -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" */
Modified: httpd/httpd/trunk/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_core.h?rev=1765115&r1=1765114&r2=1765115&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_core.h (original)
+++ httpd/httpd/trunk/include/http_core.h Sun Oct 16 02:09:45 2016
@@ -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;
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1765115&r1=1765114&r2=1765115&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Sun Oct 16 02:09:45 2016
@@ -1648,7 +1648,9 @@ AP_DECLARE(const char *) ap_scan_http_fi
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);