From: William A. Rowe Jr Date: Mon, 18 Jul 2016 16:20:27 +0000 (+0000) Subject: A whole lotta nope, if you implement HTCPCP then register your methods in init X-Git-Tag: 2.5.0-alpha~1393 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea506b6708d487027e4ec7b42b023723e0d0bacd;p=thirdparty%2Fapache%2Fhttpd.git A whole lotta nope, if you implement HTCPCP then register your methods in init git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1753263 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/httpd.h b/include/httpd.h index 2a326dfe381..eba7b530763 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -612,9 +612,15 @@ AP_DECLARE(const char *) ap_get_server_built(void); #define M_MKACTIVITY 23 #define M_BASELINE_CONTROL 24 #define M_MERGE 25 -#define M_INVALID 26 /** no valid method */ -#define M_BREW 27 /** RFC 2324: HTCPCP/1.0 */ -#define M_WHEN 28 /** RFC 2324: HTCPCP/1.0 */ +/* Additional methods must be registered by the implementor, we have only + * room for 64 bit-wise methods available, so do not squander them (more of + * the above methods should probably move here) + */ +/* #define M_BREW nn */ /** RFC 2324: HTCPCP/1.0 */ +/* #define M_WHEN nn */ /** RFC 2324: HTCPCP/1.0 */ +#define M_INVALID 26 /** invalid method value terminates the + * listed ap_method_registry_init() + */ /** * METHODS needs to be equal to the number of bits diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 17a6e27c24d..b590fa5f29f 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -718,8 +718,6 @@ AP_DECLARE(void) ap_method_registry_init(apr_pool_t *p) register_one_method(p, "MKACTIVITY", M_MKACTIVITY); register_one_method(p, "BASELINE-CONTROL", M_BASELINE_CONTROL); register_one_method(p, "MERGE", M_MERGE); - register_one_method(p, "BREW", M_BREW); - register_one_method(p, "WHEN", M_WHEN); } AP_DECLARE(int) ap_method_register(apr_pool_t *p, const char *methname)