Commit ed3cea07 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files 

remove some unused variables and re-name cache_select_url() to simply 
cache_select()



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239420 13f79535-47bb-0310-9956-ffa450edef68
parent 8638c1a0

modules/cache/cache_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r, 
 * This function returns OK if successful, DECLINED if no

 * cached entity fits the bill.

 */

int cache_select_url(request_rec *r, char *url)

int cache_select(request_rec *r)

{

    cache_provider_list *list;

    apr_status_t rv;

modules/cache/mod_cache.c

+2 −6
Original line number Diff line number Diff line
@@ -51,10 +51,8 @@ static int cache_url_handler(request_rec *r, int lookup) 
    apr_status_t rv;

    const char *auth;

    apr_uri_t uri;

    char *url;

    char *path;

    cache_provider_list *providers;

    cache_info *info;

    cache_request_rec *cache;

    cache_server_conf *conf;

    apr_bucket_brigade *out;
@@ -65,9 +63,7 @@ static int cache_url_handler(request_rec *r, int lookup) 
    }



    uri = r->parsed_uri;

    url = r->unparsed_uri;

    path = uri.path;

    info = NULL;



    conf = (cache_server_conf *) ap_get_module_config(r->server->module_config,

                                                      &cache_module);
@@ -114,7 +110,7 @@ static int cache_url_handler(request_rec *r, int lookup) 
     *   add cache_out filter

     *   return OK

     */

    rv = cache_select_url(r, url);

    rv = cache_select(r);

    if (rv != OK) {

        if (rv == DECLINED) {

            if (!lookup) {
@@ -219,7 +215,7 @@ static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
     * restore the status into it's handle. */

    r->status = cache->handle->cache_obj->info.status;



    /* recall_headers() was called in cache_select_url() */

    /* recall_headers() was called in cache_select() */

    cache->provider->recall_body(cache->handle, r->pool, bb);



    /* This filter is done once it has served up its content */

modules/cache/mod_cache.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_hdrs_out(apr_pool_t *pool, 
 */

int cache_remove_url(cache_request_rec *cache, apr_pool_t *p);

int cache_create_entity(request_rec *r, char *url, apr_off_t size);

int cache_select_url(request_rec *r, char *url);

int cache_select(request_rec *r);

apr_status_t cache_generate_key_default( request_rec *r, apr_pool_t*p, char**key );

/**

 * create a key for the cache based on the request record

modules/cache/mod_disk_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info 
    }



    /* Parse the vary header and dump those fields from the headers_in. */

    /* FIXME: Make call to the same thing cache_select_url calls to crack Vary. */

    /* FIXME: Make call to the same thing cache_select calls to crack Vary. */

    if (r->headers_in) {

        apr_table_t *headers_in;