svn commit: r290107 - in /httpd/httpd: branches/2.2.x/CHANGES branches/2.2.x/modules/cache/cache_storage.c trunk/CHANGES

[co...@apache.org]

Author: colm
Date: Mon Sep 19 03:45:03 2005
New Revision: 290107

URL: http://svn.apache.org/viewcvs?rev=290107&view=rev
Log:

Backport r239407 to the 2.2.x branch; Improve mod_disk_cache hit/miss ratio
by canonicalising the url key.


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c
    httpd/httpd/trunk/CHANGES

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=290107&r1=290106&r2=290107&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Sep 19 03:45:03 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.8
 
+  *) mod_disk_cache: Canonicalise the storage key, for improved hit/miss
+     ratio. [Colm MacCarthaigh]
+
   *) mod_cgid: Append .PID to the script socket filename and remove the
      script socket on exit. [Colm MacCarthaigh, Jim Jagielski]
 

Modified: httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c?rev=290107&r1=290106&r2=290107&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/cache_storage.c Mon Sep 19 03:45:03 2005
@@ -320,12 +320,82 @@
 apr_status_t cache_generate_key_default(request_rec *r, apr_pool_t* p,
                                         char**key)
 {
-    if (r->hostname) {
-        *key = apr_pstrcat(p, r->hostname, r->uri, "?", r->args, NULL);
+    char *port_str, *scheme, *hn;
+    const char * hostname;
+    int i;
+
+    /* Use the canonical name to improve cache hit rate, but only if this is
+     * not a proxy request. 
+     */ 
+    if (!r->proxyreq) {
+        /* Use _default_ as the hostname if none present, as in mod_vhost */
+        hostname =  ap_get_server_name(r);
+        if (!hostname) {
+            hostname = "_default_";
+        }
+    }
+    else if(r->parsed_uri.hostname) {
+        /* Copy the parsed uri hostname */
+        hn = apr_pcalloc(p, strlen(r->parsed_uri.hostname) + 1);
+        for (i = 0; r->parsed_uri.hostname[i]; i++) {
+            hn[i] = apr_tolower(r->parsed_uri.hostname[i]);
+        }
+        /* const work-around */
+        hostname = hn;
+    }
+    else {
+        /* We are a proxied request, with no hostname. Unlikely
+         * to get very far - but just in case */
+        hostname = "_default_";
+    }
+
+    /* Copy the scheme, ensuring that it is lower case. If the parsed uri
+     * contains no string or if this is not a proxy request.
+     */
+    if (r->proxyreq && r->parsed_uri.scheme) {
+        /* Copy the scheme */
+        scheme = apr_pcalloc(p, strlen(r->parsed_uri.scheme) + 1);
+        for (i = 0; r->parsed_uri.scheme[i]; i++) {
+            scheme[i] = apr_tolower(r->parsed_uri.scheme[i]);
+        }
     }
     else {
-        *key = apr_pstrcat(p, r->uri, "?", r->args, NULL);
+        scheme = "http";
     }
+
+    /* If the content is locally generated, use the port-number of the
+     * current server. Otherwise. copy the URI's port-string (which may be a
+     * service name). If the URI contains no port-string, use apr-util's
+     * notion of the default port for that scheme - if available.
+     */
+    if(r->proxyreq) {
+        if (r->parsed_uri.port_str) {
+            port_str = apr_pcalloc(p, strlen(r->parsed_uri.port_str) + 2);
+            port_str[0] = ':';
+            for (i = 0; r->parsed_uri.port_str[i]; i++) {
+                port_str[i + 1] = apr_tolower(r->parsed_uri.port_str[i]);
+            }
+        }
+        else if (apr_uri_port_of_scheme(scheme)) {
+            port_str = apr_psprintf(p, ":%u", apr_uri_port_of_scheme(scheme));
+        }
+        else {
+            /* No port string given in the AbsoluteUri, and we have no
+             * idea what the default port for the scheme is. Leave it
+             * blank and live with the inefficiency of some extra cached
+             * entities.
+             */
+            port_str = "";
+        }       
+    }       
+    else {
+        /* Use the server port */
+        port_str = apr_psprintf(p, ":%u", ap_get_server_port(r));
+    }
+
+    /* Key format is a URI */
+    *key = apr_pstrcat(p, scheme, "://", hostname, port_str,
+                       r->parsed_uri.path, "?", r->args, NULL);
+
     return APR_SUCCESS;
 }
-

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=290107&r1=290106&r2=290107&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Sep 19 03:45:03 2005
@@ -46,6 +46,9 @@
 
 Changes with Apache 2.1.8
 
+  *) mod_disk_cache: Canonicalise the storage key, for improved hit/miss
+     ratio. [Colm MacCarthaigh]
+
   *) mod_cgid: Append .PID to the script socket filename and remove the
      script socket on exit. [Colm MacCarthaigh, Jim Jagielski]