Commit ca5747fb authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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/modules/ssl@123882 13f79535-47bb-0310-9956-ffa450edef68
parent 1dc7a6a8

mod_ssl.c

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ int ssl_init_ssl_connection(conn_rec *c) 
    return APR_SUCCESS;

}



static const char *ssl_hook_http_method(const request_rec *r)

static const char *ssl_hook_http_scheme(const request_rec *r)

{

    SSLSrvConfigRec *sc = mySrvConfig(r->server);
@@ -476,7 +476,7 @@ static void ssl_register_hooks(apr_pool_t *p) 
    ap_hook_pre_connection(ssl_hook_pre_connection,NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_test_config   (ssl_hook_ConfigTest,    NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_post_config   (ssl_init_Module,        NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_http_method   (ssl_hook_http_method,   NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_http_scheme   (ssl_hook_http_scheme,   NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_default_port  (ssl_hook_default_port,  NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_pre_config    (ssl_hook_pre_config,    NULL,NULL, APR_HOOK_MIDDLE);

    ap_hook_child_init    (ssl_init_Child,         NULL,NULL, APR_HOOK_MIDDLE);

ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, 
            if (strcEQ(var, "REQUEST_METHOD")) 

                result = r->method;

            else if (strcEQ(var, "REQUEST_SCHEME"))

                result = ap_http_method(r);

                result = ap_http_scheme(r);

            else if (strcEQ(var, "REQUEST_URI"))

                result = r->uri;

            else if (strcEQ(var, "REQUEST_FILENAME"))