* Changed request_config

    - create user_agent and spec cache in request_config.

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index a681879..dfb9aae 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -364,6 +364,7 @@ struct mod_chxj_config {
 };
 
 struct mod_chxj_req_config_t {
+  char *user_agent;
   device_table *spec;
 };
 

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index 1bfcd33..668d02b 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -87,12 +87,13 @@ chxj_specified_device(request_rec *r, const char *user_agent)
    * Get per request config.
    */
   request_conf = (mod_chxj_req_config *)chxj_get_module_config(r->request_config, &chxj_module);
-  if (request_conf && request_conf->spec) {
+  if (request_conf && request_conf->spec && request_conf->user_agent && strcmp(request_conf->user_agent, user_agent) == 0) {
     DBG(r,"REQ[%x] Use spec cache.", (unsigned int)(apr_size_t)r);
     returnType = request_conf->spec;
     DBG(r,"REQ[%x] end %s() (Exist requestConf)", TO_ADDR(r),__func__);
     return returnType;
   }
+  request_conf->user_agent = user_agent;
 
   conf = chxj_get_module_config(r->per_dir_config, &chxj_module);
   if (! conf->devices) {

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index d6a76a7..2721656 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -197,11 +197,13 @@ chxj_headers_fixup(request_rec *r)
   if (! request_conf) {
     request_conf = apr_pcalloc(r->pool, sizeof(mod_chxj_req_config));
     request_conf->spec = NULL;
+    request_conf->user_agent = NULL;
     chxj_set_module_config(r->request_config, &chxj_module, request_conf);
   }
 
   /*
    * check and get mobile type.
+   * and request_conf->user_agent , request_conf->spec is set.
    */
   spec = chxj_specified_device(r, user_agent);