From c9cda0bb3ef00a4c8965a6ca4f3c0a0ba827c97a Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Tue, 23 Sep 2008 15:36:00 +0000
Subject: [PATCH]   * Added REQUEST_REQ address to message.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@3211 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_serf.c |  5 +++--
 src/mod_chxj.c  | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/chxj_serf.c b/src/chxj_serf.c
index 8d45a30b..423c12e4 100644
--- a/src/chxj_serf.c
+++ b/src/chxj_serf.c
@@ -135,6 +135,7 @@ s_handle_response(serf_request_t *UNUSED(request), serf_bucket_t *response, void
     if (SERF_BUCKET_READ_ERROR(rv)) {
       ctx->rv = rv;
       apr_atomic_dec32(&ctx->requests_outstanding);
+      DBG(ctx->r, "REQ[%X] end of s_handle_response() (ERROR)", (unsigned int)ctx->r);
       return rv;
     }
     if (APR_STATUS_IS_EAGAIN(rv)) {
@@ -198,12 +199,12 @@ s_handle_response(serf_request_t *UNUSED(request), serf_bucket_t *response, void
       }
       ctx->rv = APR_SUCCESS;
       apr_atomic_dec32(&ctx->requests_outstanding);
-      DBG(ctx->r, "end of s_handle_response()(NORMAL)");
+      DBG(ctx->r, "REQ[%X] end of s_handle_response()(NORMAL)", (unsigned int)ctx->r);
       return APR_EOF;
     }
 
     if (APR_STATUS_IS_EAGAIN(rv)) {
-      DBG(ctx->r, "end of s_handle_response() (EAGAIN)");
+      DBG(ctx->r, "REQ[%X] end of s_handle_response() (EAGAIN)", (unsigned int)ctx->r);
       return rv;
     }
   }
diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index df1540da..05cb7ffd 100644
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -312,7 +312,7 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
   mod_chxj_config     *dconf; 
   chxjconvrule_entry  *entryp;
 
-  DBG(r,"start of chxj_convert() input:[%.*s]", (int)*len, *src);
+  DBG(r,"REQ[%X] start of chxj_convert() input:[%.*s]", (unsigned int)r, (int)*len, *src);
   dst  = apr_pstrcat(r->pool, (char *)*src, NULL);
 
   dconf = chxj_get_module_config(r->per_dir_config, &chxj_module);
@@ -320,8 +320,10 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
 
   entryp = chxj_apply_convrule(r, dconf->convrules);
 
-  if (!entryp || !(entryp->action & CONVRULE_ENGINE_ON_BIT))
+  if (!entryp || !(entryp->action & CONVRULE_ENGINE_ON_BIT)) {
+    DBG(r,"REQ[%X] end of chxj_convert()", (unsigned int)r);
     return (char *)*src;
+  }
 
 
   /*------------------------------------------------------------------------*/
@@ -332,14 +334,14 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
   else
     user_agent = (char *)apr_table_get(r->headers_in, HTTP_USER_AGENT);
 
-  DBG(r,"User-Agent:[%s]", user_agent);
-  DBG(r,"content type is %s", r->content_type);
+  DBG(r,"REQ[%X] User-Agent:[%s]", (unsigned int)r, user_agent);
+  DBG(r,"REQ[%X] content type is %s", (unsigned int)r, r->content_type);
 
 
-  if (! STRNCASEEQ('t','T', "text/html", r->content_type, sizeof("text/html")-1)
-  &&  ! STRNCASEEQ('a','A', "application/xhtml+xml", r->content_type, sizeof("application/xhtml+xml")-1)) {
-    DBG(r,"no convert. content type is %s", r->content_type);
-    DBG(r,"end of chxj_convert()");
+  if (  ! STRNCASEEQ('t','T', "text/html", r->content_type, sizeof("text/html")-1)
+    &&  ! STRNCASEEQ('a','A', "application/xhtml+xml", r->content_type, sizeof("application/xhtml+xml")-1)) {
+    DBG(r,"REQ[%X] no convert. content type is %s", (unsigned int)r, r->content_type);
+    DBG(r,"REQ[%X] end of chxj_convert()", (unsigned int)r);
     return (char *)*src;
   }
 
@@ -408,7 +410,7 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
     *cookiep = cookie;
   }
 
-  DBG(r, "end of chxj_convert()");
+  DBG(r, "REQ[%X] end of chxj_convert()", (unsigned int)r);
 
   return dst;
 }
-- 
2.11.0