* Fine-tuning.

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 56787e4..4c596be 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -2053,7 +2053,7 @@ s_chtml10_start_input_tag(void *pdoc, Node *node)
   }
 
   if (value && *value != 0) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, chtml10->entryp);
     }

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index aa3eef5..08a3eb3 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -1677,7 +1677,7 @@ s_chtml20_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, chtml20->entryp);
     }

diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c
index f6f2e0f..ec7a1a8 100644 (file)
--- a/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@ -1531,7 +1531,7 @@ s_chtml30_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, chtml30->entryp);
     }

diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c
index 528c78c..b772f94 100644 (file)
--- a/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@ -1537,7 +1537,7 @@ s_chtml40_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, chtml40->entryp);
     }

diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c
index 24c937e..23081d8 100644 (file)
--- a/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@ -1578,7 +1578,7 @@ s_chtml50_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, chtml50->entryp);
     }

diff --git a/src/chxj_encoding.c b/src/chxj_encoding.c
index a0daacb..5e68e81 100644 (file)
--- a/src/chxj_encoding.c
+++ b/src/chxj_encoding.c
@@ -347,7 +347,7 @@ chxj_encoding_parameter(request_rec *r, const char *value)
 
   int   use_amp_flag;
   
-  DBG(r, "start chxj_encoding_parameter()");
+  DBG(r, "REQ[%X] start chxj_encoding_parameter()", TO_ADDR(r));
 
   src = apr_pstrdup(r->pool, value);
 
@@ -402,7 +402,9 @@ chxj_encoding_parameter(request_rec *r, const char *value)
       if (klen != len) {
         key = chxj_encoding(r, key, &len);
       }
+#if 0  /* XXX:2009/4/10 */
       key = chxj_url_encode(r->pool, key);
+#endif
     }
     val = apr_strtok(pair, "=", &vstat);
     if (! val && sep_pos) {
@@ -415,7 +417,9 @@ chxj_encoding_parameter(request_rec *r, const char *value)
       if (vlen != len) {
         val = chxj_encoding(r, val, &len);
       }
+#if 0  /* XXX:2009/4/10 */
       val = chxj_url_encode(r->pool, val);
+#endif
       if (strlen(param) == 0) {
         param = apr_pstrcat(r->pool, param, key, "=", val, NULL);
       }
@@ -442,7 +446,7 @@ chxj_encoding_parameter(request_rec *r, const char *value)
       }
     }
   }
-  DBG(r, "end   chxj_encoding_parameter()");
+  DBG(r, "REQ[%X] end   chxj_encoding_parameter()", TO_ADDR(r));
 
   if (anchor_pos) {
     return apr_pstrcat(r->pool, src_sv, "?", param, "#", anchor, NULL);

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 85888d9..895a2b1 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1585,7 +1585,7 @@ s_jhtml_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, jhtml->entryp);
     }

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index a268079..e24efb3 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -1635,7 +1635,7 @@ s_jxhtml_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, jxhtml->entryp);
     }

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index b5d9fb5..f3096ee 100644 (file)
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -1532,7 +1532,7 @@ s_xhtml_1_0_start_input_tag(void *pdoc, Node *node)
     W_L("\"");
   }
   if (value && *value) {
-    if (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type)) {
+    if (type && (STRCASEEQ('s','S',"submit",type) || STRCASEEQ('r','R',"reset",type))) {
       apr_size_t value_len = strlen(value);
       value = chxj_conv_z2h(r, value, &value_len, xhtml->entryp);
     }

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index 6c7a112..a2a8100 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -68,7 +68,6 @@
 #endif
 #include "chxj_serf.h"
 #include "chxj_add_device_env.h"
-#include "chxj_conv_z2h.h"
 #include "chxj_header_inf.h"
 #include "chxj_jreserved_tag.h"
 
@@ -454,11 +453,6 @@ chxj_convert(request_rec *r, const char **src, apr_size_t *len, device_table *sp
                                                                 entryp, 
                                                                 cookie);
       }
-      if (dst && *len) {
-#if 0 /* KONNO */
-        dst = chxj_conv_z2h(r, dst, len, entryp);
-#endif
-      }
     }
   }
   ap_set_content_length(r, *len);