When redrawing the parser, ap_get_http_token looked to be useful, but there's

no application for this yet in httpd, so hold off adding this function when
we backport the enhancements. ap_scan_http_token was entirely sufficient.
If the community wants this new function, we can add it when backporting
work is complete.

This patch, and the earlier patches Friday actually demanded an mmn major
bump due to struct member changes. In any final backport, new members must
be added to the end of the struct to retain an mmn minor designation.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765451 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2016-10-18 14:56:07 +00:00
parent d82b69cd66
commit 138746eb14
3 changed files with 4 additions and 33 deletions

View File

@ -546,17 +546,17 @@
* 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.
* 20161018.1 (2.5.0-dev) Dropped ap_has_cntrls(), ap_scan_http_uri_safe(),
* ap_get_http_token() and http_stricturi conf member.
* Added ap_scan_vchar_obstext()
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20160629
#define MODULE_MAGIC_NUMBER_MAJOR 20161018
#endif
#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */
#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a