From 87b4a6dc7822d408864b95d46e5a0c1d5298c07c Mon Sep 17 00:00:00 2001 From: konn Date: Tue, 27 Jun 2006 18:49:30 +0000 Subject: [PATCH] * change writting. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1238 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_img_conv_format.c | 4 ++-- src/mod_chxj.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index 546149bc..07d6ca8f 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -316,10 +316,10 @@ chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len) else { entryp = chxj_apply_convrule(r, conf->convrules); if (entryp && entryp->user_agent) { - user_agent = (char*)apr_table_get(r->headers_in, "CHXJ_HTTP_USER_AGENT"); + user_agent = (char*)apr_table_get(r->headers_in, CHXJ_HTTP_USER_AGENT); } else { - user_agent = (char*)apr_table_get(r->headers_in, "User-Agent"); + user_agent = (char*)apr_table_get(r->headers_in, HTTP_USER_AGENT); } } diff --git a/src/mod_chxj.c b/src/mod_chxj.c index 4712bc00..686fbf5f 100644 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -183,30 +183,30 @@ chxj_headers_fixup(request_rec *r) static char* chxj_exchange(request_rec *r, const char** src, apr_size_t* len) { - char *user_agent; - char *dst = apr_pstrcat(r->pool, (char*)*src, NULL); - char *tmp; - mod_chxj_config* dconf; + char* user_agent; + char* dst; + char* tmp; + mod_chxj_config* dconf; chxjconvrule_entry* entryp; + dst = apr_pstrcat(r->pool, (char*)*src, NULL); + dconf = ap_get_module_config(r->per_dir_config, &chxj_module); + entryp = chxj_apply_convrule(r, dconf->convrules); - if (!(entryp->action & CONVRULE_ENGINE_ON_BIT)) { - DBG(r,"EngineOff"); + + if (!entryp || !(entryp->action & CONVRULE_ENGINE_ON_BIT)) return (char*)*src; - } /*------------------------------------------------------------------------*/ /* get UserAgent from http header */ /*------------------------------------------------------------------------*/ - if (entryp->user_agent) { + if (entryp->user_agent) user_agent = (char*)apr_table_get(r->headers_in, CHXJ_HTTP_USER_AGENT); - } - else { + else user_agent = (char*)apr_table_get(r->headers_in, HTTP_USER_AGENT); - } DBG1(r,"User-Agent:[%s]", user_agent); DBG(r, "start chxj_exchange()"); -- 2.11.0