* Changed Z2hOn Features.

    - Changed convert target.

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 85390b0..40df637 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -24,6 +24,7 @@
 #include "chxj_buffered_write.h"
 #include "chxj_str_util.h"
 #include "chxj_header_inf.h"
+#include "chxj_conv_z2h.h"
 
 #define GET_CHTML10(X) ((chtml10_t *)(X))
 #undef W_L
@@ -2052,6 +2053,9 @@ s_chtml10_start_input_tag(void *pdoc, Node *node)
   }
 
   if (value && *value != 0) {
+    apr_size_t value_len = strlen(value);
+    value = chxj_conv_z2h(r, value, &value_len, chtml10->entryp);
+
     W_L(" value=\"");
     W_V(chxj_add_slash_to_doublequote(doc->pool, value));
     W_L("\"");
@@ -2993,6 +2997,7 @@ s_chtml10_text(void *pdoc, Node *child)
   chtml10_t   *chtml10;
   Doc         *doc;
   request_rec *r;
+  apr_size_t  z2h_input_len;
 
   chtml10 = GET_CHTML10(pdoc);
   doc     = chtml10->doc;
@@ -3045,6 +3050,9 @@ s_chtml10_text(void *pdoc, Node *child)
     }
   }
 
+  z2h_input_len = strlen(tdst);
+  tdst = chxj_conv_z2h(r, tdst, &z2h_input_len, chtml10->entryp);
+
   W_V(tdst);
   return chtml10->out;
 }

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index b4f1f22..6c7a112 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -247,7 +247,7 @@ chxj_headers_fixup(request_rec *r)
     break;
   
   default:
-    DBG(r, "REQ[%X] end chxj_headers_fixup() (not mobile) spec->device_name[%s]", (unsigned int)(apr_size_t)r, spec->device_name);
+    DBG(r, "REQ[%X] end chxj_headers_fixup() (not mobile) spec->device_name[%s] User-Agent:[%s]", (unsigned int)(apr_size_t)r, spec->device_name, user_agent);
     return DECLINED;
 
   }
@@ -455,7 +455,9 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
                                                                 cookie);
       }
       if (dst && *len) {
+#if 0 /* KONNO */
         dst = chxj_conv_z2h(r, dst, len, entryp);
+#endif
       }
     }
   }