* Added debug dump.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4485 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/include/chxj_ixhtml10.h b/include/chxj_ixhtml10.h
index 5fe482d..b328860 100644 (file)
--- a/include/chxj_ixhtml10.h
+++ b/include/chxj_ixhtml10.h
@@ -52,6 +52,7 @@ struct ixhtml10_t {
   cookie_t            *cookie;
   css_stylesheet_t    *style;
   css_prop_list_stack_t *css_prop_stack;
+  int                 start_html_flag;
 };
 
 typedef struct _ixhtml10_flags_t ixhtml10_flags_t;

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index 1e30114..d2e6948 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -44,21 +44,25 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len)
 
   if (dconf == NULL) {
     DBG(r,"none encoding.");
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return (char*)src;
   }
   if ((int)*len < 0) {
     ERR(r, "runtime exception: chxj_encoding(): invalid string size.[%d]", (int)*len);
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return (char *)apr_pstrdup(r->pool, "");
   }
 
   entryp = chxj_apply_convrule(r, dconf->convrules);
   if (entryp->encoding == NULL) {
-    DBG(r,"none encoding.");
+    DBG(r,"REQ[%X] none encoding.", (unsigned int)(apr_size_t)r);
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return (char *)src;
   }
 
   if (STRCASEEQ('n','N',"none", entryp->encoding)) {
-    DBG(r,"none encoding.");
+    DBG(r,"REQ[%X] none encoding.", (unsigned int)(apr_size_t)r);
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return (char*)src;
   }
 
@@ -75,10 +79,10 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len)
   olen = ilen * 4 + 1;
   spos = obuf = apr_palloc(pool, olen);
   if (obuf == NULL) {
-    DBG(r,"end   chxj_encoding()");
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return ibuf;
   }
-  DBG(r,"encode convert [%s] -> [%s]", entryp->encoding, "CP932");
+  DBG(r,"REQ[%X] encode convert [%s] -> [%s]", (unsigned int)(apr_size_t)r, entryp->encoding, "CP932");
 
   memset(obuf, 0, olen);
   cd = iconv_open("CP932", entryp->encoding);
@@ -89,7 +93,7 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len)
     else {
       ERR(r, "iconv open failed. from:[%s] to:[%s] errno:[%d]", entryp->encoding, "CP932", errno);
     }
-    DBG(r,"end   chxj_encoding()");
+    DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
     return ibuf;
   }
   while (ilen > 0) {
@@ -110,7 +114,8 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len)
   *len = strlen(spos);
   iconv_close(cd);
 
-  DBG(r,"end   chxj_encoding() len=[%d] obuf=[%.*s]", (int)*len, (int)*len, spos);
+  chxj_dump_string(r, APLOG_MARK, "RESULT Convert Encoding", spos, *len);
+  DBG(r,"REQ[%X] end   chxj_encoding()", (unsigned int)(apr_size_t)r);
   return spos;
 }
 

diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c
index d218b5a..12ace66 100644 (file)
--- a/src/chxj_ixhtml10.c
+++ b/src/chxj_ixhtml10.c
@@ -631,6 +631,7 @@ s_ixhtml10_start_html_tag(void *pdoc, Node *UNUSED(node))
 
   DBG(r, "end s_ixhtml10_start_html_tag()");
 
+  ixhtml10->start_html_flag = 1;
   return ixhtml10->out;
 }
 
@@ -5308,7 +5309,9 @@ s_ixhtml10_newline_mark(void *pdoc, Node *UNUSED(node))
 {
   ixhtml10_t *ixhtml10 = GET_IXHTML10(pdoc);
   Doc *doc = ixhtml10->doc;
-  W_NLCODE();
+  if (ixhtml10->start_html_flag) {
+    W_NLCODE();
+  }
   return ixhtml10->out;
 }
 

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 73eaca0..0013b43 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -958,7 +958,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
        b = APR_BUCKET_NEXT(b)) {
 
     if (apr_bucket_read(b, &data, &len, APR_BLOCK_READ) == APR_SUCCESS) {
-      DBG(r, "REQ[%X] read data[%.*s]",(unsigned int)(apr_size_t)r, (int)len, data);
+      chxj_dump_string(r, APLOG_MARK, "READ Data", data, len);
 
       /*--------------------------------------------------------------------*/
       /* append data                                                        */