diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2005-01-02 06:33:44 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2005-01-02 06:33:44 +0100 |
| commit | d962fcfc8b3946aa999f0e231170837f4922ccb5 (patch) | |
| tree | 8978c3c7d0655f23f8d0513cd13c9b7a4a4d7744 /server | |
| parent | Fix closing connection for non-cachable proxies. (diff) | |
| download | apache2-d962fcfc8b3946aa999f0e231170837f4922ccb5.tar.xz apache2-d962fcfc8b3946aa999f0e231170837f4922ccb5.zip | |
FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.
It's not a deprecation, as ap_http_method would be a lovely function
name sometime in the future: to determine what the function name implies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/core.c | 4 | ||||
| -rw-r--r-- | server/protocol.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/core.c b/server/core.c index 23f47a8086..15083f9ff5 100644 --- a/server/core.c +++ b/server/core.c @@ -958,10 +958,10 @@ AP_DECLARE(char *) ap_construct_url(apr_pool_t *p, const char *uri, const char *host = get_server_name_for_url(r); if (ap_is_default_port(port, r)) { - return apr_pstrcat(p, ap_http_method(r), "://", host, uri, NULL); + return apr_pstrcat(p, ap_http_scheme(r), "://", host, uri, NULL); } - return apr_psprintf(p, "%s://%s:%u%s", ap_http_method(r), host, port, uri); + return apr_psprintf(p, "%s://%s:%u%s", ap_http_scheme(r), host, port, uri); } AP_DECLARE(apr_off_t) ap_get_limit_req_body(const request_rec *r) diff --git a/server/protocol.c b/server/protocol.c index 152f496aec..49fef829bd 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -60,7 +60,7 @@ APR_HOOK_STRUCT( APR_HOOK_LINK(post_read_request) APR_HOOK_LINK(log_transaction) - APR_HOOK_LINK(http_method) + APR_HOOK_LINK(http_scheme) APR_HOOK_LINK(default_port) ) @@ -503,7 +503,7 @@ AP_CORE_DECLARE(void) ap_parse_uri(request_rec *r, const char *uri) if (status == APR_SUCCESS) { /* if it has a scheme we may need to do absoluteURI vhost stuff */ if (r->parsed_uri.scheme - && !strcasecmp(r->parsed_uri.scheme, ap_http_method(r))) { + && !strcasecmp(r->parsed_uri.scheme, ap_http_scheme(r))) { r->hostname = r->parsed_uri.hostname; } else if (r->method_number == M_CONNECT) { @@ -1540,7 +1540,7 @@ AP_IMPLEMENT_HOOK_RUN_ALL(int,post_read_request, (request_rec *r), (r), OK, DECLINED) AP_IMPLEMENT_HOOK_RUN_ALL(int,log_transaction, (request_rec *r), (r), OK, DECLINED) -AP_IMPLEMENT_HOOK_RUN_FIRST(const char *,http_method, +AP_IMPLEMENT_HOOK_RUN_FIRST(const char *,http_scheme, (const request_rec *r), (r), NULL) AP_IMPLEMENT_HOOK_RUN_FIRST(unsigned short,default_port, (const request_rec *r), (r), 0) |