From c4d72b4f93440e225129aee2b79a9710e6cfb79c Mon Sep 17 00:00:00 2001 From: Atsushi Konno Date: Fri, 10 Apr 2009 21:08:34 +0900 Subject: [PATCH] * Changed Feature - Changed the target of Z2hOn option --- src/chxj_chtml20.c | 8 ++++++++ src/chxj_cookie.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c index eda7e42b..ea1c82ca 100644 --- a/src/chxj_chtml20.c +++ b/src/chxj_chtml20.c @@ -23,6 +23,7 @@ #include "chxj_encoding.h" #include "chxj_buffered_write.h" #include "chxj_header_inf.h" +#include "chxj_conv_z2h.h" #define GET_CHTML20(X) ((chtml20_t*)(X)) @@ -1676,6 +1677,9 @@ s_chtml20_start_input_tag(void *pdoc, Node *node) W_L("\""); } if (value && *value) { + apr_size_t value_len = strlen(value); + value = chxj_conv_z2h(r, value, &value_len, chtml20->entryp); + W_L(" value=\""); W_V(chxj_add_slash_to_doublequote(doc->pool, value)); W_L("\""); @@ -3123,6 +3127,7 @@ s_chtml20_text_tag(void *pdoc, Node *child) char one_byte[2]; int ii; int tdst_len; + apr_size_t z2h_input_len; chtml20 = GET_CHTML20(pdoc); doc = chtml20->doc; @@ -3171,6 +3176,9 @@ s_chtml20_text_tag(void *pdoc, Node *child) tdst = qs_out_apr_pstrcat(r, tdst, one_byte, &tdst_len); } } + z2h_input_len = strlen(tdst); + tdst = chxj_conv_z2h(r, tdst, &z2h_input_len, chtml20->entryp); + W_V(tdst); return chtml20->out; } diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c index 756f09cc..f212eeca 100644 --- a/src/chxj_cookie.c +++ b/src/chxj_cookie.c @@ -688,16 +688,16 @@ valid_domain(request_rec *r, const char *value) char *val; char *pstat; char *p = apr_pstrdup(r->pool, value); - const char *host = apr_table_get(r->headers_in, HTTP_HOST); + char *host = (char *)apr_table_get(r->headers_in, HTTP_HOST); DBG(r, "REQ[%X] start valid_domain() value:[%s]", TO_ADDR(r), value); - DBG(r, "REQ[%X] host:[%s]", TO_ADDR(r), host); - host = s_cut_until_end_hostname(r, host); - DBG(r, "REQ[%X] host:[%s](after s_cut_until_end_hostname())", TO_ADDR(r), host); if (!host) { DBG(r, "REQ[%X] end valid_domain() value:[%s]", TO_ADDR(r), value); return CHXJ_TRUE; } + DBG(r, "REQ[%X] host:[%s]", TO_ADDR(r), host); + host = s_cut_until_end_hostname(r, apr_pstrdup(r->pool, host)); + DBG(r, "REQ[%X] host:[%s](after s_cut_until_end_hostname())", TO_ADDR(r), host); name = apr_strtok(p,"=", &pstat); name = qs_trim_string(r->pool, name); -- 2.11.0