From a91f00373b5a716b6b3ac7839e0260d3903a6610 Mon Sep 17 00:00:00 2001 From: Atsushi Konno Date: Thu, 10 Mar 2011 17:55:18 +0900 Subject: [PATCH] * Changed DEBUG Log. - use TO_ADDR,__func__ macros --- include/chxj_specified_device.h | 1 - src/chxj_apply_convrule.c | 2 +- src/chxj_calc_ecc.c | 22 +-- src/chxj_chtml10.c | 26 ++-- src/chxj_chtml20.c | 20 ++- src/chxj_chtml30.c | 24 +-- src/chxj_chtml40.c | 23 ++- src/chxj_chtml50.c | 25 ++-- src/chxj_conv_z2h.c | 10 +- src/chxj_conv_z2h_num.c | 12 +- src/chxj_cookie.c | 317 +++++++++++++++++++++++----------------- src/chxj_css.c | 88 +++++------ src/chxj_dbm.c | 177 +++++++++++++--------- src/chxj_dump_string.c | 16 +- src/chxj_encoding.c | 120 +++++++-------- src/chxj_hdml.c | 54 +++---- src/chxj_header_inf.c | 8 +- src/chxj_img_conv_format.c | 265 +++++++++++++++++---------------- src/chxj_ixhtml10.c | 21 ++- src/chxj_jhtml.c | 38 ++--- src/chxj_jxhtml.c | 23 ++- src/chxj_memcache.c | 75 ++++++---- src/chxj_mysql.c | 231 +++++++++++++++++------------ src/chxj_qr_code.c | 138 +++++++++-------- src/chxj_serf.c | 50 ++++--- src/chxj_specified_device.c | 15 +- src/chxj_tag_util.c | 11 +- src/chxj_xhtml_mobile_1_0.c | 24 +-- src/mod_chxj.c | 23 +-- 29 files changed, 1000 insertions(+), 859 deletions(-) diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h index f7b90877..ca955cb7 100755 --- a/include/chxj_specified_device.h +++ b/include/chxj_specified_device.h @@ -132,6 +132,5 @@ extern converter_t convert_routine[]; extern device_table* chxj_specified_device( request_rec *r, const char *user_agent); -extern void chxj_specified_cleanup(request_rec *r); #endif diff --git a/src/chxj_apply_convrule.c b/src/chxj_apply_convrule.c index d435aa49..5028fe8e 100644 --- a/src/chxj_apply_convrule.c +++ b/src/chxj_apply_convrule.c @@ -48,7 +48,7 @@ s_apply_rule(request_rec *r, chxjconvrule_entry *pp) uri = r->uri; - DBG(r,"convert rule pattern=[%s] uri=[%s]", pp->pattern, uri); + DBG(r,"REQ[%X] convert rule pattern=[%s] uri=[%s]", TO_ADDR(r), pp->pattern, uri); rtn = ap_regexec((const ap_regex_t *)pp->regexp, uri, AP_MAX_REG_MATCH, (ap_regmatch_t *)regmatch, 0); if (rtn == 0) { diff --git a/src/chxj_calc_ecc.c b/src/chxj_calc_ecc.c index f08e4beb..83088902 100644 --- a/src/chxj_calc_ecc.c +++ b/src/chxj_calc_ecc.c @@ -947,7 +947,7 @@ chxj_calc_ecc(qr_code_t *qrcode, int exist_flag = 0; unsigned char** rs_block; #ifdef QR_CODE_DEBUG - DBG(r,"start chxj_calc_ecc()"); + DBG(r,"REQ[%X] start %s()", TO_ADDR(r),__func__); #endif rs_total_block_count = v_ecc_spec_table[qrcode->version*4+qrcode->level].rs[0].rs_block_count + @@ -977,7 +977,7 @@ chxj_calc_ecc(qr_code_t *qrcode, ecc_count = v_ecc_spec_table[qrcode->version*4+qrcode->level].rs[rs_pos].total_code_count - data_count; #ifdef QR_CODE_DEBUG - DBG(r,"data_count[%d] ecc_count[%d]", data_count, ecc_count); + DBG(r,"REQ[%X] data_count[%d] ecc_count[%d]", TO_ADDR(r),data_count, ecc_count); #endif rs_block[now_rs_num] = (unsigned char*)apr_palloc(qrcode->r->pool, data_count + ecc_count + 1); @@ -987,14 +987,14 @@ chxj_calc_ecc(qr_code_t *qrcode, rs_block_ecc_size[now_rs_num] = ecc_count; #ifdef QR_CODE_DEBUG - DBG(r,"apr_palloc() tmp"); + DBG(r,"REQ[%X] apr_palloc() tmp", TO_ADDR(r)); #endif memset(tmp, 0, data_count + ecc_count + 1); memset(rs_block[now_rs_num], 0, data_count + ecc_count + 1); #ifdef QR_CODE_DEBUG - DBG(r,"memset end"); + DBG(r,"REQ[%X] memset end", TO_ADDR(r)); #endif /* ¸µ¥Ç¡¼¥¿¤ò¥³¥Ô¡¼ */ @@ -1016,7 +1016,7 @@ chxj_calc_ecc(qr_code_t *qrcode, for (jj=ecc_count + data_count - 1; jj>=0; jj--) debug_rows = apr_pstrcat(r->pool, debug_rows, apr_psprintf(r->pool, "[%d]", tmp[jj]), NULL); - DBG(r,"rows [%s]", debug_rows); + DBG(r,"REQ[%X] rows [%s]", TO_ADDR(r), debug_rows); } while(0); /* for DEBUG END */ #endif @@ -1027,7 +1027,7 @@ chxj_calc_ecc(qr_code_t *qrcode, int tgt = tmp[ii--]; int shisu = v_galois_int_to_log[tgt]; #ifdef QR_CODE_DEBUG - DBG(r,"tgt[%d] shisu[%d]", tgt, shisu); + DBG(r,"REQ[%X] tgt[%d] shisu[%d]", TO_ADDR(r),tgt, shisu); #endif if (tgt == 0) continue; @@ -1046,7 +1046,7 @@ chxj_calc_ecc(qr_code_t *qrcode, for (jj=ecc_count + data_count - 1; jj>=0; jj--) debug_rows = apr_pstrcat(r->pool, debug_rows, apr_psprintf(r->pool, "[%d]", tmp[jj]), NULL); - DBG(r,"rows [%s]", debug_rows); + DBG(r,"REQ[%X] rows [%s]", TO_ADDR(r), debug_rows); } while(0); /* for DEBUG END */ #endif @@ -1062,13 +1062,13 @@ chxj_calc_ecc(qr_code_t *qrcode, #ifdef QR_CODE_DEBUG /* for DEBUG */ do { - DBG(r,"######### RS BLOCK DUMP ###############"); + DBG(r,"REQ[%X] ######### RS BLOCK DUMP ###############", TO_ADDR(r)); for (jj=0; jjpool, "%02d size:[%d] rest:[%d]",jj, rs_block_size[jj], rs_block_rest[jj]); for (ii=0; iipool, rows, apr_psprintf(r->pool, "[%d]", rs_block[jj][ii]), NULL); } - DBG(r,"%s", rows); + DBG(r,"REQ[%X] %s", TO_ADDR(r),rows); } } while(0); #endif @@ -1107,9 +1107,9 @@ chxj_calc_ecc(qr_code_t *qrcode, #ifdef QR_CODE_DEBUG /* for DEBUG */ do { - DBG(r,"######### AFTER BLOCK DUMP ###############"); + DBG(r,"REQ[%X] ######### AFTER BLOCK DUMP ###############",TO_ADDR(r)); for (ii=0; iicookie_id : ""); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r),(cookie) ? cookie->cookie_id : ""); /*--------------------------------------------------------------------------*/ /* If qrcode xml */ @@ -486,10 +487,10 @@ chxj_convert_chtml10( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -545,7 +546,8 @@ chxj_convert_chtml10( chxj_dump_out("[dst] CHTML -> CHTML1.0", dst, *dstlen); #endif - DBG(r, "end chxj_convert_chtml10() cookie_id=[%s] time=[%" APR_TIME_T_FMT "]", (cookie) ? cookie->cookie_id : "", apr_time_now() - t); + DBG(r,"REQ[%X] cookie_id=[%s] time=[%" APR_TIME_T_FMT "]", TO_ADDR(r), (cookie) ? cookie->cookie_id : "", apr_time_now() - t); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -606,7 +608,7 @@ s_chtml10_search_emoji(chtml10_t *chtml10, char *txt, char **rslt) r = chtml10->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } for (ee = chtml10->conf->emoji; @@ -614,7 +616,7 @@ s_chtml10_search_emoji(chtml10_t *chtml10, char *txt, char **rslt) ee = ee->next) { if (!ee->imode) { - DBG(r,"emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -648,7 +650,7 @@ chxj_chtml10_emoji_only_converter(request_rec *r, device_table *spec, const char chtml10 = &__chtml10; doc = &__doc; - DBG(r, "REQ[%X] start chxj_chtml10_emoji_only_converter()", (unsigned int)(apr_size_t)r); + DBG(r, "REQ[%X] start %s()", TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(chtml10, 0, sizeof(chtml10_t)); @@ -690,7 +692,7 @@ chxj_chtml10_emoji_only_converter(request_rec *r, device_table *spec, const char chtml10->out = chxj_buffered_write_flush(chtml10->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_chtml10_emoji_only_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return chtml10->out; } @@ -3964,9 +3966,9 @@ s_chtml10_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); chtml10->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml10->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r), href); } return chtml10->out; @@ -4012,9 +4014,9 @@ s_chtml10_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); chtml10->style = chxj_css_parse_style_value(doc, chtml10->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return chtml10->out; diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c index 9fb855c3..f40d8e9a 100644 --- a/src/chxj_chtml20.c +++ b/src/chxj_chtml20.c @@ -535,16 +535,14 @@ chxj_convert_chtml20( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ /*--------------------------------------------------------------------------*/ s_init_chtml20(&chtml20, &doc, r, spec); - DBG(r,"init end"); chtml20.entryp = entryp; chtml20.cookie = cookie; @@ -652,14 +650,14 @@ s_chtml20_search_emoji(chtml20_t *chtml20, char *txt, char **rslt, Node *node) r = chtml20->doc->r; if (spec == NULL) - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); for (ee = chtml20->conf->emoji; ee; ee = ee->next) { if (ee->imode == NULL) { - DBG(r,"emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -710,7 +708,7 @@ chxj_chtml20_emoji_only_converter(request_rec *r, device_table *spec, const char chtml20 = &__chtml20; doc = &__doc; - DBG(r, "REQ[%X] start chxj_chtml20_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(chtml20, 0, sizeof(chtml20_t)); @@ -751,7 +749,7 @@ chxj_chtml20_emoji_only_converter(request_rec *r, device_table *spec, const char } chtml20->out = chxj_buffered_write_flush(chtml20->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_chtml20_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return chtml20->out; } @@ -4939,9 +4937,9 @@ s_chtml20_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); chtml20->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml20->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return chtml20->out; @@ -5230,9 +5228,9 @@ s_chtml20_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); chtml20->style = chxj_css_parse_style_value(doc, chtml20->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return chtml20->out; diff --git a/src/chxj_chtml30.c b/src/chxj_chtml30.c index 668ff06e..4b346044 100644 --- a/src/chxj_chtml30.c +++ b/src/chxj_chtml30.c @@ -529,7 +529,7 @@ chxj_convert_chtml30( chtml30_t chtml30; Doc doc; - DBG(r, "start chxj_convert_chtml30()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /*--------------------------------------------------------------------------*/ /* If qrcode xml */ @@ -537,8 +537,8 @@ chxj_convert_chtml30( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); - DBG(r, "end chxj_convert_chtml30()"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } DBG(r,"not found qrcode xml"); @@ -598,7 +598,7 @@ chxj_convert_chtml30( chxj_dump_out("[src] CHTML -> CHTML3.0", dst, *dstlen); #endif - DBG(r, "end chxj_convert_chtml30()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -654,14 +654,14 @@ s_chtml30_search_emoji(chtml30_t *chtml30, char *txt, char **rslt, Node *node) r = chtml30->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL", TO_ADDR(r)); } for (ee = chtml30->conf->emoji; ee; ee = ee->next) { if (ee->imode == NULL) { - DBG(r, "emoji->imode is NULL"); + DBG(r, "REQ[%X] emoji->imode is NULL", TO_ADDR(r)); continue; } @@ -716,7 +716,7 @@ chxj_chtml30_emoji_only_converter(request_rec *r, device_table *spec, const char chtml30 = &__chtml30; doc = &__doc; - DBG(r, "REQ[%X] start chxj_chtml30_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(chtml30, 0, sizeof(chtml30_t)); @@ -757,7 +757,7 @@ chxj_chtml30_emoji_only_converter(request_rec *r, device_table *spec, const char } chtml30->out = chxj_buffered_write_flush(chtml30->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_chtml30_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return chtml30->out; } @@ -4594,9 +4594,9 @@ s_chtml30_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); chtml30->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml30->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return chtml30->out; @@ -4888,9 +4888,9 @@ s_chtml30_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); chtml30->style = chxj_css_parse_style_value(doc, chtml30->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return chtml30->out; diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c index 619b176c..03aab337 100644 --- a/src/chxj_chtml40.c +++ b/src/chxj_chtml40.c @@ -472,7 +472,7 @@ chxj_convert_chtml40( chtml40_t chtml40; Doc doc; - DBG(r, "start chxj_convert_chtml40()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /*--------------------------------------------------------------------------*/ /* If qrcode xml */ @@ -480,11 +480,10 @@ chxj_convert_chtml40( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); - DBG(r, "end chxj_convert_chtml40()"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -541,7 +540,7 @@ chxj_convert_chtml40( chxj_dump_out("[src] CHTML -> CHTML4.0", dst, *dstlen); #endif - DBG(r, "end chxj_convert_chtml40()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -597,7 +596,7 @@ s_chtml40_search_emoji(chtml40_t *chtml40, char *txt, char **rslt, Node *node) r = chtml40->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } for (ee = chtml40->conf->emoji; @@ -657,7 +656,7 @@ chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char chtml40 = &__chtml40; doc = &__doc; - DBG(r, "REQ[%X] start chxj_chtml40_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(chtml40, 0, sizeof(chtml40_t)); @@ -698,7 +697,7 @@ chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char } chtml40->out = chxj_buffered_write_flush(chtml40->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_chtml40_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return chtml40->out; } @@ -4836,9 +4835,9 @@ s_chtml40_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); chtml40->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml40->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return chtml40->out; @@ -5128,9 +5127,9 @@ s_chtml40_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); chtml40->style = chxj_css_parse_style_value(doc, chtml40->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return chtml40->out; diff --git a/src/chxj_chtml50.c b/src/chxj_chtml50.c index fe6be346..45e0adf9 100644 --- a/src/chxj_chtml50.c +++ b/src/chxj_chtml50.c @@ -452,7 +452,7 @@ chxj_convert_chtml50( chtml50_t chtml50; Doc doc; - DBG(r, "start chxj_convert_chtml50()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /*--------------------------------------------------------------------------*/ /* If qrcode xml */ @@ -460,11 +460,10 @@ chxj_convert_chtml50( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); - DBG(r, "end chxj_convert_chtml50()"); + DBG(r,"REQ[%X] i found qrcode xml",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -521,7 +520,7 @@ chxj_convert_chtml50( chxj_dump_out("[src] CHTML -> CHTML4.0", dst, *dstlen); #endif - DBG(r, "end chxj_convert_chtml50()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -577,14 +576,14 @@ s_chtml50_search_emoji(chtml50_t *chtml50, char *txt, char **rslt, Node *node) r = chtml50->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } for (ee = chtml50->conf->emoji; ee; ee = ee->next) { if (ee->imode == NULL) { - DBG(r, "emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -637,7 +636,7 @@ chxj_chtml50_emoji_only_converter(request_rec *r, device_table *spec, const char chtml50 = &__chtml50; doc = &__doc; - DBG(r, "REQ[%X] start chxj_chtml50_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(chtml50, 0, sizeof(chtml50_t)); @@ -678,7 +677,7 @@ chxj_chtml50_emoji_only_converter(request_rec *r, device_table *spec, const char } chtml50->out = chxj_buffered_write_flush(chtml50->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_chtml50_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return chtml50->out; } @@ -5286,9 +5285,9 @@ s_chtml50_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); chtml50->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml50->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return chtml50->out; @@ -5615,9 +5614,9 @@ s_chtml50_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]",TO_ADDR(doc->r), value); chtml50->style = chxj_css_parse_style_value(doc, chtml50->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r,"REQ[%X] end load CSS. value:[%s]",TO_ADDR(doc->r), value); } } return chtml50->out; diff --git a/src/chxj_conv_z2h.c b/src/chxj_conv_z2h.c index d6364d20..cc3c8b5d 100644 --- a/src/chxj_conv_z2h.c +++ b/src/chxj_conv_z2h.c @@ -200,7 +200,7 @@ chxj_conv_z2h(request_rec *r, const char *src, apr_size_t *len, chxjconvrule_ent int z2h_alpha_flag = 0; int z2h_num_flag = 0; - DBG(r,"REQ[%X] start chxj_conv_z2h()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (entryp->action & CONVRULE_Z2H_ON_BIT) { z2h_kana_flag = 1; @@ -221,8 +221,8 @@ chxj_conv_z2h(request_rec *r, const char *src, apr_size_t *len, chxjconvrule_ent z2h_num_flag = 0; } if (z2h_kana_flag == 0 && z2h_alpha_flag == 0 && z2h_num_flag == 0) { - DBG(r, "REQ[%X] No Z2h flag.", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_conv_z2h()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] No Z2h flag.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)src; } @@ -234,7 +234,7 @@ chxj_conv_z2h(request_rec *r, const char *src, apr_size_t *len, chxjconvrule_ent obuf = apr_palloc(pool, ilen + 1); if (! obuf) { ERR(r,"%s:%d REQ[%X] memory allocation error", __FILE__,__LINE__,(unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_conv_z2h()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } @@ -358,7 +358,7 @@ chxj_conv_z2h(request_rec *r, const char *src, apr_size_t *len, chxjconvrule_ent } *len = olen; - DBG(r,"REQ[%X] end chxj_conv_z2h_kana()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return obuf; } /* diff --git a/src/chxj_conv_z2h_num.c b/src/chxj_conv_z2h_num.c index ab943243..9507f265 100644 --- a/src/chxj_conv_z2h_num.c +++ b/src/chxj_conv_z2h_num.c @@ -31,16 +31,16 @@ chxj_conv_z2h_num(request_rec *r, const char *src, apr_size_t *len, chxjconvrule char *obuf; apr_size_t olen; - DBG(r,"REQ[%X] start chxj_conv_z2h_num()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (entryp->action & CONVRULE_Z2H_NUM_OFF_BIT) { - DBG(r,"REQ[%X] Detect Z2hNumOff", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_conv_z2h_num()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] Detect Z2hNumOff", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)src; } if (! (entryp->action & CONVRULE_Z2H_NUM_ON_BIT)) { - DBG(r,"REQ[%X] Detect Z2hNumOff", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_conv_z2h_num()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] Detect Z2hNumOff", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)src; } @@ -83,7 +83,7 @@ chxj_conv_z2h_num(request_rec *r, const char *src, apr_size_t *len, chxjconvrule } *len = olen; - DBG(r,"REQ[%X] end chxj_conv_z2h_num()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return obuf; } /* diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c index 029a9092..e90c79f0 100644 --- a/src/chxj_cookie.c +++ b/src/chxj_cookie.c @@ -92,11 +92,11 @@ alloc_cookie_id(request_rec *r) memset(cookie_id, 0, APR_MD5_DIGESTSIZE+1); apr_base64_encode(cookie_id, (char*)md5_value, APR_MD5_DIGESTSIZE); - DBG(r, "cookie_id=[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r),cookie_id); cookie_id = chxj_url_encode(r->pool,cookie_id); - DBG(r, "cookie_id=[%s]", cookie_id); + DBG(r, "REQ[%X] cookie_id=[%s]", TO_ADDR(r),cookie_id); return cookie_id; } @@ -126,7 +126,7 @@ chxj_save_cookie(request_rec *r) apr_pool_t *pool; - DBG(r, "start chxj_save_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_pool_create(&pool, r->pool); @@ -139,11 +139,11 @@ chxj_save_cookie(request_rec *r) dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); entryp = chxj_apply_convrule(r, dconf->convrules); if (! entryp) { - DBG(r, "end chxj_save_cookie() no pattern"); + DBG(r,"REQ[%X] end %s() no pattern",TO_ADDR(r),__func__); return NULL; } if (! (entryp->action & CONVRULE_COOKIE_ON_BIT) && ! (entryp->action & CONVRULE_COOKIE_ONLY_BIT)) { - DBG(r, "end chxj_save_cookie() CookieOff"); + DBG(r,"REQ[%X] end %s() CookieOff",TO_ADDR(r),__func__); return NULL; } @@ -217,7 +217,7 @@ chxj_save_cookie(request_rec *r) refer_string = apr_pstrcat(pool, refer_string, "?", r->args, NULL); } apr_table_setn(new_cookie_table, REFERER_COOKIE_KEY, refer_string); - DBG(r, "ADD REFER[%s]", refer_string); + DBG(r, "REQ[%X] ADD REFER[%s]", TO_ADDR(r),refer_string); has_cookie++; } @@ -245,7 +245,7 @@ chxj_save_cookie(request_rec *r) if (! has_cookie) { - DBG(r, "REQ[%X] end chxj_save_cookie() (no cookie)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s() (no cookie)",TO_ADDR(r),__func__); return NULL; } @@ -273,28 +273,28 @@ chxj_save_cookie(request_rec *r) } if (old_cookie_id && IS_COOKIE_LAZY(dconf)) { - DBG(r, "REQ[%X] LAZY COOKIE save",(unsigned int)(apr_size_t)r); + DBG(r, "REQ[%X] LAZY COOKIE save",TO_ADDR(r)); cookie->cookie_id = apr_pstrdup(r->pool, old_cookie_id); } else if (old_cookie_id && apr_table_get(r->headers_in, "X-Chxj-Cookie-No-Update")) { - DBG(r, "REQ[%X] NO UPDATE MODE",(unsigned int)(apr_size_t)r); + DBG(r, "REQ[%X] NO UPDATE MODE",TO_ADDR(r)); cookie->cookie_id = apr_pstrdup(r->pool, old_cookie_id); } else { if (old_cookie_id && apr_table_get(r->headers_in, "X-Chxj-Forward")) { - DBG(r, "REQ[%X] NO LAZY COOKIE(X-Chxj-Forward) save",(unsigned int)(apr_size_t)r); + DBG(r, "REQ[%X] NO LAZY COOKIE(X-Chxj-Forward) save",TO_ADDR(r)); cookie->cookie_id = apr_pstrdup(r->pool, old_cookie_id); } else { - DBG(r, "REQ[%X] NO LAZY COOKIE save",(unsigned int)(apr_size_t)r); + DBG(r, "REQ[%X] NO LAZY COOKIE save",TO_ADDR(r)); cookie->cookie_id = alloc_cookie_id(r); } } - DBG(r, "REQ[%X] TYPE:[%d]", (unsigned int)(apr_size_t)r, dconf->cookie_store_type); - DBG(r, "REQ[%X] STORE STRING:=======================================================", TO_ADDR(r)); - DBG(r, "REQ[%X] [%s]", TO_ADDR(r), store_string); - DBG(r, "REQ[%X] =======================================================:STORE STRING", TO_ADDR(r)); + DBG(r,"REQ[%X] TYPE:[%d]", TO_ADDR(r), dconf->cookie_store_type); + DBG(r,"REQ[%X] STORE STRING:=======================================================", TO_ADDR(r)); + DBG(r,"REQ[%X] [%s]", TO_ADDR(r), store_string); + DBG(r,"REQ[%X] =======================================================:STORE STRING", TO_ADDR(r)); { int done_proc = 0; @@ -334,7 +334,7 @@ chxj_save_cookie(request_rec *r) } on_error: - DBG(r, "end chxj_save_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return cookie; } @@ -355,9 +355,10 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) cookie_t *cookie; - DBG(r, "start chxj_update_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (!old_cookie || ! old_cookie->cookie_headers || ! old_cookie->cookie_id) { - DBG(r, "end chxj_update_cookie() (old_cookie is null)"); + DBG(r,"REQ[%X] old_cookie is null",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -367,11 +368,13 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); entryp = chxj_apply_convrule(r, dconf->convrules); if (! entryp) { - DBG(r, "end chxj_update_cookie() no pattern"); + DBG(r,"REQ[%X] no pattern",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } if (! (entryp->action & CONVRULE_COOKIE_ON_BIT)) { - DBG(r, "end chxj_update_cookie() CookieOff"); + DBG(r,"REQ[%X] CookieOff",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -382,11 +385,11 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) chxj_delete_cookie_expire(r, old_cookie->cookie_id); if (IS_COOKIE_LAZY(dconf)) { - DBG(r, "LAZY MODE"); + DBG(r,"REQ[%X] LAZY MODE",TO_ADDR(r)); cookie->cookie_id = apr_pstrdup(r->pool, old_cookie->cookie_id); } else { - DBG(r, "NO LAZY MODE"); + DBG(r,"REQ[%X] NO LAZY MODE",TO_ADDR(r)); cookie->cookie_id = alloc_cookie_id(r); } @@ -401,7 +404,7 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) "\n", NULL); - DBG(r, "OLD COOKIE VALUE=[%s][%s]", hentryp[ii].key, hentryp[ii].val); + DBG(r,"REQ[%X] OLD COOKIE VALUE=[%s][%s]",TO_ADDR(r), hentryp[ii].key, hentryp[ii].val); store_string = apr_pstrcat(r->pool, store_string, hentryp[ii].key, @@ -415,7 +418,7 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (!chxj_update_cookie_mysql(r, dconf, cookie->cookie_id, store_string)) { - ERR(r, "failed: chxj_update_cookie_mysql() cookie_id:[%s]", cookie->cookie_id); + ERR(r,"REQ[%X] failed: chxj_update_cookie_mysql() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); goto on_error; } done_proc = 1; @@ -425,7 +428,7 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_update_cookie_memcache(r, dconf, cookie->cookie_id, store_string)) { - ERR(r, "failed: chxj_update_cookie_memcache() cookie_id:[%s]", cookie->cookie_id); + ERR(r, "REQ[%X] failed: chxj_update_cookie_memcache() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); goto on_error; } done_proc = 1; @@ -433,7 +436,7 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) #endif if (!done_proc || IS_COOKIE_STORE_DBM(dconf->cookie_store_type)) { if (! chxj_update_cookie_dbm(r, dconf, cookie->cookie_id, store_string)) { - ERR(r, "failed: chxj_update_cookie_dbm() cookie_id:[%s]", cookie->cookie_id); + ERR(r, "REQ[%X] failed: chxj_update_cookie_dbm() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); goto on_error; } } @@ -445,7 +448,7 @@ chxj_update_cookie(request_rec *r, cookie_t *old_cookie) on_error: - DBG(r, "end chxj_update_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return cookie; } @@ -468,7 +471,8 @@ chxj_load_cookie(request_rec *r, char *cookie_id) char *pair; char *header_cookie; - DBG(r, "REQ[%X] start chxj_load_cookie() cookie_id=[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r), cookie_id); chxj_cookie_expire_gc(r); cookie = (cookie_t*)apr_palloc(r->pool, sizeof(cookie_t)); @@ -480,11 +484,13 @@ chxj_load_cookie(request_rec *r, char *cookie_id) dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); entryp = chxj_apply_convrule(r, dconf->convrules); if (! entryp) { - DBG(r, "REQ[%X] end chxj_load_cookie() no pattern", TO_ADDR(r)); + DBG(r,"REQ[%X] pattern", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); goto on_error0; } if (! (entryp->action & CONVRULE_COOKIE_ON_BIT) && ! (entryp->action & CONVRULE_COOKIE_ONLY_BIT)) { - DBG(r, "REQ[%X] end chxj_load_cookie() CookieOff", TO_ADDR(r)); + DBG(r,"REQ[%X] CookieOff", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); goto on_error0; } load_cookie_table = apr_table_make(r->pool, 0); @@ -494,7 +500,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! (load_string = chxj_load_cookie_mysql(r, dconf, cookie->cookie_id))) { - ERR(r, "%s:%d failed: chxj_load_cookie_mysql() cookie_id:[%s]", APLOG_MARK, cookie_id); + ERR(r, "REQ[%X] %s:%d failed: chxj_load_cookie_mysql() cookie_id:[%s]", TO_ADDR(r),APLOG_MARK, cookie_id); goto on_error0; } done_proc = 1; @@ -503,7 +509,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! (load_string = chxj_load_cookie_memcache(r, dconf, cookie->cookie_id))) { - ERR(r, "%s:%d failed: chxj_load_cookie_memcache() cookie_id:[%s]", APLOG_MARK,cookie_id); + ERR(r, "REQ[%X] %s:%d failed: chxj_load_cookie_memcache() cookie_id:[%s]", TO_ADDR(r),APLOG_MARK,cookie_id); goto on_error0; } done_proc = 1; @@ -511,7 +517,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) #endif if (!done_proc || IS_COOKIE_STORE_DBM(dconf->cookie_store_type)) { if (! (load_string = chxj_load_cookie_dbm(r, dconf, cookie->cookie_id))) { - ERR(r, "%s:%d failed: chxj_load_cookie_dbm() cookie_id:[%s]", APLOG_MARK,cookie_id); + ERR(r, "REQ[%X] %s:%d failed: chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r),APLOG_MARK,cookie_id); goto on_error0; } } @@ -528,7 +534,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) load_string = NULL; if (!pair) break; - DBG(r, "REQ[%X] Cookie:[%s]", TO_ADDR(r), pair); + DBG(r,"REQ[%X] Cookie:[%s]", TO_ADDR(r), pair); tmp_pair = apr_pstrdup(r->pool, pair); val = strchr(tmp_pair, '='); @@ -536,7 +542,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) key = tmp_pair; *val++ = 0; apr_table_add(load_cookie_table, key, val); - DBG(r, "REQ[%X] ADD key:[%s] val:[%s]", TO_ADDR(r), key, val); + DBG(r,"REQ[%X] ADD key:[%s] val:[%s]", TO_ADDR(r), key, val); } tmp_pair = apr_pstrdup(r->pool, pair); tmp_sem = strchr(tmp_pair, ';'); @@ -551,7 +557,7 @@ chxj_load_cookie(request_rec *r, char *cookie_id) } } if (strlen(header_cookie)) { - DBG(r, "REQ[%X] ADD COOKIE to REQUEST HEADER:[%s]", TO_ADDR(r), header_cookie); + DBG(r,"REQ[%X] ADD COOKIE to REQUEST HEADER:[%s]", TO_ADDR(r), header_cookie); apr_table_add(r->headers_in, "Cookie", header_cookie); } @@ -569,13 +575,13 @@ chxj_load_cookie(request_rec *r, char *cookie_id) apr_table_setn(r->headers_in, "CHXJ_COOKIE_ID", cookie->cookie_id); } - DBG(r, "REQ[%X] end chxj_load_cookie()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return cookie; on_error0: - DBG(r, "REQ[%X] end chxj_load_cookie()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -591,7 +597,8 @@ check_valid_cookie_attribute(request_rec *r, const char *value) char *secure_pair; char *p; - DBG(r, "start check_valid_cookie_attribute() value:[%s]", value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r),value); domain_pair = path_pair = expire_pair = secure_pair = NULL; p = apr_pstrdup(r->pool, value); @@ -619,29 +626,34 @@ check_valid_cookie_attribute(request_rec *r, const char *value) if (domain_pair) { if (!valid_domain(r, domain_pair)) { - DBG(r, "invalid domain. domain_pair:[%s]", domain_pair); + DBG(r,"REQ[%X] invalid domain. domain_pair:[%s]", TO_ADDR(r),domain_pair); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } if (path_pair) { if (!valid_path(r, path_pair)) { - DBG(r, "invalid path. path_pair:[%s]", path_pair); + DBG(r,"REQ[%X] invalid path. path_pair:[%s]", TO_ADDR(r),path_pair); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } if (expire_pair) { if (!valid_expires(r, expire_pair)) { - DBG(r, "invalid expire. expire_pair:[%s]", expire_pair); + DBG(r,"REQ[%X] invalid expire. expire_pair:[%s]", TO_ADDR(r),expire_pair); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } if (secure_pair) { if (!valid_secure(r, secure_pair)) { - DBG(r, "invalid secure. secure_pair:[%s]", secure_pair); + DBG(r,"REQ[%X] invalid secure. secure_pair:[%s]", TO_ADDR(r),secure_pair); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } - DBG(r, "end check_valid_cookie_attribute() value:[%s]", value); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r),value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -655,7 +667,8 @@ check_valid_cookie_attribute_expires_only(request_rec *r, const char *value) char *expire_pair = NULL; char *p; - DBG(r, "REQ[%X] start check_valid_cookie_attribute_expires_only() value:[%s]", (unsigned int)(apr_size_t)r, value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r), value); expire_pair = NULL; p = apr_pstrdup(r->pool, value); @@ -674,11 +687,13 @@ check_valid_cookie_attribute_expires_only(request_rec *r, const char *value) if (expire_pair) { if (!valid_expires(r, expire_pair)) { - DBG(r, "REQ[%X] invalid expire. expire_pair:[%s]", (unsigned int)(apr_size_t)r, expire_pair); + DBG(r,"REQ[%X] invalid expire. expire_pair:[%s]", TO_ADDR(r), expire_pair); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } - DBG(r, "REQ[%X] end check_valid_cookie_attribute_expires_only() value:[%s]", (unsigned int)(apr_size_t)r, value); + DBG(r,"REQ[%X] value:[%s]",TO_ADDR(r), value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -693,9 +708,11 @@ valid_domain(request_rec *r, const char *value) char *p = apr_pstrdup(r->pool, value); 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] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r), value); if (!host) { - DBG(r, "REQ[%X] end valid_domain() value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } DBG(r, "REQ[%X] host:[%s]", TO_ADDR(r), host); @@ -709,12 +726,14 @@ valid_domain(request_rec *r, const char *value) len = strlen(host); if (len) { if (chxj_strcasenrcmp(r->pool, host, val, strlen(val))) { - DBG(r, "REQ[%X] not match domain. host domain:[%s] vs value:[%s]", TO_ADDR(r), host, val); - DBG(r, "REQ[%X] end valid_domain() value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] not match domain. host domain:[%s] vs value:[%s]", TO_ADDR(r), host, val); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } - DBG(r, "REQ[%X] end valid_domain() value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -729,7 +748,8 @@ valid_path(request_rec *r, const char *value) char *val; char *pstat; - DBG(r, "start valid_path() unparsed_uri:[%s] value:[%s]", r->unparsed_uri, value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] unparsed_uri:[%s] value:[%s]", TO_ADDR(r),r->unparsed_uri, value); if (chxj_starts_with(r->unparsed_uri, "http://")) { uri = strchr(&r->unparsed_uri[sizeof("http://")], '/'); if (uri != NULL) { @@ -752,19 +772,21 @@ valid_path(request_rec *r, const char *value) if ((tmp = strchr(uri, '?'))) { *tmp = '\0'; } - DBG(r, "uri=[%s]", uri); + DBG(r,"REQ[%X] uri=[%s]", TO_ADDR(r),uri); name = apr_strtok(p, "=", &pstat); val = apr_strtok(NULL, "=", &pstat); name = qs_trim_string(r->pool, name); val = qs_trim_string(r->pool, val); - DBG(r, "name=[%s] val=[%s]", name, val); + DBG(r,"REQ[%X] name=[%s] val=[%s]", TO_ADDR(r),name, val); - DBG(r, "val:[%s] vs uri:[%s]", val, uri); + DBG(r, "REQ[%X] val:[%s] vs uri:[%s]", TO_ADDR(r),val, uri); if (! chxj_starts_with(uri, val)) { - DBG(r, "end valid_path() unparsed_uri:[%s] value:[%s] (false)", r->unparsed_uri, value); + DBG(r,"REQ[%X] unparsed_uri:[%s] value:[%s] (false)",TO_ADDR(r), r->unparsed_uri, value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } - DBG(r, "end valid_path() unparsed_uri:[%s] value:[%s] (true)", r->unparsed_uri, value); + DBG(r,"REQ[%X] unparsed_uri:[%s] value:[%s] (true)", TO_ADDR(r),r->unparsed_uri, value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -779,18 +801,21 @@ valid_expires(request_rec *r, const char *value) apr_time_t expires; apr_time_t now; - DBG(r, "start valid_expire() value:[%s]", value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] value:[%s]",TO_ADDR(r),value); name = apr_strtok(p, "=", &pstat); val = apr_strtok(NULL, "=", &pstat); - DBG(r, "name=[%s] val=[%s]", name, val); + DBG(r,"REQ[%X] name=[%s] val=[%s]", TO_ADDR(r),name, val); now = apr_time_now(); expires = chxj_parse_cookie_expires(val); if (expires < now) { - DBG(r, "end valid_expire() value:[%s] (expired)", value); + DBG(r,"REQ[%X] value:[%s] (expired)", TO_ADDR(r),value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } - DBG(r, "end valid_expire() value:[%s] (non expired)", value); + DBG(r,"REQ[%X] value:[%s] (non expired)", TO_ADDR(r),value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -799,13 +824,16 @@ static int valid_secure(request_rec *r, const char *value) { const char *scheme; - DBG(r, "start valid_secure() value:[%s]", value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] value:[%s]", TO_ADDR(r),value); scheme = chxj_apache_run_http_scheme(r); if (strcasecmp("https", scheme)) { - DBG(r, "end valid_secure() value:[%s] (non secure)", value); + DBG(r,"REQ[%X] value:[%s] (non secure)", TO_ADDR(r),value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } - DBG(r, "end valid_secure() value:[%s] (secure)", value); + DBG(r,"REQ[%X] value:[%s] (secure)", TO_ADDR(r),value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -817,7 +845,8 @@ chxj_add_cookie_parameter(request_rec *r, char *value, cookie_t *cookie) char *dst; char *name = ""; - DBG(r, "REQ[%X] start chxj_add_cookie_parameter() cookie_id=[%s]", TO_ADDR(r), (cookie) ? cookie->cookie_id : NULL); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r), (cookie) ? cookie->cookie_id : NULL); dst = apr_pstrdup(r->pool, value); @@ -828,7 +857,8 @@ chxj_add_cookie_parameter(request_rec *r, char *value, cookie_t *cookie) goto on_error; if (chxj_cookie_check_host(r, value) != 0) { - DBG(r, "REQ[%X] end chxj_add_cookie_parameter()(check host)", TO_ADDR(r)); + DBG(r,"REQ[%X] (check host)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); goto on_error; } @@ -855,12 +885,14 @@ chxj_add_cookie_parameter(request_rec *r, char *value, cookie_t *cookie) dst = apr_psprintf(r->pool, "%s?%s=%s%s", dst, CHXJ_COOKIE_PARAM, cookie->cookie_id, name); } - DBG(r, "REQ[%X] end chxj_add_cookie_parameter() dst=[%s]", TO_ADDR(r), dst); + DBG(r,"REQ[%X] dst=[%s]", TO_ADDR(r), dst); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; on_error: - DBG(r, "REQ[%X] end chxj_add_cookie_parameter() (on_error)", TO_ADDR(r)); + DBG(r,"REQ[%X] (on_error)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -872,17 +904,19 @@ chxj_add_cookie_no_update_parameter(request_rec *r, char *value) char *dst; char *name = ""; - DBG(r, "REQ[%X] start chxj_add_cookie_no_update_parameter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! value || ! *value) { - DBG(r, "REQ[%X] end chxj_add_cookie_parameter()(void value)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (void value)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return apr_pstrdup(r->pool, ""); } dst = apr_pstrdup(r->pool, value); if (chxj_cookie_check_host(r, value) != 0) { - DBG(r, "REQ[%X] end chxj_add_cookie_parameter()(check host)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (check host)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); goto on_error; } @@ -892,11 +926,13 @@ chxj_add_cookie_no_update_parameter(request_rec *r, char *value) *qs = 0; } dst = apr_psprintf(r->pool, "%s%c%s=true%s", dst, (strchr(dst,'?')) ? '&' : '?',CHXJ_COOKIE_NOUPDATE_PARAM, name); - DBG(r, "REQ[%X] end chxj_add_cookie_no_update_parameter() dst=[%s]", (unsigned int)(apr_size_t)r, dst); + DBG(r,"REQ[%X] dst=[%s]", TO_ADDR(r), dst); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; on_error: - DBG(r, "REQ[%X] end chxj_add_cookie_no_update_parameter() (on_error)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (on_error)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -907,36 +943,41 @@ chxj_cookie_check_host(request_rec *r, char *value) char *hostnm; mod_chxj_config *dconf; - DBG(r, "REQ[%X] start chxj_cookie_check_host()", (unsigned int)(apr_size_t)r); - DBG(r, "REQ[%X] hostname=[%s] vs Location:[%s]", (unsigned int)(apr_size_t)r, r->hostname, value); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] hostname=[%s] vs Location:[%s]", TO_ADDR(r), r->hostname, value); dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); hostnm = s_get_hostname_from_url(r, value); if (hostnm) { if (dconf->allowed_cookie_domain) { - DBG(r, "REQ[%X] allowed_domain[%s] vs Location:[%s]", (unsigned int)(apr_size_t)r, dconf->allowed_cookie_domain, value); + DBG(r, "REQ[%X] allowed_domain[%s] vs Location:[%s]", TO_ADDR(r), dconf->allowed_cookie_domain, value); if (chxj_strcasenrcmp(r->pool, hostnm, dconf->allowed_cookie_domain, strlen(dconf->allowed_cookie_domain))) { - DBG(r, "REQ[%X] end chxj_cookie_check_host() (false/allowed_domain)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (false/allowed_domain)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } else { - DBG(r, "REQ[%X] end chxj_cookie_check_host() (true/allowed_domain)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (true/allowed_domain)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 0; } } else { if (strcasecmp(hostnm, r->hostname) == 0) { - DBG(r, "REQ[%X] end chxj_cookie_check_host() (true)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (true)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 0; } else { - DBG(r, "REQ[%X] end chxj_cookie_check_host() (false)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (false)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } } } - DBG(r, "REQ[%X] end chxj_cookie_check_host() (true)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] (true)", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 0; } @@ -981,14 +1022,14 @@ chxj_delete_cookie(request_rec *r, const char *cookie_id) int done_proc = 0; mod_chxj_config *dconf; - DBG(r, "start chxj_delete_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_delete_cookie_mysql(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_mysql() cookie_id:[%s]", cookie_id); - DBG(r, "end chxj_delete_cookie()"); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_mysql() cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -997,8 +1038,8 @@ chxj_delete_cookie(request_rec *r, const char *cookie_id) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_delete_cookie_memcache(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_memcache() cookie_id:[%s]", cookie_id); - DBG(r, "end chxj_delete_cookie()"); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_memcache() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1006,13 +1047,13 @@ chxj_delete_cookie(request_rec *r, const char *cookie_id) #endif if (!done_proc || IS_COOKIE_STORE_DBM(dconf->cookie_store_type)) { if (! chxj_delete_cookie_dbm(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_dbm() cookie_id:[%s]", cookie_id); - DBG(r, "end chxj_delete_cookie()"); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_dbm() cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } } - DBG(r, "end chxj_delete_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); } @@ -1025,27 +1066,30 @@ chxj_save_cookie_expire(request_rec *r, cookie_t *cookie) int done_proc = 0; mod_chxj_config *dconf; - DBG(r, "start chxj_save_cookie_expire()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (!cookie) { - DBG(r, "cookie is NULL"); + DBG(r,"REQ[%X] cookie is NULL",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } if (!cookie->cookie_id) { - DBG(r, "cookie->cookie_id is NULL"); + DBG(r,"REQ[%X] cookie->cookie_id is NULL",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (!dconf) { - DBG(r, "dconf is NULL"); + DBG(r,"REQ[%X] dconf is NULL",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_save_cookie_expire_mysql(r, dconf, cookie->cookie_id)) { - ERR(r, "failed: chxj_save_cookie_expire_mysql() cookie_id:[%s]", cookie->cookie_id); - DBG(r, "end chxj_save_cookie_expire()"); + ERR(r,"REQ[%X] failed: chxj_save_cookie_expire_mysql() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1054,8 +1098,8 @@ chxj_save_cookie_expire(request_rec *r, cookie_t *cookie) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_save_cookie_expire_memcache(r, dconf, cookie->cookie_id)) { - ERR(r, "failed: chxj_save_cookie_expire_memcache() cookie_id:[%s]", cookie->cookie_id); - DBG(r, "end chxj_save_cookie_expire()"); + ERR(r,"REQ[%X] failed: chxj_save_cookie_expire_memcache() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1063,13 +1107,13 @@ chxj_save_cookie_expire(request_rec *r, cookie_t *cookie) #endif if (!done_proc || IS_COOKIE_STORE_DBM(dconf->cookie_store_type)) { if (! chxj_save_cookie_expire_dbm(r, dconf, cookie->cookie_id)) { - ERR(r, "failed: chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie->cookie_id); - DBG(r, "end chxj_save_cookie_expire()"); + ERR(r,"REQ[%X] failed: chxj_save_cookie_expire_dbm() cookie_id:[%s]", TO_ADDR(r),cookie->cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } } - DBG(r, "end chxj_save_cookie_expire()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); } @@ -1079,14 +1123,15 @@ chxj_delete_cookie_expire(request_rec *r, char *cookie_id) int done_proc = 0; mod_chxj_config *dconf; - DBG(r, "start chxj_delete_cookie_expire()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_delete_cookie_expire_mysql(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_expire_mysql() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_expire_mysql() cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1095,7 +1140,8 @@ chxj_delete_cookie_expire(request_rec *r, char *cookie_id) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (!chxj_delete_cookie_expire_memcache(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_expire_memcache() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_expire_memcache() cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1103,12 +1149,13 @@ chxj_delete_cookie_expire(request_rec *r, char *cookie_id) #endif if (!done_proc || IS_COOKIE_STORE_DBM(dconf->cookie_store_type)) { if (!chxj_delete_cookie_expire_dbm(r, dconf, cookie_id)) { - ERR(r, "failed: chxj_delete_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] failed: chxj_delete_cookie_expire_dbm() cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } } - DBG(r, "end chxj_delete_cookie_expire()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); } @@ -1118,13 +1165,14 @@ chxj_cookie_expire_gc(request_rec *r) mod_chxj_config *dconf; int done_proc = 0; - DBG(r, "start chxj_cookie_expire_gc()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_cookie_expire_gc_mysql(r, dconf)) { - ERR(r, "%s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_mysql()", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_mysql()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1133,7 +1181,8 @@ chxj_cookie_expire_gc(request_rec *r) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_cookie_expire_gc_memcache(r, dconf)) { - ERR(r, "%s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_memcache()", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_memcache()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } done_proc = 1; @@ -1141,11 +1190,12 @@ chxj_cookie_expire_gc(request_rec *r) #endif if (!done_proc) { if (! chxj_cookie_expire_gc_dbm(r, dconf)) { - ERR(r, "%s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_dbm()", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_expire_gc(): failed: chxj_cookie_expire_gc_dbm()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return; } } - DBG(r, "end chxj_cookie_expire_gc()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); } apr_time_t @@ -1164,17 +1214,19 @@ __chxj_cookie_lock(request_rec *r, const char *filename, int line) int done_proc = 0; cookie_lock_t *ret = NULL; - DBG(r, "start chxj_cookie_lock() call from %s:%d", filename, line); + DBG(r,"REQ[%X] start %s() call from %s:%d",TO_ADDR(r),__func__, filename,line); if ((rv = apr_proc_mutex_lock(global_cookie_mutex)) != APR_SUCCESS) { char errstr[255]; - ERR(r, "%s:%d apr_proc_mutex_lock failure.(%d:%s)", APLOG_MARK, rv, apr_strerror(rv, errstr, 255)); + ERR(r,"REQ[%X] %s:%d apr_proc_mutex_lock failure.(%d:%s)", TO_ADDR(r),APLOG_MARK, rv, apr_strerror(rv, errstr, 255)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_cookie_lock_mysql(r, dconf)) { - ERR(r, "%s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_mysql()", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_mysql()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } done_proc = 1; @@ -1185,7 +1237,8 @@ __chxj_cookie_lock(request_rec *r, const char *filename, int line) #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_cookie_lock_memcache(r, dconf)) { - ERR(r, "%s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_memcache()", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_memcache()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } done_proc = 1; @@ -1195,12 +1248,12 @@ __chxj_cookie_lock(request_rec *r, const char *filename, int line) #endif if (!done_proc) { if (!(ret = chxj_cookie_lock_dbm(r, dconf))) { - ERR(r, "%s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_dbm()", APLOG_MARK); - DBG(r, "end chxj_cookie_lock() call from %s:%d", filename, line); + ERR(r,"REQ[%X] %s:%d end chxj_cookie_lock(): failed: chxj_cookie_lock_dbm()", TO_ADDR(r),APLOG_MARK); + DBG(r,"REQ[%X] end %s() call from %s:%d",TO_ADDR(r),__func__,filename,line); return NULL; } } - DBG(r, "REQ:[%X] end chxj_cookie_lock() call from %s:%d", (unsigned int)(apr_size_t)r, filename, line); + DBG(r,"REQ[%X] end %s() call from %s:%d",TO_ADDR(r),__func__,filename,line); return ret; } @@ -1213,13 +1266,13 @@ __chxj_cookie_unlock(request_rec *r, cookie_lock_t *lock, const char *filename, apr_status_t rv; int rtn = 1; - DBG(r, "start chxj_cookie_unlock() call from %s:%d", filename, line); + DBG(r,"REQ[%X] start %s() call from %s:%d", TO_ADDR(r),__func__,filename, line); dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); #if defined(USE_MYSQL_COOKIE) if (IS_COOKIE_STORE_MYSQL(dconf->cookie_store_type)) { if (! chxj_cookie_unlock_mysql(r, dconf)) { - ERR(r, "failed: chxj_cookie_unlock_mysql()"); + ERR(r,"REQ[%X] failed: chxj_cookie_unlock_mysql()",TO_ADDR(r)); rtn = 0; goto end_chxj_cookie_unlock; } @@ -1229,7 +1282,7 @@ __chxj_cookie_unlock(request_rec *r, cookie_lock_t *lock, const char *filename, #if defined(USE_MEMCACHE_COOKIE) if (IS_COOKIE_STORE_MEMCACHE(dconf->cookie_store_type)) { if (! chxj_cookie_unlock_memcache(r, dconf)) { - ERR(r, "failed: chxj_cookie_unlock_memcache()"); + ERR(r,"REQ[%X] failed: chxj_cookie_unlock_memcache()",TO_ADDR(r)); rtn = 0; goto end_chxj_cookie_unlock; } @@ -1238,7 +1291,7 @@ __chxj_cookie_unlock(request_rec *r, cookie_lock_t *lock, const char *filename, #endif if (!done_proc) { if (! chxj_cookie_unlock_dbm(r, lock, dconf)) { - ERR(r, "failed: chxj_cookie_unlock_dbm()"); + ERR(r,"REQ[%X] failed: chxj_cookie_unlock_dbm()",TO_ADDR(r)); rtn = 0; goto end_chxj_cookie_unlock; } @@ -1246,11 +1299,11 @@ __chxj_cookie_unlock(request_rec *r, cookie_lock_t *lock, const char *filename, end_chxj_cookie_unlock: if ((rv = apr_proc_mutex_unlock(global_cookie_mutex)) != APR_SUCCESS) { char errstr[255]; - ERR(r, "%s:%d apr_proc_mutex_unlock failure.(%d:%s)", APLOG_MARK, rv, apr_strerror(rv, errstr, 255)); - DBG(r, "end chxj_cookie_unlock() call from %s:%d", filename, line); + ERR(r,"REQ[%X] %s:%d apr_proc_mutex_unlock failure.(%d:%s)", TO_ADDR(r),APLOG_MARK, rv, apr_strerror(rv, errstr, 255)); + DBG(r,"REQ[%X] end %s() call from %s:%d", TO_ADDR(r),__func__,filename, line); return 0; } - DBG(r, "end chxj_cookie_unlock() call from %s:%d", filename, line); + DBG(r,"REQ[%X] end %s() call from %s:%d", TO_ADDR(r),__func__,filename, line); return rtn; } @@ -1290,14 +1343,14 @@ s_convert_a_tag(request_rec *r, const char *s, apr_size_t *len, cookie_t *cookie Node *node = qs_parse_tag(&doc, matchstr, strlen(matchstr) - 1); Attr *attr; - DBG(r, "matchstr:[%s]", matchstr); + DBG(r,"REQ[%X] matchstr:[%s]", TO_ADDR(r),matchstr); dst = apr_pstrcat(pool, (dst) ? dst : "", "re_nsub + 1, match); if (matchstr) { - DBG(r, "matchstr:[%s]", matchstr); + DBG(r,"REQ[%X] matchstr:[%s]",TO_ADDR(r),matchstr); dst = apr_pstrcat(pool, (dst) ? dst : "", "", matchstr, NULL); plen += strlen(matchstr); } @@ -1483,7 +1536,7 @@ chxj_cookie_only_mode(request_rec *r, const char *src, apr_size_t *len, cookie_t char *result; char *dst = NULL; - DBG(r, "REQ[%X] start chxj_cookie_only_mode()", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); s = chxj_encoding(r, src, len); dst = s_convert_a_tag(r, s, len, cookie); @@ -1491,7 +1544,7 @@ chxj_cookie_only_mode(request_rec *r, const char *src, apr_size_t *len, cookie_t dst = s_convert_form_tag(r, dst, len, cookie); result = chxj_rencoding(r, dst, len, NULL); - DBG(r, "REQ[%X] end chxj_cookie_only_mode()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return result; } /* diff --git a/src/chxj_css.c b/src/chxj_css.c index 30308b90..fa9672d5 100644 --- a/src/chxj_css.c +++ b/src/chxj_css.c @@ -122,7 +122,7 @@ chxj_css_find_selector(Doc *doc, css_stylesheet_t *stylesheet, Node *node) char *tag_name = NULL; char *class_name = NULL; char *id = NULL; - DBG(r, "start chxj_css_find_selector()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! stylesheet) { /* NOT FOUND */ @@ -131,7 +131,7 @@ chxj_css_find_selector(Doc *doc, css_stylesheet_t *stylesheet, Node *node) s_get_tag_and_class_and_id(doc, node, &tag_name, &class_name, &id); if (! tag_name || strcasecmp("ROOT", tag_name) == 0) { - ERR(r, "%s:%d tag_name is null", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d tag_name is null", TO_ADDR(r),APLOG_MARK); return NULL; } char *pattern_str1 = NULL; @@ -157,7 +157,7 @@ chxj_css_find_selector(Doc *doc, css_stylesheet_t *stylesheet, Node *node) id); sel = s_search_selector_regexp(doc, r, pool, stylesheet, pattern_str1, pattern_str2, node); if (sel) { - DBG(r, "end chxj_css_find_selector()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sel; } } @@ -176,7 +176,7 @@ chxj_css_find_selector(Doc *doc, css_stylesheet_t *stylesheet, Node *node) id); sel = s_search_selector_regexp(doc, r, pool, stylesheet, pattern_str1, pattern_str2, node); if (sel) { - DBG(r, "end chxj_css_find_selector()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sel; } } @@ -195,27 +195,27 @@ chxj_css_find_selector(Doc *doc, css_stylesheet_t *stylesheet, Node *node) class_name); sel = s_search_selector_regexp(doc, r, pool, stylesheet, pattern_str1, pattern_str2, node); if (sel) { - DBG(r, "end chxj_css_find_selector()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sel; } } else { - DBG(r, " "); pattern_str1 = apr_psprintf(pool, "^(%s|\\*)$", tag_name); pattern_str2 = apr_psprintf(pool, ".*([ >+])(%s|\\*)$", tag_name); - DBG(r, " "); sel = s_search_selector_regexp(doc, r, pool, stylesheet, pattern_str1, pattern_str2, node); if (sel) { - DBG(r, "end chxj_css_find_selector() (FOUND)"); + DBG(r,"REQ[%X] (FOUND)",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sel; } } - DBG(r, "end chxj_css_find_selector() (Not FOUND)"); + DBG(r,"REQ[%X] (Not FOUND)",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sel; } @@ -231,8 +231,6 @@ s_search_selector_regexp(Doc *doc, request_rec *r, apr_pool_t *pool, css_stylesh css_selector_t *ret_sel = NULL; css_selector_t *tail; css_selector_t *cur; - DBG(r, "pattern1:[%s]", pattern_str1); - DBG(r, "pattern2:[%s]", pattern_str2); ap_regex_t *pattern1 = chxj_ap_pregcomp(pool, pattern_str1, AP_REG_EXTENDED|AP_REG_ICASE); ap_regex_t *pattern2 = chxj_ap_pregcomp(pool, pattern_str2, AP_REG_EXTENDED|AP_REG_ICASE); ap_regex_t *pattern3 = chxj_ap_pregcomp(pool, "^.*([>+ ])([^>+ ]+?)$", AP_REG_EXTENDED|AP_REG_ICASE); @@ -244,7 +242,6 @@ s_search_selector_regexp(Doc *doc, request_rec *r, apr_pool_t *pool, css_stylesh cur = (css_selector_t *)((apr_size_t)cur->ref - (apr_size_t)APR_OFFSETOF(css_selector_t, next))) { ap_regmatch_t match[256]; if (chxj_ap_regexec(pattern1, cur->name, pattern1->re_nsub + 1, match, 0) == 0) { - DBG(r, "match(independent of)"); ret_sel = cur; goto end_of_search; } @@ -262,10 +259,7 @@ s_search_selector_regexp(Doc *doc, request_rec *r, apr_pool_t *pool, css_stylesh char *ret = s_cmp_now_node_vs_current_style(doc, r, pool, strrchr(src, *one)+1, pattern4, node->parent); if (ret) { - DBG(r, "continue do while"); node = node->parent; - DBG(r, "new node:[%x]", (unsigned int)(apr_size_t)node); - DBG(r, "new node->prev:[%x]", (unsigned int)(apr_size_t)node->prev); loop = 1; } } @@ -364,21 +358,24 @@ s_chxj_css_parse_from_uri(request_rec *r, apr_pool_t *pool, struct css_already_i apr_size_t css_len; - DBG(r, "start chxj_css_parse_from_uri() uri:[%s]", uri); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] uri:[%s]", TO_ADDR(r),uri); base_url = s_uri_to_base_url(&r->parsed_uri, pool); full_url = s_path_to_fullurl(pool, base_url, r->parsed_uri.path, uri); /* check already import */ if (imported_stack && s_is_already_imported(imported_stack, full_url)) { - DBG(r, "end chxj_css_parse_from_uri(): already imported:[%s]", full_url); + DBG(r,"REQ[%X] already imported:[%s]", TO_ADDR(r),full_url); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } /* GET request */ css = chxj_serf_get(r, pool, full_url, 0, &css_len); if (css == NULL) { - ERR(r, "%s:%d end chxj_css_parse_from_uri(): serf_get failed: url:[%s]", APLOG_MARK, uri); + ERR(r,"REQ[%X] %s:%d end chxj_css_parse_from_uri(): serf_get failed: url:[%s]", TO_ADDR(r),APLOG_MARK, uri); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } srclen = strlen(css); @@ -386,14 +383,14 @@ s_chxj_css_parse_from_uri(request_rec *r, apr_pool_t *pool, struct css_already_i /* create parser */ parser = scss_parser_new_from_buf(pool, css, ""); if (!parser) { - ERR(r, "%s:%d end chxj_css_parse_from_uri(): cr_parser_new_from_buf() failed", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_css_parse_from_uri(): cr_parser_new_from_buf() failed", TO_ADDR(r),APLOG_MARK); return NULL; } /* create handler */ handler = scss_doc_handler_new(parser); if (!handler) { - ERR(r, "%s:%d end chxj_css_parse_from_uri(): cr_doc_handler_new() failed", APLOG_MARK); + ERR(r, "REQ[%X] %s:%d end chxj_css_parse_from_uri(): cr_doc_handler_new() failed", TO_ADDR(r),APLOG_MARK); return NULL; } @@ -431,7 +428,8 @@ s_chxj_css_parse_from_uri(request_rec *r, apr_pool_t *pool, struct css_already_i handler->import = s_css_parser_from_uri_import_style; scss_parse_stylesheet(parser); - DBG(r, "end chxj_css_parse_from_uri() url:[%s]", uri); + DBG(r,"REQ[%X] url:[%s]", TO_ADDR(r),uri); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return s_merge_stylesheet(pool, old_stylesheet, app_data.stylesheet); } @@ -446,18 +444,19 @@ s_chxj_css_parse_from_buf(request_rec *r, apr_pool_t *pool, struct css_already_i struct css_app_data app_data; struct css_already_import_stack *new_stack; - DBG(r, "end chxj_css_parse_from_buf() css:[%s]", css); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] css:[%s]", TO_ADDR(r),css); srclen = strlen(css); /* create parser */ parser = scss_parser_new_from_buf(pool, css, ""); if (!parser) { - ERR(r, "%s:%d end chxj_css_parse_from_uri(): scss_parser_new_from_buf() failed", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_css_parse_from_uri(): scss_parser_new_from_buf() failed", TO_ADDR(r),APLOG_MARK); return NULL; } handler = scss_doc_handler_new(parser); if (!handler) { - ERR(r, "%s:%d end chxj_css_parse_from_uri(): scss_doc_handler_new() failed", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d end chxj_css_parse_from_uri(): scss_doc_handler_new() failed", TO_ADDR(r),APLOG_MARK); return NULL; } @@ -496,7 +495,8 @@ s_chxj_css_parse_from_buf(request_rec *r, apr_pool_t *pool, struct css_already_i handler->import = s_css_parser_from_uri_import_style; scss_parse_stylesheet(parser); - DBG(r, "end chxj_css_parse_from_buf() css:[%s]", css); + DBG(r,"REQ[%X] css:[%s]", TO_ADDR(r),css); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return s_merge_stylesheet(pool, old_stylesheet, app_data.stylesheet); } @@ -528,7 +528,7 @@ s_css_parser_from_uri_start_selector(SCSSParserPtr_t parser, SCSSNodePtr_t selec app_data->selector_list = apr_palloc(app_data->pool, sizeof(char *) * app_data->selector_count); if (! app_data->selector_list) { - ERR(app_data->r, "%s:%d Out of memory", APLOG_MARK); + ERR(app_data->r, "REQ[%X] %s:%d Out of memory", TO_ADDR(app_data->r),APLOG_MARK); app_data->error_occured = 1; return; } @@ -854,14 +854,13 @@ static char * s_cmp_now_node_vs_current_style(Doc *doc, request_rec *r, apr_pool_t *pool, char *src, ap_regex_t *pattern4, Node *node) { ap_regmatch_t match[256]; - DBG(r, "src:[%s]", src); if (chxj_ap_regexec(pattern4, src, pattern4->re_nsub + 1, match, 0) == 0) { char *tag_name = chxj_ap_pregsub(pool, "$1", src, pattern4->re_nsub + 1, match); char *class_name = chxj_ap_pregsub(pool, "$2", src, pattern4->re_nsub + 1, match); char *id_name = chxj_ap_pregsub(pool, "$3", src, pattern4->re_nsub + 1, match); - DBG(r, "tag:[%s] class:[%s] id:[%s]", tag_name, class_name, id_name); + DBG(r, "REQ[%X] tag:[%s] class:[%s] id:[%s]", TO_ADDR(r),tag_name, class_name, id_name); if (!node) { - DBG(r, "unmatch(parent is null)"); + DBG(r, "REQ[%X] unmatch(parent is null)",TO_ADDR(r)); return NULL; } char *node_tag_name = NULL; @@ -871,28 +870,28 @@ s_cmp_now_node_vs_current_style(Doc *doc, request_rec *r, apr_pool_t *pool, char if (*tag_name == 0 || strcasecmp(node_tag_name, tag_name) == 0 || strcmp("*", tag_name) == 0) { if (class_name && *class_name != 0) { if (!node_class_name) { - DBG(r, "unmatch (class) node:[NULL]"); + DBG(r, "REQ[%X] unmatch (class) node:[NULL]",TO_ADDR(r)); return NULL; } if (strcasecmp(node_class_name, &class_name[1]) != 0) { - DBG(r, "unmatch (class) node:[%s] style:[%s]", node_class_name, &class_name[1]); + DBG(r,"REQ[%X] unmatch (class) node:[%s] style:[%s]", TO_ADDR(r),node_class_name, &class_name[1]); return NULL; } } if (id_name && *id_name != 0) { if (!node_id_name) { - DBG(r, "unmatch (id) node:[NULL]"); + DBG(r,"REQ[%X] unmatch (id) node:[NULL]",TO_ADDR(r)); return NULL; } if (strcasecmp(node_id_name, &id_name[1]) != 0) { - DBG(r, "unmatch (id)"); + DBG(r,"REQ[%X] unmatch (id)",TO_ADDR(r)); return NULL; } } - DBG(r, "match"); + DBG(r,"REQ[%X] match",TO_ADDR(r)); return src; } - DBG(r, "unmatch(tag) tag:[%s] vs [%s]", tag_name, node_tag_name); + DBG(r,"REQ[%X] unmatch(tag) tag:[%s] vs [%s]", TO_ADDR(r),tag_name, node_tag_name); } return NULL; } @@ -912,7 +911,7 @@ chxj_find_pseudo_selectors(Doc *doc, css_stylesheet_t *stylesheet) result = apr_palloc(doc->pool, sizeof(*result)); if (! result) { - ERR(doc->r, "%s:%d Out of Memory", APLOG_MARK); + ERR(doc->r,"REQ[%X] %s:%d Out of Memory", TO_ADDR(doc->r),APLOG_MARK); return NULL; } memset(result, 0, sizeof(*result)); @@ -949,7 +948,8 @@ chxj_css_parse_style_attr(Doc *doc, css_stylesheet_t *old_stylesheet, char *tag_ char *attr_value; char *class_name_sel = NULL; char *id_name_sel = NULL; - DBG(doc->r, "start chxj_css_parse_style_attr()"); + + DBG(doc->r,"REQ[%X] start %s()",TO_ADDR(doc->r),__func__); if (class_name) { class_name_sel = apr_psprintf(doc->pool, ".%s", class_name); @@ -970,7 +970,7 @@ chxj_css_parse_style_attr(Doc *doc, css_stylesheet_t *old_stylesheet, char *tag_ } new_stylesheet = s_chxj_css_parse_from_buf(doc->r, doc->pool, NULL, dup_stylesheet, attr_value); - DBG(doc->r, "end chxj_css_parse_style_attr()"); + DBG(doc->r,"REQ[%X] end %s()",TO_ADDR(doc->r),__func__); return new_stylesheet; } @@ -983,7 +983,7 @@ s_dup_stylesheet(Doc *doc, css_stylesheet_t *stylesheet) result = apr_palloc(doc->pool, sizeof(*result)); if (! result) { - ERR(doc->r, "%s:%d Out of Memory", APLOG_MARK); + ERR(doc->r, "REQ[%X] %s:%d Out of Memory", TO_ADDR(doc->r),APLOG_MARK); return NULL; } memset(result, 0, sizeof(*result)); @@ -1014,14 +1014,14 @@ chxj_css_parse_style_value(Doc *doc, css_stylesheet_t *old_stylesheet, char *sty css_stylesheet_t *new_stylesheet; css_stylesheet_t *dup_stylesheet = NULL; - DBG(doc->r, "start chxj_css_parse_style_value()"); + DBG(doc->r,"REQ[%X] start %s()",TO_ADDR(doc->r),__func__); if (old_stylesheet) { dup_stylesheet = s_dup_stylesheet(doc, old_stylesheet); } new_stylesheet = s_chxj_css_parse_from_buf(doc->r, doc->pool, NULL, dup_stylesheet, style_attr_value); - DBG(doc->r, "end chxj_css_parse_style_value()"); + DBG(doc->r,"REQ[%X] end %s()",TO_ADDR(doc->r),__func__); return new_stylesheet; } @@ -1034,7 +1034,7 @@ chxj_new_prop_list_stack(Doc *doc) { css_prop_list_stack_t *new_stack = apr_palloc(doc->pool, sizeof(css_prop_list_stack_t)); if (! new_stack) { - ERR(doc->r, "%s:%d Out of memory.", APLOG_MARK); + ERR(doc->r,"REQ[%X] %s:%d Out of memory.",TO_ADDR(doc->r),APLOG_MARK); return NULL; } new_stack->head.next = &new_stack->head; @@ -1048,7 +1048,7 @@ chxj_css_create_prop_list(Doc *doc, css_selector_t *sel) css_prop_list_t *prop_list; prop_list = apr_palloc(doc->pool, sizeof(*prop_list)); if (! prop_list) { - ERR(doc->r, "%s:%d Out of memory.", APLOG_MARK); + ERR(doc->r,"REQ[%X] %s:%d Out of memory.",TO_ADDR(doc->r),APLOG_MARK); return NULL; } prop_list->head.next = &prop_list->head; @@ -1111,7 +1111,7 @@ chxj_dup_css_prop_list(Doc *doc, css_prop_list_t *old) new_prop_list = chxj_css_create_prop_list(doc, NULL); if (! new_prop_list) { - ERR(doc->r, "%s:%d Out of memory.", APLOG_MARK); + ERR(doc->r,"REQ[%X] %s:%d Out of memory.",TO_ADDR(doc->r),APLOG_MARK); return NULL; } if (old) { diff --git a/src/chxj_dbm.c b/src/chxj_dbm.c index 0698184c..deb5656b 100644 --- a/src/chxj_dbm.c +++ b/src/chxj_dbm.c @@ -40,12 +40,14 @@ chxj_save_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id, apr_dbm_t *f; apr_file_t *file; - DBG(r, "REQ[%X] start chxj_save_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); file = chxj_cookie_db_lock(r); if (! file) { - ERR(r, "%s:%d REQ[%X] mod_chxj: Can't lock cookie db", __FILE__,__LINE__,TO_ADDR(r)); - DBG(r, "REQ[%X] end chxj_save_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + ERR(r,"REQ[%X] %s:%d mod_chxj: Can't lock cookie db", TO_ADDR(r),__FILE__,__LINE__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -57,7 +59,8 @@ chxj_save_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id, r->pool); if (retval != APR_SUCCESS) { char errstr[256]; - ERR(r, "%s:%d could not open dbm (type %s) auth file: %s(%d:%s)", + ERR(r, "REQ[%X] %s:%d could not open dbm (type %s) auth file: %s(%d:%s)", + TO_ADDR(r), __FILE__, __LINE__, (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", @@ -65,7 +68,8 @@ chxj_save_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id, retval, apr_strerror(retval, errstr, 255)); chxj_cookie_db_unlock(r, file); - DBG(r, "REQ[%X] end chxj_save_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -85,7 +89,8 @@ chxj_save_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id, retval = apr_dbm_store(f, dbmkey, dbmval); if (retval != APR_SUCCESS) { char errstr[256]; - ERR(r, "%s:%d Cannot store Cookie data to DBM file `%s' tye:[%s] (%d:%s) key:[%s] val:[%s]", + ERR(r, "REQ[%X] %s:%d Cannot store Cookie data to DBM file `%s' tye:[%s] (%d:%s) key:[%s] val:[%s]", + TO_ADDR(r), __FILE__, __LINE__, chxj_cookie_db_name_create(r, m->cookie_db_dir), @@ -96,13 +101,15 @@ chxj_save_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id, dbmval.dptr); apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "REQ[%X] end chxj_save_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "REQ[%X] end chxj_save_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -179,7 +186,7 @@ char * chxj_cookie_db_lock_name_create(request_rec *r, const char *dir) { char *dst; - DBG(r, "REQ[%X] start chxj_cookie_db_lock_name_create()", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (!dir) { dst = apr_pstrdup(r->pool, DEFAULT_COOKIE_DB_DIR); @@ -193,7 +200,7 @@ chxj_cookie_db_lock_name_create(request_rec *r, const char *dir) else { dst = apr_pstrcat(r->pool, dst, COOKIE_DB_LOCK_NAME, NULL); } - DBG(r, "REQ[%X] end chxj_cookie_db_lock_name_create()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -297,12 +304,14 @@ chxj_update_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id apr_datum_t dbmval; apr_status_t retval; - DBG(r, "start chxj_update_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); file = chxj_cookie_db_lock(r); if (! file) { - ERR(r, "mod_chxj: Can't lock cookie db"); - DBG(r, "end chxj_update_cookie_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db",TO_ADDR(r)); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -313,11 +322,13 @@ chxj_update_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id APR_OS_DEFAULT, r->pool); if (retval != APR_SUCCESS) { - ERR(r, "could not open dbm (type %s) auth file: %s", - (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", - chxj_cookie_db_name_create(r,m->cookie_db_dir)); + ERR(r,"REQ[%X] could not open dbm (type %s) auth file: %s", + TO_ADDR(r), + (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", + chxj_cookie_db_name_create(r,m->cookie_db_dir)); chxj_cookie_db_unlock(r, file); - DBG(r, "end chxj_update_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -341,23 +352,26 @@ chxj_update_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id retval = apr_dbm_store(f, dbmkey, dbmval); if (retval != APR_SUCCESS) { char errstr[256]; - ERR(r, "%s:%d Cannot store Cookie data to DBM file `%s' tye:[%s] (%d:%s) key:[%s] val:[%s]", - __FILE__, - __LINE__, - chxj_cookie_db_name_create(r, m->cookie_db_dir), - (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", - retval, - apr_strerror(retval, errstr, 255), - dbmkey.dptr, - dbmval.dptr); + ERR(r,"REQ[%X] %s:%d Cannot store Cookie data to DBM file `%s' tye:[%s] (%d:%s) key:[%s] val:[%s]", + TO_ADDR(r), + __FILE__, + __LINE__, + chxj_cookie_db_name_create(r, m->cookie_db_dir), + (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", + retval, + apr_strerror(retval, errstr, 255), + dbmkey.dptr, + dbmval.dptr); apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "end chxj_update_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "end chxj_update_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -372,11 +386,13 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) apr_datum_t dbmval; apr_datum_t dbmkey; - DBG(r, "REQ[%X] start chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); file = chxj_cookie_db_lock(r); if (! file) { - ERR(r, "REQ[%X] mod_chxj: Can't lock cookie db", TO_ADDR(r)); - DBG(r, "REQ[%X] end chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db", TO_ADDR(r)); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -389,7 +405,8 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) if (retval != APR_SUCCESS) { char errstr[256]; ERR(r, - "%s:%d could not open dbm (type %s) auth file: %s (%d:%s)", + "REQ[%X] %s:%d could not open dbm (type %s) auth file: %s (%d:%s)", + TO_ADDR(r), __FILE__, __LINE__, (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", @@ -397,7 +414,8 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) retval, apr_strerror(retval, errstr, 255)); chxj_cookie_db_unlock(r, file); - DBG(r, "TO_REQ[%X] end chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -412,7 +430,8 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) if (retval != APR_SUCCESS) { char errstr[256]; ERR(r, - "%s:%d could not fetch dbm (type %s) auth file: %s(%d:%s)", + "REQ[%X] %s:%d could not fetch dbm (type %s) auth file: %s(%d:%s)", + TO_ADDR(r), __FILE__, __LINE__, (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", @@ -421,7 +440,8 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) apr_strerror(retval, errstr, 255)); apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "REQ[%X] end chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } load_string = apr_palloc(r->pool, dbmval.dsize+1); @@ -435,7 +455,8 @@ chxj_load_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id) } apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "REQ[%X] end chxj_load_cookie_dbm() cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r), cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return load_string; } @@ -448,11 +469,13 @@ chxj_delete_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id apr_datum_t dbmkey; apr_dbm_t *f; - DBG(r, "start chxj_delete_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); file = chxj_cookie_db_lock(r); if (! file) { - ERR(r, "mod_chxj: Can't lock cookie db"); - DBG(r, "end chxj_delete_cookie_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db",TO_ADDR(r)); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -464,11 +487,13 @@ chxj_delete_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id r->pool); if (retval != APR_SUCCESS) { ERR(r, - "could not open dbm (type %s) auth file: %s", + "REQ[%X] could not open dbm (type %s) auth file: %s", + TO_ADDR(r), (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", chxj_cookie_db_name_create(r,m->cookie_db_dir)); chxj_cookie_db_unlock(r, file); - DBG(r, "end chxj_delete_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -482,7 +507,8 @@ chxj_delete_cookie_dbm(request_rec *r, mod_chxj_config *m, const char *cookie_id } apr_dbm_close(f); chxj_cookie_db_unlock(r, file); - DBG(r, "end chxj_delete_cookie_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -497,11 +523,13 @@ chxj_save_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *cook apr_datum_t dbmval; apr_dbm_t *f; - DBG(r, "start chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); file = chxj_cookie_expire_db_lock(r); if (! file) { - ERR(r, "mod_chxj: Can't lock cookie db"); - DBG(r, "end chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db",TO_ADDR(r)); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -512,11 +540,13 @@ chxj_save_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *cook APR_OS_DEFAULT, r->pool); if (retval != APR_SUCCESS) { - ERR(r, "could not open dbm (type %s) auth file: %s", - (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", - chxj_cookie_expire_db_name_create(r,m->cookie_db_dir)); + ERR(r, "REQ[%X] could not open dbm (type %s) auth file: %s", + TO_ADDR(r), + (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", + chxj_cookie_expire_db_name_create(r,m->cookie_db_dir)); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } /* @@ -539,18 +569,21 @@ chxj_save_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *cook */ retval = apr_dbm_store(f, dbmkey, dbmval); if (retval != APR_SUCCESS) { - ERR(r, "Cannot store Cookie data to DBM file `%s'", - chxj_cookie_db_name_create(r, m->cookie_db_dir)); - DBG(r, "end chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] Cannot store Cookie data to DBM file `%s'", + TO_ADDR(r), + chxj_cookie_db_name_create(r, m->cookie_db_dir)); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); apr_dbm_close(f); chxj_cookie_expire_db_unlock(r, file); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } apr_dbm_close(f); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_save_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -564,11 +597,13 @@ chxj_delete_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *co apr_dbm_t *f; apr_file_t *file; - DBG(r, "start chxj_delete_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); file = chxj_cookie_expire_db_lock(r); if (! file) { - ERR(r, "mod_chxj: Can't lock cookie db"); - DBG(r, "end chxj_delete_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db",TO_ADDR(r)); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } retval = apr_dbm_open_ex(&f, @@ -579,11 +614,13 @@ chxj_delete_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *co r->pool); if (retval != APR_SUCCESS) { ERR(r, - "could not open dbm (type %s) auth file: %s", + "REQ[%X] could not open dbm (type %s) auth file: %s", + TO_ADDR(r), (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", chxj_cookie_expire_db_name_create(r,m->cookie_db_dir)); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_delete_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -597,7 +634,8 @@ chxj_delete_cookie_expire_dbm(request_rec *r, mod_chxj_config *m, const char *co } apr_dbm_close(f); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_delete_cookie_expire_dbm() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -613,12 +651,12 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) apr_file_t *file; time_t now_time; - DBG(r, "start chxj_cookie_expire_gc_dbm()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); file = chxj_cookie_expire_db_lock(r); if (! file) { - ERR(r, "mod_chxj: Can't lock cookie db"); - DBG(r, "end chxj_cookie_expire_gc_dbm()"); + ERR(r,"REQ[%X] mod_chxj: Can't lock cookie db",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -630,11 +668,12 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) r->pool); if (retval != APR_SUCCESS) { ERR(r, - "could not open dbm (type %s) auth file: %s", + "REQ[%X] could not open dbm (type %s) auth file: %s", + TO_ADDR(r), (m->cookie_dbm_type) ? m->cookie_dbm_type : "default", chxj_cookie_expire_db_name_create(r,m->cookie_db_dir)); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_cookie_expire_gc_dbm()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } @@ -647,7 +686,7 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) retval = apr_dbm_firstkey(f, &dbmkey); if (retval == APR_SUCCESS) { - DBG(r, "firstkey=[%.*s]", (int)dbmkey.dsize, dbmkey.dptr); + DBG(r,"REQ[%X] firstkey=[%.*s]", TO_ADDR(r),(int)dbmkey.dsize, dbmkey.dptr); do { char* tmp; char* old_cookie_id; @@ -670,8 +709,8 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) else cmp_time = now_time - m->cookie_timeout; - DBG(r, "m->cookie_timeout=[%d]", (int)m->cookie_timeout); - DBG(r, "key=[%.*s] cmp_time=[%d] val_time=[%d]", (int)dbmkey.dsize, dbmkey.dptr, cmp_time, val_time); + DBG(r,"REQ[%X] m->cookie_timeout=[%d]", TO_ADDR(r),(int)m->cookie_timeout); + DBG(r,"REQ[%X] key=[%.*s] cmp_time=[%d] val_time=[%d]", TO_ADDR(r),(int)dbmkey.dsize, dbmkey.dptr, cmp_time, val_time); if (cmp_time >= val_time) { apr_dbm_delete(f, dbmkey); @@ -680,7 +719,7 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) memcpy(old_cookie_id, dbmkey.dptr, dbmkey.dsize); chxj_delete_cookie(r,old_cookie_id); - DBG(r, "detect timeout cookie [%s]", old_cookie_id); + DBG(r,"REQ[%X] detect timeout cookie [%s]", TO_ADDR(r),old_cookie_id); } retval = apr_dbm_nextkey(f, &dbmkey); @@ -689,7 +728,7 @@ chxj_cookie_expire_gc_dbm(request_rec *r, mod_chxj_config *m) apr_dbm_close(f); chxj_cookie_expire_db_unlock(r, file); - DBG(r, "end chxj_cookie_expire_gc_dbm()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } diff --git a/src/chxj_dump_string.c b/src/chxj_dump_string.c index a587c2be..b2fca979 100644 --- a/src/chxj_dump_string.c +++ b/src/chxj_dump_string.c @@ -23,16 +23,16 @@ void chxj_dump_string(request_rec *r, const char *filename, int line, const char *title, const char *str, apr_size_t len) { apr_size_t ii; - chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] +-------------------------------------------------------------------+", (unsigned int)(apr_size_t)r); - chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | |", (unsigned int)(apr_size_t)r); - chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | %-*.*s |", (unsigned int)(apr_size_t)r, 64, 64, title); - chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | |", (unsigned int)(apr_size_t)r); - chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] +-------------------------------------------------------------------+", (unsigned int)(apr_size_t)r); + chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] +-------------------------------------------------------------------+", TO_ADDR(r)); + chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | |", TO_ADDR(r)); + chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | %-*.*s |", TO_ADDR(r), 64, 64, title); + chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | |", TO_ADDR(r)); + chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] +-------------------------------------------------------------------+", TO_ADDR(r)); for (ii=0; iiper_dir_config, &chxj_module); if (dconf == NULL) { - DBG(r,"none encoding."); - DBG(r,"REQ[%X] end chxj_encoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] none encoding.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); 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); + ERR(r,"REQ[%X] runtime exception: chxj_encoding(): invalid string size.[%d]", TO_ADDR(r),(int)*len); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)apr_pstrdup(r->pool, ""); } entryp = chxj_apply_convrule(r, dconf->convrules); if (entryp->encoding == NULL) { - 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); + DBG(r,"REQ[%X] none encoding.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)src; } if (STRCASEEQ('n','N',"none", entryp->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); + DBG(r,"REQ[%X] none encoding.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } @@ -71,8 +71,8 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len) ilen = *len; ibuf = apr_palloc(pool, ilen+1); if (ibuf == NULL) { - ERR(r, "runtime exception: chxj_encoding(): Out of memory."); - DBG(r,"REQ[%X] end chxj_encoding()", (unsigned int)(apr_size_t)r); + ERR(r,"REQ[%X] runtime exception: chxj_encoding(): Out of memory.",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)src; } memset(ibuf, 0, ilen+1); @@ -81,36 +81,36 @@ 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,"REQ[%X] end chxj_encoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ibuf; } - DBG(r,"REQ[%X] encode convert [%s] -> [%s]", (unsigned int)(apr_size_t)r, entryp->encoding, "CP932"); + DBG(r,"REQ[%X] encode convert [%s] -> [%s]", TO_ADDR(r), entryp->encoding, "CP932"); memset(obuf, 0, olen); cd = iconv_open("CP932", entryp->encoding); if (cd == (iconv_t)-1) { if (EINVAL == errno) { - ERR(r, "The conversion from %s to %s is not supported by the implementation.", entryp->encoding, "CP932"); + ERR(r,"REQ[%X] The conversion from %s to %s is not supported by the implementation.", TO_ADDR(r),entryp->encoding, "CP932"); } else { - ERR(r, "iconv open failed. from:[%s] to:[%s] errno:[%d]", entryp->encoding, "CP932", errno); + ERR(r,"REQ[%X] iconv open failed. from:[%s] to:[%s] errno:[%d]", TO_ADDR(r),entryp->encoding, "CP932", errno); } - DBG(r,"REQ[%X] end chxj_encoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ibuf; } while (ilen > 0) { result = iconv(cd, &ibuf, &ilen, &obuf, &olen); if (result == (size_t)(-1)) { if (E2BIG == errno) { - ERR(r, "There is not sufficient room at *outbuf."); + ERR(r, "REQ[%X] There is not sufficient room at *outbuf.",TO_ADDR(r)); break; } else if (EILSEQ == errno) { - ERR(r, "%s:%d An invalid multibyte sequence has been encountered in the input. input:[%s]", __FILE__,__LINE__,ibuf); + ERR(r,"REQ[%X] %s:%d An invalid multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),__FILE__,__LINE__,ibuf); chxj_convert_illegal_charactor_sequence(r, entryp, &ibuf, &ilen, &obuf, &olen); } else if (EINVAL == errno) { - ERR(r, "An incomplete multibyte sequence has been encountered in the input. input:[%s]", ibuf); + ERR(r,"REQ[%X] An incomplete multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),ibuf); break; } } @@ -119,7 +119,7 @@ chxj_encoding(request_rec *r, const char *src, apr_size_t *len) iconv_close(cd); chxj_dump_string(r, APLOG_MARK, "RESULT Convert Encoding", spos, *len); - DBG(r,"REQ[%X] end chxj_encoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return spos; } @@ -134,7 +134,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 2; - DBG(r, "passed 2byte."); + DBG(r,"REQ[%X] passed 2byte.",TO_ADDR(r)); } else if ((0xf0 & **ibuf) == 0xe0) { /* 3byte charactor */ @@ -142,7 +142,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf +=3; - DBG(r, "passed 3byte."); + DBG(r,"REQ[%X] passed 3byte.",TO_ADDR(r)); } else if ((0xf8 & **ibuf) == 0xf0) { /* 4byte charactor */ @@ -150,7 +150,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf +=4; - DBG(r, "passed 4byte."); + DBG(r,"REQ[%X] passed 4byte.",TO_ADDR(r)); } else if ((0xc0 & **ibuf) == 0x80) { /* 1byte charactor */ @@ -158,7 +158,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 1; - DBG(r, "passed 1byte."); + DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r)); } else { /* unknown charactor */ @@ -166,7 +166,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 1; - DBG(r, "passed 1byte."); + DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r)); } } else if (STRCASEEQ('e','E', "EUCJP", entryp->encoding) @@ -184,7 +184,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf +=3; - DBG(r, "passed 3byte."); + DBG(r,"REQ[%X] passed 3byte.",TO_ADDR(r)); } else { /* 2byte charactor */ @@ -192,7 +192,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 2; - DBG(r, "passed 2byte."); + DBG(r,"REQ[%X] passed 2byte.",TO_ADDR(r)); } } else if (STRCASEEQ('c', 'C', "CP932", entryp->encoding) @@ -214,7 +214,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 2; - DBG(r, "passed 2byte."); + DBG(r,"REQ[%X] passed 2byte.",TO_ADDR(r)); } else { /* 1byte charactor */ @@ -222,7 +222,7 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 1; - DBG(r, "passed 1byte."); + DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r)); } } else { @@ -231,11 +231,11 @@ chxj_convert_illegal_charactor_sequence(request_rec *r, chxjconvrule_entry *ent *obuf += 1; *olen -= 1; *ibuf += 1; - DBG(r, "passed 1byte."); + DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r)); } if (ibuf && *ibuf) { *ilen = strlen(*ibuf); - DBG(r, "new len = [%" APR_SIZE_T_FMT "].", (apr_size_t)*ilen); + DBG(r,"REQ[%X] new len = [%" APR_SIZE_T_FMT "].", TO_ADDR(r),(apr_size_t)*ilen); } } @@ -254,38 +254,38 @@ chxj_rencoding(request_rec *r, const char *src, apr_size_t *len,const char *enc) mod_chxj_config *dconf; chxjconvrule_entry *entryp; - DBG(r,"REQ[%X] start chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if ((int)*len < 0) { - ERR(r, "runtime exception: chxj_rencoding(): invalid string size.[%d]", (int)*len); - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + ERR(r,"REQ[%X] runtime exception: chxj_rencoding(): invalid string size.[%d]",TO_ADDR(r),(int)*len); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char *)apr_pstrdup(r->pool, ""); } dconf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (! dconf) { - DBG(r,"REQ[%X] none encoding.", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] none encoding.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } entryp = chxj_apply_convrule(r, dconf->convrules); if (! entryp->encoding) { - DBG(r,"REQ[%X] none encoding.", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] none encoding.",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } if (STRCASEEQ('n','N',"none", entryp->encoding)) { - DBG(r,"REQ[%X] none encoding.", (unsigned int)(apr_size_t)r); - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] none encoding.",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } ilen = *len; ibuf = apr_palloc(r->pool, ilen+1); if (! ibuf) { - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return (char*)src; } @@ -295,7 +295,7 @@ chxj_rencoding(request_rec *r, const char *src, apr_size_t *len,const char *enc) olen = ilen * 4 + 1; spos = obuf = apr_palloc(r->pool, olen); if (! obuf) { - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ibuf; } char *from_enc = (char *)enc; @@ -305,15 +305,15 @@ chxj_rencoding(request_rec *r, const char *src, apr_size_t *len,const char *enc) if (strcasecmp(enc,"Shift_JIS") == 0){ from_enc = "CP932"; } - DBG(r,"encode convert [%s] -> [%s]", from_enc, entryp->encoding); + DBG(r,"REQ[%X] encode convert [%s] -> [%s]", TO_ADDR(r),from_enc, entryp->encoding); memset(obuf, 0, olen); cd = iconv_open(entryp->encoding, from_enc); if (cd == (iconv_t)-1) { if (EINVAL == errno) { - ERR(r, "The conversion from %s to %s is not supported by the implementation.", "CP932", entryp->encoding); + ERR(r,"REQ[%X] The conversion from %s to %s is not supported by the implementation.", TO_ADDR(r),"CP932", entryp->encoding); } - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ibuf; } @@ -321,15 +321,15 @@ chxj_rencoding(request_rec *r, const char *src, apr_size_t *len,const char *enc) result = iconv(cd, &ibuf, &ilen, &obuf, &olen); if (result == (size_t)(-1)) { if (E2BIG == errno) { - ERR(r, "There is not sufficient room at *outbuf"); + ERR(r,"REQ[%X] There is not sufficient room at *outbuf",TO_ADDR(r)); break; } else if (EILSEQ == errno) { - ERR(r, "An invalid multibyte sequence has been encountered in the input. input:[%s]", ibuf); + ERR(r,"REQ[%X] An invalid multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),ibuf); chxj_convert_illegal_charactor_sequence(r, entryp, &ibuf, &ilen, &obuf, &olen); } else if (EINVAL == errno) { - ERR(r, "An incomplete multibyte sequence has been encountered in the input. input:[%s]", ibuf); + ERR(r,"REQ[%X] An incomplete multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),ibuf); break; } } @@ -339,7 +339,7 @@ chxj_rencoding(request_rec *r, const char *src, apr_size_t *len,const char *enc) iconv_close(cd); chxj_dump_string(r, APLOG_MARK, "RESULT Convert REncoding", spos, *len); - DBG(r,"REQ[%X] end chxj_rencoding()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return spos; } @@ -362,7 +362,7 @@ chxj_encoding_parameter(request_rec *r, const char *value, int xmlflag) int use_amp_flag; - DBG(r, "REQ[%X] start chxj_encoding_parameter()", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); src = apr_pstrdup(r->pool, value); @@ -376,7 +376,7 @@ chxj_encoding_parameter(request_rec *r, const char *value, int xmlflag) spos = strchr(src, '?'); if (!spos) { - DBG(r, "REQ[%X] end chxj_encoding_parameter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); if (anchor_pos) { return apr_pstrcat(r->pool, src, "#", anchor, NULL); } else { @@ -463,7 +463,7 @@ chxj_encoding_parameter(request_rec *r, const char *value, int xmlflag) } } } - DBG(r, "REQ[%X] end chxj_encoding_parameter()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); if (anchor_pos) { return apr_pstrcat(r->pool, src_sv, "?", param, "#", anchor, NULL); @@ -487,14 +487,14 @@ chxj_iconv(request_rec *r, apr_pool_t *pool, const char *src, apr_size_t *len, c if ((int)*len < 0) { - ERR(r, "runtime exception: chxj_iconv(): invalid string size.[%d]", (int)*len); + ERR(r,"REQ[%X] runtime exception: chxj_iconv(): invalid string size.[%d]", TO_ADDR(r),(int)*len); return (char *)apr_pstrdup(pool, ""); } ilen = *len; ibuf = apr_palloc(pool, ilen+1); if (ibuf == NULL) { - ERR(r, "runtime exception: chxj_iconv(): Out of memory."); + ERR(r,"REQ[%X] runtime exception: chxj_iconv(): Out of memory.",TO_ADDR(r)); return (char *)src; } memset(ibuf, 0, ilen+1); @@ -503,17 +503,17 @@ chxj_iconv(request_rec *r, apr_pool_t *pool, const char *src, apr_size_t *len, c olen = ilen * 4 + 1; spos = obuf = apr_palloc(pool, olen); if (obuf == NULL) { - ERR(r, "%s:%d runtime exception: chxj_iconv(): Out of memory", APLOG_MARK); + ERR(r,"REQ[%X] %s:%d runtime exception: chxj_iconv(): Out of memory", TO_ADDR(r),APLOG_MARK); return ibuf; } memset(obuf, 0, olen); cd = iconv_open(to, from); if (cd == (iconv_t)-1) { if (EINVAL == errno) { - ERR(r, "The conversion from %s to %s is not supported by the implementation.", from, to); + ERR(r,"REQ[%X] The conversion from %s to %s is not supported by the implementation.", TO_ADDR(r),from, to); } else { - ERR(r, "iconv open failed. from:[%s] to:[%s] errno:[%d]", from, to, errno); + ERR(r,"REQ[%X] iconv open failed. from:[%s] to:[%s] errno:[%d]", TO_ADDR(r),from, to, errno); } return ibuf; } @@ -521,13 +521,13 @@ chxj_iconv(request_rec *r, apr_pool_t *pool, const char *src, apr_size_t *len, c result = iconv(cd, &ibuf, &ilen, &obuf, &olen); if (result == (size_t)(-1)) { if (E2BIG == errno) { - ERR(r, "There is not sufficient room at *outbuf."); + ERR(r,"REQ[%X] There is not sufficient room at *outbuf.",TO_ADDR(r)); } else if (EILSEQ == errno) { - ERR(r, "An invalid multibyte sequence has been encountered in the input. input:[%s]", ibuf); + ERR(r,"REQ[%X] An invalid multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),ibuf); } else if (EINVAL == errno) { - ERR(r, "An incomplete multibyte sequence has been encountered in the input. input:[%s]", ibuf); + ERR(r,"REQ[%X] An incomplete multibyte sequence has been encountered in the input. input:[%s]", TO_ADDR(r),ibuf); } break; } diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c index b668b70e..2940a481 100644 --- a/src/chxj_hdml.c +++ b/src/chxj_hdml.c @@ -427,10 +427,9 @@ chxj_convert_hdml( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"i found qrcode xml"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* initialize hdml structure */ @@ -457,7 +456,7 @@ chxj_convert_hdml( /* The Location header generates tag in an initial HDML machine for the */ /* uncorrespon dence. */ /*------------------------------------------------------------------------*/ - DBG(r, "Location is not null[Location:%s]", buf); + DBG(r,"REQ[%X] Location is not null[Location:%s]", TO_ADDR(r),buf); s_output_to_hdml_out(&hdml, "\r\n" "\r\n" @@ -479,8 +478,8 @@ chxj_convert_hdml( memset(ss, 0, srclen + 1); memcpy(ss, src, srclen); - DBG(r, "input strlen(src)=[%d]", (int)srclen); - DBG(r, "[[[[%s]]]", src); + DBG(r,"REQ[%X] input strlen(src)=[%d]", TO_ADDR(r),(int)srclen); + DBG(r,"REQ[%X] [[[[%s]]]", TO_ADDR(r),src); qs_init_malloc(&doc); qs_init_root_node(&doc); @@ -495,7 +494,7 @@ chxj_convert_hdml( chxj_node_convert(spec,r,(void*)&hdml, &doc, qs_get_root(&doc), 0); dst = hdml.out; - DBG(r,"tmp=[%s]", dst); + DBG(r,"REQ[%X] tmp=[%s]", TO_ADDR(r),dst); qs_all_free(&doc,QX_LOGMARK); } @@ -592,7 +591,7 @@ s_hdml_search_emoji(hdml_t *hdml, char *txt, char **rslt) r = hdml->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } for (ee = hdml->conf->emoji; @@ -601,7 +600,7 @@ s_hdml_search_emoji(hdml_t *hdml, char *txt, char **rslt) unsigned char hex1byte; unsigned char hex2byte; if (! ee->imode) { - DBG(r, "emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -1509,7 +1508,7 @@ s_hdml_do_input_text_tag(hdml_t *hdml, Node *tag) val = qs_get_value_attr (doc, tag, r->pool); fmt = qs_conv_istyle_to_format(r->pool, is); - DBG(r,"qs_conv_istyle_to_format end"); + DBG(r,"REQ[%X] qs_conv_istyle_to_format end",TO_ADDR(r)); if (fmt) { if (mlen) { @@ -1791,7 +1790,7 @@ s_hdml_do_input_radio_tag(hdml_t *hdml, Node *tag) for (ii=0; iiradio_name_list[ii]) { /* @todo Oops.. */ - DBG(r, "Oops... radio list is null[%d]", ii); + DBG(r,"REQ[%X] Oops... radio list is null[%d]",TO_ADDR(r),ii); /*----------------------------------------------------------------------*/ /* Processing is ended because it doesn't happen off the fly. */ /*----------------------------------------------------------------------*/ @@ -1803,7 +1802,7 @@ s_hdml_do_input_radio_tag(hdml_t *hdml, Node *tag) } if (ii == MAX_RADIO_COUNT) { /* @todo Oops.. */ - DBG(r,"Oops... The same name was not in the list. "); + DBG(r,"REQ[%X] Oops... The same name was not in the list. ",TO_ADDR(r)); /*------------------------------------------------------------------------*/ /* Processing is ended because it doesn't happen off the fly. */ /*------------------------------------------------------------------------*/ @@ -1898,7 +1897,8 @@ s_hdml_do_input_radio_tag(hdml_t *hdml, Node *tag) } if (hdml->radio_checked_value[ii]) { - DBG(r,"radio button is checked. checked value is [%s]", + DBG(r,"REQ[%x] radio button is checked. checked value is [%s]", + TO_ADDR(r), hdml->radio_checked_value[ii]); s_output_to_init_vars(hdml, apr_psprintf(r->pool, @@ -1907,7 +1907,7 @@ s_hdml_do_input_radio_tag(hdml_t *hdml, Node *tag) hdml->radio_checked_value[ii])); } else { - DBG(r,"radio button is not checked. checked value is []"); + DBG(r,"REQ[%X] radio button is not checked. checked value is []",TO_ADDR(r)); s_output_to_init_vars(hdml, apr_psprintf(r->pool, "%s=", @@ -1950,7 +1950,7 @@ s_hdml_do_input_checkbox_tag(hdml_t *hdml, Node *tag) "RETVALS=\"_chk;;_\" >\r\n" "\r\n" ); - DBG(r, "wrote checkbox hdml card."); + DBG(r,"REQ[%X] wrote checkbox hdml card.",TO_ADDR(r)); } /*--------------------------------------------------------------------------*/ @@ -2402,17 +2402,17 @@ s_hdml_start_select_tag(void *pdoc, Node *node) hdml->var_cnt[hdml->pure_form_cnt])); selval = qs_get_selected_value(doc, node, r->pool); if (! selval) { - DBG(r, "selected value not found"); + DBG(r,"REQ[%X] selected value not found",TO_ADDR(r)); selval = qs_alloc_zero_byte_string(r->pool); } else { - DBG(r, "selected value found[%s]" , selval); + DBG(r,"REQ[%X] selected value found[%s]" , TO_ADDR(r),selval); } selvaltxt = qs_get_selected_value_text(doc, node, r->pool); if (!selvaltxt) selvaltxt = qs_alloc_zero_byte_string(r->pool); - DBG(r, "selvaltxt:[%s]" ,selvaltxt); + DBG(r,"REQ[%X] selvaltxt:[%s]",TO_ADDR(r),selvaltxt); s_output_to_init_vars(hdml, apr_psprintf(r->pool, @@ -2492,7 +2492,7 @@ s_hdml_start_option_tag(void *pdoc, Node *node) txtval = qs_get_node_value(doc, child); } - DBG(r, "txtval:[%s]" , txtval); + DBG(r,"REQ[%X] txtval:[%s]" , TO_ADDR(r),txtval); if (val && txtval) { s_output_to_hdml_card(hdml, @@ -2697,7 +2697,7 @@ s_hdml_count_radio_tag(hdml_t *hdml, Node *node) continue; } - DBG(r,"found input tag"); + DBG(r,"REQ[%X] found input tag",TO_ADDR(r)); type = qs_get_type_attr(doc, child, r->pool); if (!type) { @@ -2708,7 +2708,7 @@ s_hdml_count_radio_tag(hdml_t *hdml, Node *node) if (strcasecmp(type, "radio") != 0) continue; - DBG(r, "found type=radio"); + DBG(r, "REQ[%X] found type=radio",TO_ADDR(r)); rname = qs_get_name_attr (doc, child, r->pool); rvalue = qs_get_value_attr(doc, child, r->pool); @@ -2717,11 +2717,11 @@ s_hdml_count_radio_tag(hdml_t *hdml, Node *node) /*----------------------------------------------------------------------*/ /* Oops!. The input tag without the name attribute has been found. */ /*----------------------------------------------------------------------*/ - DBG(r, "Oops!. The input tag without the name attribute has been found. Please give a name."); + DBG(r,"REQ[%X] Oops!. The input tag without the name attribute has been found. Please give a name.",TO_ADDR(r)); continue; } - DBG(r, "found name attribute"); + DBG(r,"REQ[%X] found name attribute",TO_ADDR(r)); /*------------------------------------------------------------------------*/ /* It scans in radio_name_list. When the same value exists, the */ @@ -2730,11 +2730,11 @@ s_hdml_count_radio_tag(hdml_t *hdml, Node *node) /*------------------------------------------------------------------------*/ for (ii=0; iiradio_name_list[ii]) { - DBG(r, "new name:[%s]", rname); + DBG(r,"REQ[%X] new name:[%s]", TO_ADDR(r),rname); break; } if (strcasecmp(hdml->radio_name_list[ii], rname) == 0) { - DBG(r, "already registered name:[%s]", rname); + DBG(r,"REQ[%X] already registered name:[%s]", TO_ADDR(r),rname); break; } } @@ -2747,7 +2747,7 @@ s_hdml_count_radio_tag(hdml_t *hdml, Node *node) continue; } - DBG(r,"add radio name:[%s]" ,rname); + DBG(r,"REQ[%X] add radio name:[%s]" ,TO_ADDR(r),rname); hdml->radio_name_list[ii] = apr_pstrdup(r->pool, rname); @@ -2846,7 +2846,7 @@ s_output_to_postdata(hdml_t *hdml, char *s) qs_trim_string(r->pool, s), NULL); - DBG(r, "POSTDATA:[%s]", hdml->postdata[hdml->pure_form_cnt] ); + DBG(r, "REQ[%X] POSTDATA:[%s]", TO_ADDR(r),hdml->postdata[hdml->pure_form_cnt] ); } @@ -2903,7 +2903,7 @@ s_output_to_init_vars(hdml_t *hdml, char *s) hdml->init_vars = apr_pstrcat(r->pool, hdml->init_vars, qs_trim_string(r->pool,s), NULL); - DBG(r, "INIT_VARS:[%s]", hdml->init_vars); + DBG(r,"REQ[%X] INIT_VARS:[%s]",TO_ADDR(r),hdml->init_vars); } diff --git a/src/chxj_header_inf.c b/src/chxj_header_inf.c index 74c6f62c..70749676 100644 --- a/src/chxj_header_inf.c +++ b/src/chxj_header_inf.c @@ -33,21 +33,21 @@ chxj_header_inf_set_content_type(request_rec *r, char *default_string) char *h_out = NULL; char *err_h_out = NULL; - DBG(r,"REQ[%X] start chxj_header_inf_set_content_type()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); h_out = (char *)apr_table_get(r->headers_out, HTTP_X_CHXJ_SET_CONTENT_TYPE); err_h_out = (char *)apr_table_get(r->err_headers_out, HTTP_X_CHXJ_SET_CONTENT_TYPE); if (err_h_out) { - DBG(r,"REQ[%X] end chxj_header_inf_set_content_type()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return err_h_out; } if (h_out) { - DBG(r,"REQ[%X] end chxj_header_inf_set_content_type()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return h_out; } - DBG(r,"REQ[%X] end chxj_header_inf_set_content_type()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return default_string; } diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c index e62f2edc..493da3e0 100644 --- a/src/chxj_img_conv_format.c +++ b/src/chxj_img_conv_format.c @@ -255,26 +255,29 @@ chxj_img_conv_format_handler(request_rec *r) chxjconvrule_entry *entryp; int rtn; - DBG(r, "REQ[%X] start chxj_img_conv_format_handler()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); s_chxj_trans_name2(r); if (! r->handler || (r->handler && !STRCASEEQ('c','C',"chxj-picture",r->handler) && !STRCASEEQ('c','C',"chxj-qrcode",r->handler))) { - DBG(r, "REQ[%X] Response Code:[%d]", (unsigned int)(apr_size_t)r, r->status); - DBG(r, "REQ[%X] end chxj_img_conv_format_handler() r->handler is[%s]", TO_ADDR(r), r->handler); + DBG(r,"REQ[%X] Response Code:[%d]", TO_ADDR(r), r->status); + DBG(r,"REQ[%X] r->handler is[%s]", TO_ADDR(r), r->handler); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } qsp = s_get_query_string_param(r); conf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (conf == NULL) { - DBG(r, "REQ[%X] end chxj_img_conv_format_handler() conf is null",TO_ADDR(r)); + DBG(r,"REQ[%X] conf is null",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } if (STRCASEEQ('c','C',"chxj-qrcode",r->handler) && conf->image == CHXJ_IMG_OFF) { - DBG(r, "REQ[%X] end chxj_img_conv_format_handler() chxj-qrcode and ImageEngineOff", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] chxj-qrcode and ImageEngineOff", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } @@ -304,12 +307,12 @@ chxj_img_conv_format_handler(request_rec *r) else spec = chxj_specified_device(r, user_agent); - DBG(r,"REQ[%X] found device_name=[%s]", (unsigned int)(apr_size_t)r, spec->device_name); - DBG(r,"REQ[%X] User-Agent=[%s]", (unsigned int)(apr_size_t)r, user_agent); + DBG(r,"REQ[%X] found device_name=[%s]", TO_ADDR(r), spec->device_name); + DBG(r,"REQ[%X] User-Agent=[%s]", TO_ADDR(r), user_agent); rtn = s_img_conv_format_from_file(r, conf, user_agent, qsp, spec); - DBG(r, "REQ[%X] end chxj_img_conv_format_handler()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return rtn; } @@ -333,11 +336,12 @@ chxj_convert_image(request_rec *r, const char **src, apr_size_t *len) char *conv_check; chxjconvrule_entry *entryp; - DBG(r, "REQ[%X] start chxj_convert_image()",(unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); conv_check = (char*)apr_table_get(r->headers_in, "CHXJ_IMG_CONV"); if (conv_check) { - DBG(r, "REQ[%X] end chxj_convert_image() already convert.", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] already convert.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -345,7 +349,7 @@ chxj_convert_image(request_rec *r, const char **src, apr_size_t *len) qsp = s_get_query_string_param(r); conf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (conf == NULL) { - DBG(r, "REQ[%X] end chxj_convert_image()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -370,11 +374,12 @@ chxj_convert_image(request_rec *r, const char **src, apr_size_t *len) else spec = chxj_specified_device(r, user_agent); - DBG(r,"found device_name=[%s]", spec->device_name); - DBG(r, "User-Agent=[%s]", user_agent); + DBG(r,"REQ[%X] found device_name=[%s]",TO_ADDR(r),spec->device_name); + DBG(r,"REQ[%X] User-Agent=[%s]",TO_ADDR(r),user_agent); if (spec->width == 0 || spec->heigh == 0) { - DBG(r, "REQ[%X] end chxj_convert_image() not convert (width or height is 0)", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] not convert (width or height is 0)",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } @@ -382,7 +387,7 @@ chxj_convert_image(request_rec *r, const char **src, apr_size_t *len) if (dst == NULL) *len = 0; - DBG(r, "REQ[%X] end chxj_convert_image()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -443,7 +448,7 @@ s_img_conv_format_from_file( } if (rv == OK) break; if (rv == HTTP_NOT_FOUND) { - DBG(r, "recheck wait... try_count[%d]", try_count); + DBG(r,"REQ[%X] recheck wait... try_count[%d]", TO_ADDR(r),try_count); apr_sleep(CACHE_RECHECK_WAIT); } } while (try_count--); @@ -452,7 +457,7 @@ s_img_conv_format_from_file( WRN(r, "cache file was deleted..."); } - DBG(r,"end chxj_img_conv_format"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return rv; } @@ -522,7 +527,7 @@ s_create_cache_file(request_rec *r, APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { - DBG(r,"file open failed.[%s]", r->filename); + DBG(r,"REQ[%X] file open failed.[%s]", TO_ADDR(r),r->filename); return HTTP_NOT_FOUND; } @@ -548,7 +553,7 @@ s_create_cache_file(request_rec *r, /* for AnimationGIF */ /*------------------*/ img_count = MagickGetNumberImages(magick_wand); - DBG(r, "REQ[%X] img_count is [%d]", (unsigned int)(apr_size_t)r, img_count); + DBG(r, "REQ[%X] img_count is [%d]", TO_ADDR(r), img_count); if (img_count > 1) { MagickSetImageIndex(magick_wand, 0); MagickWand *magick_wand2 = MagickGetImage(magick_wand); @@ -680,7 +685,7 @@ s_create_cache_file(request_rec *r, /* * Add Comment (Copyright and so on.) */ - DBG(r, "call s_add_copyright()"); + DBG(r,"REQ[%X] call s_add_copyright()",TO_ADDR(r)); if ((magick_wand = s_add_copyright(magick_wand, r, spec)) == NULL) return HTTP_NOT_FOUND; @@ -727,12 +732,12 @@ s_create_cache_file(request_rec *r, writedata = apr_palloc(r->pool, writebyte); memcpy(writedata, sv_writedata, writebyte); - DBG(r, "end convert and compression"); + DBG(r,"REQ[%X] end convert and compression",TO_ADDR(r)); /* Added PNG Comment if type is image/png. */ if (r->content_type && strcmp(r->content_type, "image/png") == 0) { if ((writedata = s_add_comment_to_png(r, writedata, &writebyte)) == NULL) { - DBG(r, "REQ[%X] Add comment to PNG failure.",(unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] Add comment to PNG failure.",TO_ADDR(r)); DestroyMagickWand(magick_wand); if (sv_writedata) free(sv_writedata); return HTTP_INTERNAL_SERVER_ERROR; @@ -775,7 +780,7 @@ s_create_cache_file(request_rec *r, } if (dirf.name && strcmp(dirf.name, ".") != 0 && strcmp(dirf.name, "..") != 0) { total_size += (unsigned long)dirf.size; - DBG(r, "dirf.name=[%s] dirf.size=[%ld] dirf.atime=[%lld]", dirf.name, (long)dirf.size, (long long int)dirf.atime); + DBG(r,"REQ[%x] dirf.name=[%s] dirf.size=[%ld] dirf.atime=[%lld]", TO_ADDR(r),dirf.name, (long)dirf.size, (long long int)dirf.atime); if (dcf.atime >= dirf.atime) { memcpy(&dcf, &dirf, sizeof(apr_finfo_t)); } @@ -784,31 +789,31 @@ s_create_cache_file(request_rec *r, } apr_dir_close(dir); if (total_size + writebyte < max_size) { - DBG(r, "There is an enough size in cache. total_size:[%lu] max_size:[%lu] found_file=[%d] max_size=[%lu]", total_size, max_size, found_file, max_size); + DBG(r,"REQ[%X] There is an enough size in cache. total_size:[%lu] max_size:[%lu] found_file=[%d] max_size=[%lu]", TO_ADDR(r),total_size, max_size, found_file, max_size); break; } if (found_file == 0 && writebyte >= max_size) { - ERR(r, "=========================================="); - ERR(r, "cache space is too small..."); - ERR(r, "At least the same size as %luByte is necessary for me.", (unsigned long)writebyte); - ERR(r, "Please specify the ChxjImageCacheLimit that is larger than now value. "); - ERR(r, "=========================================="); + ERR(r,"REQ[%X] ==========================================",TO_ADDR(r)); + ERR(r,"REQ[%X] cache space is too small...",TO_ADDR(r)); + ERR(r,"REQ[%X] At least the same size as %luByte is necessary for me.", TO_ADDR(r),(unsigned long)writebyte); + ERR(r,"REQ[%X] Please specify the ChxjImageCacheLimit that is larger than now value. ",TO_ADDR(r)); + ERR(r,"REQ[%X] ==========================================",TO_ADDR(r)); if (sv_writedata) free(sv_writedata); return HTTP_INTERNAL_SERVER_ERROR; } - DBG(r, "Image Cache dir is full. total_size:[%lu] max_size:[%lu]", total_size + writebyte, max_size); + DBG(r,"REQ[%X] Image Cache dir is full. total_size:[%lu] max_size:[%lu]",TO_ADDR(r),total_size + writebyte, max_size); /* search delete candidate */ delete_file_name = apr_psprintf(r->pool, "%s/%s", conf->image_cache_dir, dcf.name); - DBG(r, "delete image cache target:[%s] atime:[%lld]", delete_file_name, (long long int)dcf.atime); + DBG(r,"REQ[%X] delete image cache target:[%s] atime:[%lld]", TO_ADDR(r),delete_file_name, (long long int)dcf.atime); rv = apr_file_remove(delete_file_name, r->pool); if (rv != APR_SUCCESS) { - ERR(r, "cache file delete failure.[%s]", delete_file_name); + ERR(r,"REQ[%X] cache file delete failure.[%s]", TO_ADDR(r),delete_file_name); if (sv_writedata) free(sv_writedata); return HTTP_INTERNAL_SERVER_ERROR; } - DBG(r, "deleted image cache target:[%s]", delete_file_name); + DBG(r,"REQ[%X] deleted image cache target:[%s]", TO_ADDR(r),delete_file_name); if (total_size + writebyte - dcf.size < max_size) { - DBG(r, "OK, there is an enough size in cache."); + DBG(r,"REQ[%X] OK, there is an enough size in cache.",TO_ADDR(r)); break; } } @@ -861,7 +866,7 @@ s_create_cache_file(request_rec *r, rv = apr_file_close(fout); if (rv != APR_SUCCESS) { - DBG(r,"file write error.[%s]", tmpfile); + DBG(r,"REQ[%X] file write error.[%s]",TO_ADDR(r),tmpfile); return HTTP_INTERNAL_SERVER_ERROR; } @@ -892,7 +897,7 @@ s_convert_to_jpeg(MagickWand *magick_wand, request_rec *r, device_table *spec) r->content_type = apr_psprintf(r->pool, "image/jpeg"); ap_set_content_type(r, "image/jpeg"); - DBG(r,"convert to jpg"); + DBG(r,"REQ[%X] convert to jpg",TO_ADDR(r)); return 0; } @@ -920,7 +925,7 @@ s_convert_to_png(MagickWand *magick_wand, request_rec *r, device_table *spec) r->content_type = apr_psprintf(r->pool, "image/png"); ap_set_content_type(r, "image/png"); - DBG(r, "convert to png"); + DBG(r,"REQ[%X] convert to png",TO_ADDR(r)); return 0; } @@ -949,7 +954,7 @@ s_convert_to_gif(MagickWand *magick_wand, request_rec *r, device_table *spec) r->content_type = apr_psprintf(r->pool, "image/gif"); ap_set_content_type(r, "image/gif"); - DBG(r,"convert to gif"); + DBG(r,"REQ[%X] convert to gif",TO_ADDR(r)); return 0; } @@ -978,7 +983,7 @@ s_convert_to_bmp(MagickWand *magick_wand, request_rec *r, device_table *spec) r->content_type = apr_psprintf(r->pool, "image/bmp"); ap_set_content_type(r, "image/bmp"); - DBG(r, "convert to bmp(unsupported)"); + DBG(r,"REQ[%X] convert to bmp(unsupported)",TO_ADDR(r)); return 0; } @@ -1020,7 +1025,7 @@ s_create_blob_data(request_rec *r, /* * The size of the image is changed. */ - DBG(r,"call s_fixup_size()"); + DBG(r,"REQ[%X] call s_fixup_size()",TO_ADDR(r)); if ((magick_wand = s_fixup_size(magick_wand, r, spec, qsp)) == NULL) { EXIT_MAGICK_ERROR(); @@ -1032,7 +1037,7 @@ s_create_blob_data(request_rec *r, /* * The colors of the image is changed. */ - DBG(r,"call s_fixup_color()"); + DBG(r,"REQ[%X] call s_fixup_color()",TO_ADDR(r)); if ((magick_wand = s_fixup_color(magick_wand, r,spec, mode)) == NULL) { EXIT_MAGICK_ERROR(); @@ -1042,7 +1047,7 @@ s_create_blob_data(request_rec *r, /* * DEPTH of the image is changed. */ - DBG(r,"call s_fixup_depth()"); + DBG(r,"REQ[%X] call s_fixup_depth()",TO_ADDR(r)); if ((magick_wand = s_fixup_depth(magick_wand, r, spec)) == NULL) { EXIT_MAGICK_ERROR(); @@ -1054,7 +1059,7 @@ s_create_blob_data(request_rec *r, /* * The size of the image is changed. */ - DBG(r,"call s_fixup_size()"); + DBG(r,"REQ[%X] call s_fixup_size()",TO_ADDR(r)); if ((magick_wand = s_fixup_size(magick_wand, r, spec, qsp)) == NULL) { EXIT_MAGICK_ERROR(); return NULL; @@ -1091,7 +1096,7 @@ s_create_blob_data(request_rec *r, } } - DBG(r,"start convert and compression"); + DBG(r,"REQ[%X] start convert and compression",TO_ADDR(r)); if (!fixFormatFlag) { if (spec->available_jpeg) { @@ -1118,7 +1123,7 @@ s_create_blob_data(request_rec *r, /*--------------------------------------------------------------------------*/ /* Add Comment (Copyright and so on.) */ /*--------------------------------------------------------------------------*/ - DBG(r,"call s_add_copyright()"); + DBG(r,"REQ[%X] call s_add_copyright()",TO_ADDR(r)); if ((magick_wand = s_add_copyright(magick_wand, r, spec)) == NULL) return NULL; @@ -1127,11 +1132,11 @@ s_create_blob_data(request_rec *r, if (! writebyte) { DestroyMagickWand(magick_wand); - DBG(r,"convert failure to Jpeg "); + DBG(r,"REQ[%X] convert failure to Jpeg ",TO_ADDR(r)); return NULL; } - DBG(r,"end convert and compression"); + DBG(r,"REQ[%X] end convert and compression",TO_ADDR(r)); @@ -1173,14 +1178,14 @@ s_fixup_size(MagickWand *magick_wand, oldw = MagickGetImageWidth(magick_wand); oldh = MagickGetImageHeight(magick_wand); - DBG(r,"detect width=[%d]", oldw); - DBG(r,"detect heigh=[%d]", oldh); + DBG(r,"REQ[%X] detect width=[%d]", TO_ADDR(r),oldw); + DBG(r,"REQ[%X] detect heigh=[%d]", TO_ADDR(r),oldh); neww = oldw; newh = oldh; - DBG(r,"detect spec width=[%d]", spec->width); - DBG(r,"detect spec heigh=[%d]", spec->heigh); + DBG(r,"REQ[%X] detect spec width=[%d]", TO_ADDR(r),spec->width); + DBG(r,"REQ[%X] detect spec heigh=[%d]", TO_ADDR(r),spec->heigh); c_width = spec->width; c_heigh = spec->heigh; @@ -1188,7 +1193,7 @@ s_fixup_size(MagickWand *magick_wand, switch(mode) { case IMG_CONV_MODE_THUMBNAIL: - DBG(r,"**** detect thumbnail mode ****"); + DBG(r,"REQ[%X] **** detect thumbnail mode ****",TO_ADDR(r)); if (neww > c_width) { newh = (int)((double)newh * (double)((double)c_width / (double)neww)); @@ -1206,24 +1211,24 @@ s_fixup_size(MagickWand *magick_wand, case IMG_CONV_MODE_WALLPAPER: case IMG_CONV_MODE_EZGET: - DBG(r,"**** detect wallpaper mode ****"); + DBG(r,"REQ[%X] **** detect wallpaper mode ****",TO_ADDR(r)); if (spec->wp_width && spec->wp_heigh) { c_width = spec->wp_width; c_heigh = spec->wp_heigh; } - DBG(r,"calc new width and height"); + DBG(r,"REQ[%X] calc new width and height",TO_ADDR(r)); neww = (int)((double)neww * (double)((double)c_heigh / (double)newh)); newh = (int)((double)newh * (double)((double)c_heigh / (double)newh)); - DBG(r,"newh = [%d] neww = [%d]", newh, neww); + DBG(r,"REQ[%X] newh = [%d] neww = [%d]", TO_ADDR(r),newh, neww); break; default: - DBG(r,"**** detect normal mode ****"); + DBG(r,"REQ[%X] **** detect normal mode ****",TO_ADDR(r)); if (qsp->ua_flag != UA_IGN && spec->html_spec_type != CHXJ_SPEC_UNKNOWN) { if (neww > c_width) { @@ -1243,8 +1248,8 @@ s_fixup_size(MagickWand *magick_wand, if (newh == 0) newh = 1; if (spec->html_spec_type != CHXJ_SPEC_UNKNOWN) { - DBG(r,"convert width=[%d --> %d]", oldw, neww); - DBG(r,"convert heigh=[%d --> %d]", oldh, newh); + DBG(r,"REQ[%X] convert width=[%d --> %d]", TO_ADDR(r),oldw, neww); + DBG(r,"REQ[%X] convert heigh=[%d --> %d]", TO_ADDR(r),oldh, newh); MagickResetIterator(magick_wand); @@ -1270,11 +1275,11 @@ s_fixup_size(MagickWand *magick_wand, case IMG_CONV_MODE_NORMAL: if (qsp->width) { - DBG(r,"convert width=[%d --> %d]", neww, qsp->width); + DBG(r,"REQ[%X] convert width=[%d --> %d]", TO_ADDR(r),neww, qsp->width); neww = qsp->width; } if (qsp->height) { - DBG(r,"convert heigh=[%d --> %d]", newh, qsp->height); + DBG(r,"REQ[%X] convert heigh=[%d --> %d]", TO_ADDR(r),newh, qsp->height); newh = qsp->height; } @@ -1313,23 +1318,25 @@ s_fixup_size(MagickWand *magick_wand, static MagickWand * s_fixup_color(MagickWand *magick_wand, request_rec *r, device_table *spec, img_conv_mode_t UNUSED(mode)) { - DBG(r,"start chxj_fixup_clor()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (spec->html_spec_type == CHXJ_SPEC_UNKNOWN) { - DBG(r, "Pass s_fixup_color proc"); + DBG(r,"REQ[%X] Pass s_fixup_color proc",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return magick_wand; } unsigned long colors = MagickGetImageColors(magick_wand); - DBG(r, "now color:[%ld] spec->color:[%ld]", colors, (unsigned long)spec->color); + DBG(r,"REQ[%X] now color:[%ld] spec->color:[%ld]", TO_ADDR(r),colors, (unsigned long)spec->color); if (colors < (unsigned long)spec->color) { - DBG(r, "Pass s_fixup_color proc. color:[%ld] spec->color:[%d]", colors, spec->color); + DBG(r,"REQ[%X] Pass s_fixup_color proc. color:[%ld] spec->color:[%d]", TO_ADDR(r),colors, spec->color); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return magick_wand; } if (spec->color >= 256) { - DBG(r,"call MagickQuantizeImage() spec->color=[%d]",spec->color); + DBG(r,"REQ[%X] call MagickQuantizeImage() spec->color=[%d]",TO_ADDR(r),spec->color); if (MagickQuantizeImage(magick_wand, spec->color, @@ -1341,11 +1348,11 @@ s_fixup_color(MagickWand *magick_wand, request_rec *r, device_table *spec, img_c return NULL; } - DBG(r,"call end MagickQuantizeImage() spec->color=[%d]",spec->color); + DBG(r,"REQ[%X] call end MagickQuantizeImage() spec->color=[%d]",TO_ADDR(r),spec->color); } else { - DBG(r,"call MagickQuantizeImage() spec->color=[%d]",spec->color); + DBG(r,"REQ[%X] call MagickQuantizeImage() spec->color=[%d]",TO_ADDR(r),spec->color); if (MagickQuantizeImage(magick_wand, spec->color, @@ -1357,11 +1364,11 @@ s_fixup_color(MagickWand *magick_wand, request_rec *r, device_table *spec, img_c return NULL; } - DBG(r,"call end MagickQuantizeImage() spec->color=[%d]",spec->color); + DBG(r,"REQ[%X] call end MagickQuantizeImage() spec->color=[%d]",TO_ADDR(r),spec->color); } - DBG(r,"end chxj_fixup_clor()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return magick_wand; } @@ -1372,7 +1379,7 @@ static MagickWand * s_fixup_depth(MagickWand *magick_wand, request_rec *r, device_table *spec) { if (spec->html_spec_type == CHXJ_SPEC_UNKNOWN) { - DBG(r, "Pass s_fixup_depth proc"); + DBG(r,"REQ[%X] Pass s_fixup_depth proc",TO_ADDR(r)); return magick_wand; } @@ -1435,13 +1442,13 @@ s_add_copyright(MagickWand *magick_wand, request_rec *r, device_table *spec) mod_chxj_config *conf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (spec->html_spec_type == CHXJ_SPEC_UNKNOWN) { - DBG(r, "Pass add_copiright proc"); + DBG(r,"REQ[%X] Pass add_copiright proc",TO_ADDR(r)); return magick_wand; } if (conf->image_copyright) { - DBG(r, "Add COPYRIGHT [%s]", conf->image_copyright); + DBG(r,"REQ[%X] Add COPYRIGHT [%s]", TO_ADDR(r),conf->image_copyright); if (spec->html_spec_type == CHXJ_SPEC_Jhtml || spec->html_spec_type == CHXJ_SPEC_Jxhtml) { @@ -1511,7 +1518,7 @@ s_img_down_sizing(MagickWand *magick_wand, request_rec *r, device_table *spec) writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte); if (writebyte >= prev_size) { - DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte); + DBG(r,"REQ[%X] quality=[%ld] size=[%d]", TO_ADDR(r),(long)quality, (int)writebyte); quality += 5; if (quality > 100) { if (MagickSetImageCompression(magick_wand,NoCompression) == MagickFalse) { @@ -1527,7 +1534,7 @@ s_img_down_sizing(MagickWand *magick_wand, request_rec *r, device_table *spec) break; } - DBG(r, "quality=[%ld] size=[%d]", (long)quality, (int)writebyte); + DBG(r,"REQ[%X] quality=[%ld] size=[%d]", TO_ADDR(r),(long)quality, (int)writebyte); if (spec->cache == 0) break; @@ -1597,7 +1604,7 @@ s_img_down_sizing(MagickWand *magick_wand, request_rec *r, device_table *spec) } writedata = (char*)MagickGetImageBlob(magick_wand, &writebyte); - DBG(r,"now_color=[%ld] size=[%d]", (long)now_color, (int)writebyte); + DBG(r,"REQ[%X] now_color=[%ld] size=[%d]",TO_ADDR(r),(long)now_color, (int)writebyte); /* Once per request */ break; @@ -1644,7 +1651,7 @@ s_send_cache_file( contentLength = apr_psprintf(r->pool, "%d", (int)st.size); apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength); - DBG(r,"Content-Length:[%d]", (int)st.size); + DBG(r,"REQ[%X] Content-Length:[%d]", TO_ADDR(r),(int)st.size); MagickWand *magick_wand = NewMagickWand(); if (MagickReadImage(magick_wand,tmpfile) == MagickFalse) { EXIT_MAGICK_ERROR(); @@ -1659,28 +1666,28 @@ s_send_cache_file( DestroyMagickWand(magick_wand); if (nowFormat) { if (STRCASEEQ('j','J',"jpeg",nowFormat) || STRCASEEQ('j','J',"jpg",nowFormat)) { - DBG(r, "detect cache file => jpg."); + DBG(r,"REQ[%X] detect cache file => jpg.",TO_ADDR(r)); ap_set_content_type(r, "image/jpeg"); } else if (STRCASEEQ('p','P',"png", nowFormat)) { - DBG(r, "detect cache file => png."); + DBG(r,"REQ[%X] detect cache file => png.",TO_ADDR(r)); ap_set_content_type(r, "image/png"); } else if (STRCASEEQ('g','G',"gif", nowFormat)) { - DBG(r, "detect cache file => gif."); + DBG(r,"REQ[%X] detect cache file => gif.",TO_ADDR(r)); ap_set_content_type(r, "image/gif"); } else if (STRCASEEQ('b','B',"bmp", nowFormat)) { - DBG(r, "detect cache file => bmp."); + DBG(r,"REQ[%X] detect cache file => bmp.",TO_ADDR(r)); ap_set_content_type(r, "image/bmp"); } else { - ERR(r, "detect unknown file"); + ERR(r,"REQ[%X] detect unknown file",TO_ADDR(r)); return HTTP_NOT_FOUND; } } if (conf->image_copyright) { - DBG(r, "REQ[%X] Add COPYRIGHT Header for SoftBank [%s]", TO_ADDR(r), conf->image_copyright); + DBG(r,"REQ[%X] Add COPYRIGHT Header for SoftBank [%s]", TO_ADDR(r), conf->image_copyright); if (spec->html_spec_type == CHXJ_SPEC_Jhtml || spec->html_spec_type == CHXJ_SPEC_Jxhtml) { apr_table_setn(r->headers_out, "x-jphone-copyright", "no-transfer"); } @@ -1689,7 +1696,7 @@ s_send_cache_file( APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { - DBG(r, "cache file open failed[%s]", tmpfile); + DBG(r,"REQ[%X] cache file open failed[%s]", TO_ADDR(r),tmpfile); return HTTP_NOT_FOUND; } ap_send_fd(fout, r, 0, st.size, &sendbyte); @@ -1740,21 +1747,21 @@ s_send_cache_file( contentLength = apr_psprintf(r->pool, "%ld", query_string->count); apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength); - DBG(r, "Content-Length:[%d]", (int)st.size); + DBG(r,"REQ[%X] Content-Length:[%d]", TO_ADDR(r),(int)st.size); rv = apr_file_open(&fout, tmpfile, APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { - DBG(r,"tmpfile open failed[%s]", tmpfile); + DBG(r,"REQ[%X] tmpfile open failed[%s]", TO_ADDR(r),tmpfile); return HTTP_NOT_FOUND; } ap_send_fd(fout, r, query_string->offset, query_string->count, &sendbyte); apr_file_close(fout); ap_rflush(r); - DBG(r, "send file data[%d]byte", (int)sendbyte); + DBG(r,"REQ[%X] send file data[%d]byte", TO_ADDR(r),(int)sendbyte); } } @@ -1786,14 +1793,14 @@ s_send_original_file(request_rec *r, const char *originalfile) APR_FOPEN_READ | APR_FOPEN_BINARY | APR_FOPEN_BUFFERED | APR_FOPEN_SHARELOCK | APR_FOPEN_SENDFILE_ENABLED, APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { - DBG(r, "originalfile open failed[%s]", originalfile); + DBG(r,"REQ[%X] originalfile open failed[%s]", TO_ADDR(r),originalfile); return HTTP_NOT_FOUND; } ap_send_fd(fout, r, 0, st.size, &sendbyte); apr_file_close(fout); ap_rflush(r); - DBG(r, "send file data[%d]byte", (int)sendbyte); + DBG(r,"REQ[%x] send file data[%d]byte", TO_ADDR(r),(int)sendbyte); return OK; } @@ -1807,11 +1814,11 @@ s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, char *contentLength; mod_chxj_config *conf = ap_get_module_config(r->per_dir_config, &chxj_module); - DBG(r, "REQ[%X] start s_header_only_cache_file()", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); rv = apr_stat(&st, tmpfile, APR_FINFO_MIN, r->pool); if (rv != APR_SUCCESS) { - DBG(r, "REQ[%X] end s_header_only_cache_file()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return HTTP_NOT_FOUND; } @@ -1838,19 +1845,19 @@ s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, DestroyMagickWand(magick_wand); if (nowFormat) { if (STRCASEEQ('j','J',"jpeg",nowFormat) || STRCASEEQ('j','J',"jpg",nowFormat)) { - DBG(r, "detect cache file => jpg."); + DBG(r,"REQ[%x] detect cache file => jpg.",TO_ADDR(r)); ap_set_content_type(r, "image/jpeg"); } else if (STRCASEEQ('p','P',"png", nowFormat)) { - DBG(r, "detect cache file => png."); + DBG(r,"REQ[%X] detect cache file => png.",TO_ADDR(r)); ap_set_content_type(r, "image/png"); } else if (STRCASEEQ('g','G',"gif", nowFormat)) { - DBG(r, "detect cache file => gif."); + DBG(r,"REQ[%X] detect cache file => gif.",TO_ADDR(r)); ap_set_content_type(r, "image/gif"); } else if (STRCASEEQ('b','B',"bmp", nowFormat)) { - DBG(r, "detect cache file => bmp."); + DBG(r,"REQ[%X] detect cache file => bmp.",TO_ADDR(r)); ap_set_content_type(r, "image/bmp"); } else { @@ -1859,7 +1866,7 @@ s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, } } - DBG(r,"Content-Length:[%d]", (int)st.size); + DBG(r,"REQ[%X] Content-Length:[%d]", TO_ADDR(r),(int)st.size); } else if (query_string->mode == IMG_CONV_MODE_EZGET) { @@ -1906,7 +1913,7 @@ s_header_only_cache_file(device_table *spec, query_string_param_t *query_string, } } - DBG(r, "REQ[%X] end s_header_only_cache_file()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return OK; } @@ -1953,20 +1960,20 @@ s_create_workfile_name( /* for SoftBank */ new_user_agent = chxj_preg_replace(r->pool, v_softbank_serial_pattern1, " ", new_user_agent); - DBG(r, "old user_agent:[%s] ==> new user_agent:[%s]", user_agent, new_user_agent); + DBG(r,"REQ[%X] old user_agent:[%s] ==> new user_agent:[%s]", TO_ADDR(r),user_agent, new_user_agent); memset(w, 0, 256); switch (qsp->mode) { case IMG_CONV_MODE_THUMBNAIL: fname = apr_psprintf(r->pool, "%s.%s.thumbnail", r->filename, new_user_agent); - DBG(r, "mode=thumbnail [%s]", fname); + DBG(r,"REQ[%X] mode=thumbnail [%s]", TO_ADDR(r),fname); break; case IMG_CONV_MODE_WALLPAPER: case IMG_CONV_MODE_EZGET: fname = apr_psprintf(r->pool, "%s.%s.wallpaper", r->filename, new_user_agent); - DBG(r, "mode=WallPaper [%s]", fname); + DBG(r,"REQ[%X] mode=WallPaper [%s]", TO_ADDR(r),fname); break; case IMG_CONV_MODE_NORMAL: @@ -1980,7 +1987,7 @@ s_create_workfile_name( if (qsp->height) fname = apr_psprintf(r->pool, "%s.h%d", fname, qsp->height); - DBG(r,"mode=normal [%s]", fname); + DBG(r,"REQ[%X] mode=normal [%s]", TO_ADDR(r),fname); break; } if (qsp->ua_flag == UA_IGN) { @@ -2052,22 +2059,24 @@ chxj_trans_name(request_rec *r) int do_ext_check = TRUE; int next_ok = FALSE; - DBG(r, "start chxj_trans_name()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); conf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (conf == NULL) { - DBG(r, "end chxj_trans_name() conf is null[%s]", r->uri); + DBG(r,"REQ[%X] conf is null[%s]", TO_ADDR(r),r->uri); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } if (conf->image != CHXJ_IMG_ON) { - DBG(r, "end chxj_trans_name() conf not found"); + DBG(r,"REQ[%X] conf not found",TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } - DBG(r,"Match URI[%s]", r->uri); + DBG(r,"REQ[%X] Match URI[%s]", TO_ADDR(r),r->uri); if (r->filename == NULL) @@ -2079,7 +2088,7 @@ chxj_trans_name(request_rec *r) else filename_sv = r->filename; - DBG(r,"r->filename[%s]", filename_sv); + DBG(r,"REQ[%X] r->filename[%s]", TO_ADDR(r),filename_sv); ccp = ap_document_root(r); if (ccp == NULL) @@ -2099,7 +2108,7 @@ chxj_trans_name(request_rec *r) else filename_sv = apr_pstrcat(r->pool, docroot, filename_sv, NULL); - DBG(r,"URI[%s]", filename_sv); + DBG(r,"REQ[%X] URI[%s]", TO_ADDR(r),filename_sv); do_ext_check = TRUE; for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) { @@ -2121,7 +2130,7 @@ chxj_trans_name(request_rec *r) else fname = apr_psprintf(r->pool, "%s.%s", filename_sv, ext[ii]); - DBG(r,"search [%s]", fname); + DBG(r,"REQ[%X] search [%s]", TO_ADDR(r),fname); rv = apr_stat(&st, fname, APR_FINFO_MIN, r->pool); if (rv == APR_SUCCESS) { @@ -2133,7 +2142,7 @@ chxj_trans_name(request_rec *r) } } if (fname == NULL) { - DBG(r,"NotFound [%s]", r->filename); + DBG(r,"REQ[%X] NotFound [%s]", TO_ADDR(r),r->filename); return DECLINED; } for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) { @@ -2147,12 +2156,12 @@ chxj_trans_name(request_rec *r) } if (! next_ok) { - DBG(r,"NotFound [%s]", r->filename); + DBG(r,"REQ[%X] NotFound [%s]", TO_ADDR(r),r->filename); return DECLINED; } if (r->handler == NULL || strcasecmp(r->handler, "chxj-qrcode") != 0) { - DBG(r,"Found [%s]", fname); + DBG(r,"REQ[%X] Found [%s]", TO_ADDR(r),fname); r->filename = apr_psprintf(r->pool, "%s", fname); @@ -2161,7 +2170,7 @@ chxj_trans_name(request_rec *r) else r->handler = apr_psprintf(r->pool, "chxj-picture"); } - DBG(r, "end chxj_trans_name()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return OK; } @@ -2193,31 +2202,34 @@ s_chxj_trans_name2(request_rec *r) int do_ext_check = TRUE; int next_ok = FALSE; - DBG(r, "REQ[%X] start chxj_trans_name2()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); conf = chxj_get_module_config(r->per_dir_config, &chxj_module); if (conf == NULL) { - DBG(r, "REQ[%X] end chxj_trans_name2() conf is null[%s]", (unsigned int)(apr_size_t)r, r->uri); + DBG(r,"REQ[%X] conf is null[%s]", TO_ADDR(r), r->uri); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } if (conf->image != CHXJ_IMG_ON) { - DBG(r, "REQ[%X] end chxj_trans_name2() ImageEngineOff", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] ImageEngineOff", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } - DBG(r,"Match URI[%s]", r->uri); + DBG(r,"REQ[%X] Match URI[%s]", TO_ADDR(r),r->uri); if (r->filename == NULL) { - DBG(r, "REQ[%X] end chxj_trans_name2() r->filename is null", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] r->filename is null", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } filename_sv = r->filename; - DBG(r,"REQ[%x] r->filename[%s]", (unsigned int)(apr_size_t)r, filename_sv); + DBG(r,"REQ[%x] r->filename[%s]", TO_ADDR(r), filename_sv); do_ext_check = TRUE; for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) { @@ -2239,7 +2251,7 @@ s_chxj_trans_name2(request_rec *r) else fname = apr_psprintf(r->pool, "%s.%s", filename_sv, ext[ii]); - DBG(r,"search [%s]", fname); + DBG(r,"REQ[%X] search [%s]", TO_ADDR(r),fname); rv = apr_stat(&st, fname, APR_FINFO_MIN, r->pool); if (rv == APR_SUCCESS) { @@ -2251,7 +2263,7 @@ s_chxj_trans_name2(request_rec *r) } } if (fname == NULL) { - DBG(r,"NotFound [%s]", r->filename); + DBG(r,"REQ[%X] NotFound [%s]", TO_ADDR(r),r->filename); return DECLINED; } for (ii=0; ii<(int)(sizeof(ext)/sizeof(ext[0])); ii++) { @@ -2265,12 +2277,12 @@ s_chxj_trans_name2(request_rec *r) } if (! next_ok) { - DBG(r,"NotFound [%s]", r->filename); + DBG(r,"REQ[%X] NotFound [%s]", TO_ADDR(r),r->filename); return DECLINED; } if (r->handler == NULL || strcasecmp(r->handler, "chxj-qrcode") != 0) { - DBG(r,"Found [%s]", fname); + DBG(r,"REQ[%X] Found [%s]", TO_ADDR(r),fname); r->filename = apr_psprintf(r->pool, "%s", fname); @@ -2279,7 +2291,7 @@ s_chxj_trans_name2(request_rec *r) else r->handler = apr_psprintf(r->pool, "chxj-picture"); } - DBG(r, "REQ[%X] end chxj_trans_name()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return OK; } @@ -2426,7 +2438,7 @@ s_add_comment_to_png(request_rec *r, char *data, apr_size_t *len) uint32_t crc; mod_chxj_config *conf = chxj_get_module_config(r->per_dir_config, &chxj_module); - DBG(r, "REQ[%X] start s_add_comment_to_png()",(unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (conf->image_copyright) { apr_pool_create(&pool, r->pool); @@ -2437,7 +2449,8 @@ s_add_comment_to_png(request_rec *r, char *data, apr_size_t *len) total_tEXt_size = 4 + 4 + klen + vlen + 1 + 4; result = apr_palloc(pool, total_tEXt_size + *len); if (!result) { - DBG(r, "REQ[%X] memory allocation error.", (unsigned int)(apr_size_t)r); + ERR(r, "REQ[%X] memory allocation error.", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } pos = PNG_SIG_AND_IHDR_SZ; @@ -2471,12 +2484,12 @@ s_add_comment_to_png(request_rec *r, char *data, apr_size_t *len) pos += 4; memcpy(&result[pos], &data[PNG_SIG_AND_IHDR_SZ] , *len - PNG_SIG_AND_IHDR_SZ); *len = *len + total_tEXt_size; - DBG(r, "REQ[%X] writebyte:[%d]", (unsigned int)(apr_size_t)r, (unsigned int)*len); + DBG(r,"REQ[%X] writebyte:[%d]", TO_ADDR(r), (unsigned int)*len); } else { result = data; } - DBG(r, "REQ[%X] end s_add_comment_to_png()",(unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #undef PNG_SIG_AND_IHDR_SZ #undef PNG_COPYRIGHT_KEY #undef PNG_COPYRIGHT_VAL diff --git a/src/chxj_ixhtml10.c b/src/chxj_ixhtml10.c index a9682a85..770762ce 100755 --- a/src/chxj_ixhtml10.c +++ b/src/chxj_ixhtml10.c @@ -485,10 +485,9 @@ chxj_convert_ixhtml10( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"I found qrcode xml"); + DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r)); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -607,7 +606,7 @@ s_ixhtml10_search_emoji(ixhtml10_t *ixhtml10, char *txt, char **rslt, Node *node r = ixhtml10->doc->r; if (!spec) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } @@ -615,7 +614,7 @@ s_ixhtml10_search_emoji(ixhtml10_t *ixhtml10, char *txt, char **rslt, Node *node ee; ee = ee->next) { if (ee->imode == NULL) { - DBG(r, "emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -671,7 +670,7 @@ s_ixhtml10_start_html_tag(void *pdoc, Node *UNUSED(node)) ixhtml10 = GET_IXHTML10(pdoc); doc = ixhtml10->doc; r = doc->r; - DBG(r, "REQ[%X] start s_ixhtml10_start_html_tag()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); W_L("spec->output_encoding); @@ -685,7 +684,7 @@ s_ixhtml10_start_html_tag(void *pdoc, Node *UNUSED(node)) /*--------------------------------------------------------------------------*/ W_L(""); - DBG(r, "REQ[%X] end s_ixhtml10_start_html_tag()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); ixhtml10->start_html_flag = 1; return ixhtml10->out; @@ -3775,7 +3774,7 @@ s_ixhtml10_start_img_tag(void *pdoc, Node *node) if (attr_src) { W_L(" src=\""); W_V(attr_src); - DBG(r,"mode is %d -> %s",ixhtml10->conf->image_rewrite_mode, attr_src); + DBG(r,"REQ[%X] mode is %d -> %s",TO_ADDR(r),ixhtml10->conf->image_rewrite_mode, attr_src); W_L("\""); } if (attr_align || attr_hspace || attr_vspace || css_float || css_margin_left || css_margin_right || css_margin_top || css_margin_bottom || css_valign ) { @@ -6350,9 +6349,9 @@ s_ixhtml10_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); ixhtml10->style = chxj_css_parse_from_uri(doc->r, doc->pool, ixhtml10->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return ixhtml10->out; @@ -6659,9 +6658,9 @@ s_ixhtml10_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); ixhtml10->style = chxj_css_parse_style_value(doc, ixhtml10->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return ixhtml10->out; diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c index 47c01462..bac758fa 100644 --- a/src/chxj_jhtml.c +++ b/src/chxj_jhtml.c @@ -470,10 +470,9 @@ chxj_convert_jhtml( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"I found qrcode xml"); + DBG(r,"REQ[%X] I found qrcode xml",TO_ADDR(r)); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -584,7 +583,7 @@ s_jhtml_search_emoji(jhtml_t *jhtml, char *txt, char **rslt) len = strlen(txt); r = jhtml->doc->r; - if (! spec) DBG(r,"spec is NULL"); + if (! spec) DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); for (ee = jhtml->conf->emoji; ee; @@ -594,7 +593,7 @@ s_jhtml_search_emoji(jhtml_t *jhtml, char *txt, char **rslt) unsigned char hex2byte; if (! ee->imode) { - DBG(r,"emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -643,7 +642,7 @@ chxj_jhtml_emoji_only_converter(request_rec *r, device_table *spec, const char * jhtml = &__jhtml; doc = &__doc; - DBG(r, "REQ[%X] start chxj_jhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(jhtml, 0, sizeof(jhtml_t)); @@ -684,7 +683,7 @@ chxj_jhtml_emoji_only_converter(request_rec *r, device_table *spec, const char * } jhtml->out = chxj_buffered_write_flush(jhtml->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_jhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return jhtml->out; } @@ -708,14 +707,14 @@ s_jhtml_start_html_tag(void *pdoc, Node *UNUSED(node)) jhtml = GET_JHTML(pdoc); doc = jhtml->doc; r = doc->r; - DBG(r, "start s_jhtml_start_html_tag()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /*--------------------------------------------------------------------------*/ /* start HTML tag */ /*--------------------------------------------------------------------------*/ W_L(""); - DBG(r, "end s_jhtml_start_html_tag()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return jhtml->out; } @@ -3504,7 +3503,7 @@ s_jhtml_text_tag(void *pdoc, Node *child) jhtml = GET_JHTML(pdoc); doc = jhtml->doc; r = doc->r; - DBG(r, "start s_jhtml_text_tag()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); textval = qs_get_node_value(doc,child); if (strlen(textval) == 0) { @@ -3555,7 +3554,7 @@ s_jhtml_text_tag(void *pdoc, Node *child) tdst = chxj_conv_z2h(r, tdst, &z2h_input_len, jhtml->entryp); W_V(tdst); - DBG(r, "end s_jhtml_text_tag()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return jhtml->out; } @@ -5240,9 +5239,9 @@ s_jhtml_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); jhtml->style = chxj_css_parse_from_uri(doc->r, doc->pool, jhtml->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return jhtml->out; @@ -5568,9 +5567,9 @@ s_jhtml_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); jhtml->style = chxj_css_parse_style_value(doc, jhtml->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return jhtml->out; @@ -5586,7 +5585,7 @@ s_add_copyright_parameter(request_rec *r, char *value) char *content_type = NULL; apr_table_t *headers_out = NULL; - DBG(r, "REQ[%X] start s_add_copyright_parameter", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_pool_create(&pool, r->pool); if (chxj_starts_with(value, "http:") || chxj_starts_with(value, "https:")) { @@ -5594,7 +5593,8 @@ s_add_copyright_parameter(request_rec *r, char *value) int response_code = 0; response = chxj_serf_head(r, pool, value, &response_code); if (response_code != HTTP_OK) { - DBG(r, "REQ[%X] end s_add_copyright_parameter (serf_req->status:[%d])", TO_ADDR(r), response_code); + DBG(r,"REQ[%X] (serf_req->status:[%d])", TO_ADDR(r), response_code); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return value; } content_type = (char *)apr_table_get(response, "Content-Type"); @@ -5604,8 +5604,9 @@ s_add_copyright_parameter(request_rec *r, char *value) // sub_req = ap_sub_req_method_uri("GET", value, r, r->output_filters); sub_req = ap_sub_req_lookup_uri(value, r, r->output_filters); if (sub_req->status != HTTP_OK) { - DBG(r, "REQ[%X] end s_add_copyright_parameter (sub_req->status:[%d])", TO_ADDR(r), sub_req->status); + DBG(r,"REQ[%X] (sub_req->status:[%d])", TO_ADDR(r), sub_req->status); ap_destroy_sub_req(sub_req); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return value; } sub_req->header_only = 1; @@ -5637,7 +5638,8 @@ s_add_copyright_parameter(request_rec *r, char *value) if (sub_req) { ap_destroy_sub_req(sub_req); } - DBG(r, "REQ[%X] end s_add_copyright_parameter(result:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] (result:[%s]", TO_ADDR(r), value); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return value; } diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c index 639c2161..d9e793e8 100755 --- a/src/chxj_jxhtml.c +++ b/src/chxj_jxhtml.c @@ -481,10 +481,9 @@ chxj_convert_jxhtml( *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst) { - DBG(r,"I found qrcode xml"); + DBG(r,"REQ[%X] I found qrcode xml",TO_ADDR(r)); return dst; } - DBG(r,"not found qrcode xml"); /*--------------------------------------------------------------------------*/ /* The CHTML structure is initialized. */ @@ -596,7 +595,7 @@ s_jxhtml_search_emoji(jxhtml_t *jxhtml, char *txt, char **rslt) len = strlen(txt); r = jxhtml->doc->r; - if (! spec) DBG(r,"spec is NULL"); + if (! spec) DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); for (ee = jxhtml->conf->emoji; ee; @@ -606,7 +605,7 @@ s_jxhtml_search_emoji(jxhtml_t *jxhtml, char *txt, char **rslt) unsigned char hex2byte; if (! ee->imode) { - DBG(r,"emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -655,7 +654,7 @@ chxj_jxhtml_emoji_only_converter(request_rec *r, device_table *spec, const char jxhtml = &__jxhtml; doc = &__doc; - DBG(r, "REQ[%X] start chxj_jxhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(jxhtml, 0, sizeof(jxhtml_t)); @@ -696,7 +695,7 @@ chxj_jxhtml_emoji_only_converter(request_rec *r, device_table *spec, const char } jxhtml->out = chxj_buffered_write_flush(jxhtml->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_jxhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return jxhtml->out; } @@ -720,7 +719,7 @@ s_jxhtml_start_html_tag(void *pdoc, Node *UNUSED(node)) jxhtml = GET_JXHTML(pdoc); doc = jxhtml->doc; r = doc->r; - DBG(r, "REQ[%X] start s_jxhtml_start_html_tag()", TO_ADDR(r)); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); W_L("spec->output_encoding); @@ -736,7 +735,7 @@ s_jxhtml_start_html_tag(void *pdoc, Node *UNUSED(node)) jxhtml->start_html_flag = 1; - DBG(r, "REQ[%X] end s_jxhtml_start_html_tag()", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return jxhtml->out; } @@ -6344,9 +6343,9 @@ s_jxhtml_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); jxhtml->style = chxj_css_parse_from_uri(doc->r, doc->pool, jxhtml->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return jxhtml->out; @@ -6651,9 +6650,9 @@ s_jxhtml_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); jxhtml->style = chxj_css_parse_style_value(doc, jxhtml->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return jxhtml->out; diff --git a/src/chxj_memcache.c b/src/chxj_memcache.c index fe0cb543..58e444de 100644 --- a/src/chxj_memcache.c +++ b/src/chxj_memcache.c @@ -76,7 +76,7 @@ _memcache_cleanup(void *UNUSED(unused)) int chxj_memcache_init(request_rec *r, mod_chxj_config *m) { - DBG(r, "start chxj_memcache_init()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! memc) { if (!chxj_memcache_and_memcache_server_create(r, m)) { ERR(r, "%s:%d end chxj_memcache_init() failed: chxj_memcache_and_memcache_server_create()", APLOG_MARK); @@ -84,7 +84,7 @@ chxj_memcache_init(request_rec *r, mod_chxj_config *m) } apr_pool_cleanup_register(r->pool, NULL, _memcache_cleanup, _memcache_cleanup); } - DBG(r, "end chxj_memcache_init()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -92,7 +92,7 @@ int chxj_memcache_and_memcache_server_create(request_rec *r, mod_chxj_config *m) { memcached_return rc; - DBG(r, "start chxj_memcache_server_create()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memc = memcached_create(NULL); if (! memc) { @@ -126,7 +126,7 @@ chxj_memcache_and_memcache_server_create(request_rec *r, mod_chxj_config *m) return CHXJ_FALSE; } - DBG(r, "end chxj_memcache_server_create()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -136,7 +136,7 @@ chxj_memcache_set_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ { memcached_return rc; time_t timeout = (time_t) ((m->cookie_timeout) ? m->cookie_timeout : DEFAULT_COOKIE_TIMEOUT); - DBG(r, "start chxj_memcache_set_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); rc= memcached_set(memc, (char *)cookie_id, strlen(cookie_id), (char *)store_string, strlen(store_string), @@ -146,7 +146,7 @@ chxj_memcache_set_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ return CHXJ_FALSE; } - DBG(r, "end chxj_memcache_set_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -155,7 +155,7 @@ int chxj_memcache_reset_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_id) { char *store_string; - DBG(r, "start chxj_memcache_reset_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! (store_string = chxj_memcache_get_cookie(r, m, cookie_id))) { ERR(r, "%s:%d end chxj_memcache_reset_cookie() failed: chxj_memcache_get_cookie() cookie_id:[%s]", APLOG_MARK, cookie_id); @@ -167,7 +167,7 @@ chxj_memcache_reset_cookie(request_rec *r, mod_chxj_config *m, const char *cooki return CHXJ_FALSE; } - DBG(r, "end chxj_memcache_reset_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -181,7 +181,7 @@ chxj_memcache_get_cookie(request_rec *r, mod_chxj_config *UNUSED(m), const char uint32_t flags; memcached_return rc; - DBG(r, "start chxj_memcache_get_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); load_string = memcached_get(memc, (char *)cookie_id, strlen(cookie_id), &value_length, &flags, &rc); if (rc != MEMCACHED_SUCCESS) { @@ -191,7 +191,7 @@ chxj_memcache_get_cookie(request_rec *r, mod_chxj_config *UNUSED(m), const char ret = apr_pstrdup(r->pool, load_string); free(load_string); - DBG(r, "end chxj_memcache_get_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ret; } @@ -201,7 +201,7 @@ chxj_memcache_delete_cookie(request_rec *r, mod_chxj_config *UNUSED(m), const c { memcached_return rc; - DBG(r, "start chxj_memcache_delete_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); rc = memcached_delete(memc, (char *)cookie_id, strlen(cookie_id), (time_t)0); if (rc != MEMCACHED_SUCCESS && rc == MEMCACHED_BUFFERED) { @@ -209,7 +209,7 @@ chxj_memcache_delete_cookie(request_rec *r, mod_chxj_config *UNUSED(m), const c return CHXJ_FALSE; } - DBG(r, "end chxj_memcache_delete_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -218,7 +218,7 @@ chxj_memcache_delete_cookie(request_rec *r, mod_chxj_config *UNUSED(m), const c int chxj_save_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie_id, const char *store_string) { - DBG(r, "start chxj_save_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_save_cookie_memcache(): Cannot create memcache server: cookie_id:[%s] store_string:[%s]", APLOG_MARK, cookie_id, store_string); @@ -231,8 +231,9 @@ chxj_save_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie return CHXJ_FALSE; } - DBG(r, "stored DATA:[%s]", chxj_memcache_get_cookie(r, m, cookie_id)); - DBG(r, "end chxj_save_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] stored DATA:[%s]", TO_ADDR(r),chxj_memcache_get_cookie(r, m, cookie_id)); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -240,7 +241,8 @@ chxj_save_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie int chxj_update_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie_id, const char *store_string) { - DBG(r, "start chxj_update_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_update_cookie_memcache(): Cannot create memcache server: cookie_id:[%s] store_string:[%s]",APLOG_MARK,cookie_id, store_string); return CHXJ_FALSE; @@ -252,7 +254,8 @@ chxj_update_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cook APLOG_MARK, m->memcache.host, m->memcache.port, cookie_id, store_string); return CHXJ_FALSE; } - DBG(r, "end chxj_update_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -261,7 +264,8 @@ char * chxj_load_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie_id) { char *load_string; - DBG(r, "start chxj_load_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_load_cookie_memcache(): Cannot create memcache server: cookie_id:[%s]",APLOG_MARK, cookie_id); @@ -273,7 +277,8 @@ chxj_load_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie m->memcache.host, m->memcache.port, cookie_id); return NULL; } - DBG(r, "end chxj_load_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); return load_string; } @@ -281,7 +286,8 @@ chxj_load_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie int chxj_delete_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cookie_id) { - DBG(r, "start chxj_delete_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_delete_cookie_memcache(): Cannot create memcache server: cookie_id:[%s]",APLOG_MARK, cookie_id); return CHXJ_FALSE; @@ -292,7 +298,8 @@ chxj_delete_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cook m->memcache.host, m->memcache.port, cookie_id); return CHXJ_FALSE; } - DBG(r, "end chxj_delete_cookie_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -300,7 +307,8 @@ chxj_delete_cookie_memcache(request_rec *r, mod_chxj_config *m, const char *cook int chxj_save_cookie_expire_memcache(request_rec *r, mod_chxj_config *m, const char *cookie_id) { - DBG(r, "start chxj_save_cookie_expire_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_save_cookie_expire_memcache(): Cannot create memcache server: cookie_id:[%s]",APLOG_MARK,cookie_id); return CHXJ_FALSE; @@ -311,7 +319,8 @@ chxj_save_cookie_expire_memcache(request_rec *r, mod_chxj_config *m, const char m->memcache.host, m->memcache.port, cookie_id); return CHXJ_FALSE; } - DBG(r, "end chxj_save_cookie_expire_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -319,9 +328,11 @@ chxj_save_cookie_expire_memcache(request_rec *r, mod_chxj_config *m, const char int chxj_delete_cookie_expire_memcache(request_rec *r, mod_chxj_config *UNUSED(m), const char *cookie_id) { - DBG(r, "start chxj_delete_cookie_expire_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); /* PASS */ - DBG(r, "end chxj_delete_cookie_expire_memcache() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -329,9 +340,9 @@ chxj_delete_cookie_expire_memcache(request_rec *r, mod_chxj_config *UNUSED(m), c int chxj_cookie_expire_gc_memcache(request_rec *r, mod_chxj_config *UNUSED(m)) { - DBG(r, "start chxj_cookie_expire_gc_memcache()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /* PASS */ - DBG(r, "end chxj_cookie_expire_gc_memcache()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -344,7 +355,7 @@ chxj_cookie_lock_memcache(request_rec *r, mod_chxj_config *m) apr_uint32_t timeout = (apr_uint32_t) ((m->cookie_timeout) ? m->cookie_timeout : DEFAULT_COOKIE_TIMEOUT); apr_interval_time_t wait_time = MEMCACHE_WAIT_MICRO_SECOND; - DBG(r, "start chxj_cookie_lock_memcache()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! chxj_memcache_init(r, m)) { ERR(r, "%s:%d end chxj_cookie_lock_memcache(): Cannot create memcache server", APLOG_MARK); @@ -361,7 +372,7 @@ chxj_cookie_lock_memcache(request_rec *r, mod_chxj_config *m) } if (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_STORED) { /* got lock */ - DBG(r, "got lock"); + DBG(r,"REQ[%X] got lock",TO_ADDR(r)); break; } retry_count++; @@ -372,7 +383,7 @@ chxj_cookie_lock_memcache(request_rec *r, mod_chxj_config *m) apr_sleep(wait_time); } - DBG(r, "end chxj_cookie_lock_memcache()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -380,7 +391,7 @@ chxj_cookie_lock_memcache(request_rec *r, mod_chxj_config *m) int chxj_cookie_unlock_memcache(request_rec *r, mod_chxj_config *m) { - DBG(r, "start chxj_cookie_unlock_memcache()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! memc) { ERR(r, "%s:%d end chxj_cookie_unlock_memcache(): runtime exception: programing failure.", APLOG_MARK); return CHXJ_FALSE; @@ -390,7 +401,7 @@ chxj_cookie_unlock_memcache(request_rec *r, mod_chxj_config *m) ERR(r, "%s:%d end chxj_cookie_unlock_memcache(): failed: chxj_memcache_delete_cookie() (lock data)", APLOG_MARK); return CHXJ_FALSE; } - DBG(r, "end chxj_cookie_unlock_memcache()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } diff --git a/src/chxj_mysql.c b/src/chxj_mysql.c index ed8de3b6..fe1e7784 100644 --- a/src/chxj_mysql.c +++ b/src/chxj_mysql.c @@ -84,8 +84,8 @@ chxj_open_mysql_handle(request_rec *r, mod_chxj_config *m) && (m->mysql.username && strcmp(m->mysql.username, connection.username) == 0)) { if (m->mysql.database && strcmp(m->mysql.database, connection.database) == 0) { - DBG(r, "already connected"); - DBG(r, "end chxj_open_mysql_handle()"); + DBG(r,"REQ[%X] already connected",TO_ADDR(r)); + DBG(r,"REQ[%X] end chxj_open_mysql_handle()",TO_ADDR(r)); return 1; } else { @@ -95,7 +95,7 @@ chxj_open_mysql_handle(request_rec *r, mod_chxj_config *m) } else { strcpy (connection.database, m->mysql.database); - DBG(r, "already connected. new database:[%s]", m->mysql.database); + DBG(r,"REQ[%X] already connected. new database:[%s]", TO_ADDR(r),m->mysql.database); return 1; } } @@ -118,13 +118,15 @@ chxj_open_mysql_handle(request_rec *r, mod_chxj_config *m) connection.handle = mysql_real_connect(&mysql_conn,connection.host,m->mysql.username, m->mysql.password, NULL, m->mysql.port, m->mysql.socket_path, 0); if (!connection.handle) { - ERR(r, "MySQL ERROR: %s. host:[%s] username:[%s] password:[%s] port:[%d] socket_path:[%s]", mysql_error(&mysql_conn), + ERR(r,"REQ[%X] MySQL ERROR: %s. host:[%s] username:[%s] password:[%s] port:[%d] socket_path:[%s]", + TO_ADDR(r), + mysql_error(&mysql_conn), connection.host, m->mysql.username, m->mysql.password, m->mysql.port, m->mysql.socket_path); - DBG(r, "end chxj_open_mysql_handle()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 0; } @@ -145,12 +147,12 @@ chxj_open_mysql_handle(request_rec *r, mod_chxj_config *m) if (m->mysql.charset) { apr_snprintf(query, sizeof(query)-1, "SET CHARACTER SET %s", m->mysql.charset); if (mysql_query(connection.handle, query) != 0) { - ERR(r, "%s:%d MySQL ERROR: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); + ERR(r, "REQ[%X] %s:%d MySQL ERROR: %s: %s", TO_ADDR(r),APLOG_MARK, mysql_error(connection.handle), r->uri); return 0; } } - DBG(r, "end chxj_open_mysql_handle()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -163,8 +165,9 @@ chxj_mysql_exist_cookie_table(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "desc %s", m->mysql.tablename); - DBG(r, "start chxj_mysql_exist_cookie_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d failed chxj_open_mysql_handle() query:[%s]", APLOG_MARK, query); @@ -191,7 +194,8 @@ chxj_mysql_exist_cookie_table(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_exist_cookie_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -205,9 +209,9 @@ chxj_mysql_exist_cookie_table_expire(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "desc %s_expire", m->mysql.tablename); - - DBG(r, "start chxj_mysql_exist_cookie_table_expire() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { @@ -234,7 +238,8 @@ chxj_mysql_exist_cookie_table_expire(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_exist_cookie_table_expire() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -248,10 +253,11 @@ chxj_mysql_create_cookie_table(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "CREATE TABLE %s (cookie_id VARCHAR(%d) NOT NULL, data TEXT, PRIMARY KEY(cookie_id)) TYPE=InnoDB;", m->mysql.tablename, apr_base64_encode_len(APR_MD5_DIGESTSIZE) * 3); - DBG(r, "start chxj_mysql_create_cookie_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d failed chxj_open_mysql_handle() query:[%s]", APLOG_MARK, query); @@ -278,7 +284,8 @@ chxj_mysql_create_cookie_table(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_create_cookie_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -291,11 +298,12 @@ chxj_mysql_create_cookie_expire_table(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "CREATE TABLE %s_expire (cookie_id VARCHAR(%d) NOT NULL, created_at DATETIME, PRIMARY KEY(cookie_id)) TYPE=InnoDB;", m->mysql.tablename, apr_base64_encode_len(APR_MD5_DIGESTSIZE) * 3); - DBG(r, "start chxj_mysql_create_cookie_expire_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { @@ -323,7 +331,8 @@ chxj_mysql_create_cookie_expire_table(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_create_cookie_expire_table() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -340,10 +349,11 @@ chxj_mysql_get_cookie_from_cookie_id(request_rec *r, mod_chxj_config *m, const c int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); mysql_escape_string(sql_safe_cookie_id,cookie_id,clen); apr_snprintf(query, sizeof(query)-1, "SELECT data, length(data) FROM %s WHERE cookie_id = '%s'", m->mysql.tablename, sql_safe_cookie_id); - DBG(r, "start chxj_mysql_get_cookie_from_cookie_id() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d failed chxj_open_mysql_handle() query:[%s]", APLOG_MARK, query); @@ -383,7 +393,8 @@ chxj_mysql_get_cookie_from_cookie_id(request_rec *r, mod_chxj_config *m, const c if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_get_cookie_from_cookie_id() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return retval; } @@ -400,12 +411,13 @@ chxj_mysql_get_cookie_expire_from_cookie_id(request_rec *r, mod_chxj_config *m, int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); mysql_escape_string(sql_safe_cookie_id,cookie_id,clen); apr_snprintf(query, sizeof(query)-1, "SELECT DATE_FORMAT(created_at, '%%Y%%m%%d%%H%%i%%s') FROM %s_expire WHERE cookie_id = '%s'", m->mysql.tablename, sql_safe_cookie_id); - DBG(r, "start chxj_mysql_get_cookie_expire_from_cookie_id() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { @@ -444,7 +456,8 @@ chxj_mysql_get_cookie_expire_from_cookie_id(request_rec *r, mod_chxj_config *m, } if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_get_cookie_expire_from_cookie_id() query:[%s] retval:[%s]", query, retval); + DBG(r,"REQ[%X] query:[%s] retval:[%s]", TO_ADDR(r),query, retval); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return retval; } @@ -460,7 +473,8 @@ chxj_mysql_insert_or_update_cookie(request_rec *r, mod_chxj_config *m, const cha int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_insert_or_update_cookie() data:[%s]", data); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] data:[%s]", TO_ADDR(r),data); do { if (!chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d failed chxj_open_mysql_handle()", APLOG_MARK); @@ -487,7 +501,7 @@ chxj_mysql_insert_or_update_cookie(request_rec *r, mod_chxj_config *m, const cha while(0); apr_snprintf(query, sizeof(query)-1, "INSERT INTO %s (cookie_id, data) VALUES ('%s','%s');", m->mysql.tablename, cid, cdt); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { WRN(r, "MySQL WARN: %s: %s", mysql_error(connection.handle), r->uri); if (!chxj_mysql_get_cookie_from_cookie_id(r, m, cookie_id)) { @@ -495,7 +509,7 @@ chxj_mysql_insert_or_update_cookie(request_rec *r, mod_chxj_config *m, const cha return 0; } apr_snprintf(query, sizeof(query)-1, "UPDATE %s set data = '%s' WHERE cookie_id = '%s';", m->mysql.tablename, cdt, cid); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -504,7 +518,7 @@ chxj_mysql_insert_or_update_cookie(request_rec *r, mod_chxj_config *m, const cha } apr_snprintf(query, sizeof(query)-1, "COMMIT;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -514,7 +528,7 @@ chxj_mysql_insert_or_update_cookie(request_rec *r, mod_chxj_config *m, const cha result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_get_cookie_from_cookie_id()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -529,7 +543,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_insert_or_update_cookie_expire()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); do { if (!chxj_open_mysql_handle(r, m)) { @@ -538,7 +552,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co } connection.reconnect = 0; apr_snprintf(query, sizeof(query)-1, "BEGIN;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { if (mysql_errno(connection.handle) == CR_SERVER_GONE_ERROR) { connection.reconnect = 1; @@ -557,7 +571,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co while(0); apr_snprintf(query, sizeof(query)-1, "INSERT INTO %s_expire (cookie_id, created_at) VALUES ('%s',localtime);", m->mysql.tablename, cid); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { WRN(r, "MySQL WARN: %s: %s", mysql_error(connection.handle), r->uri); if (!chxj_mysql_get_cookie_from_cookie_id(r, m, cookie_id)) { @@ -565,7 +579,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co return 0; } apr_snprintf(query, sizeof(query)-1, "UPDATE %s_expire set created_at = localtime WHERE cookie_id = '%s';", m->mysql.tablename, cid); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -574,7 +588,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co } apr_snprintf(query, sizeof(query)-1, "COMMIT;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -584,7 +598,7 @@ chxj_mysql_insert_or_update_cookie_expire(request_rec *r, mod_chxj_config *m, co result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_insert_or_update_cookie_expire()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -595,7 +609,7 @@ chxj_mysql_rollback(request_rec *r, mod_chxj_config *m) { char query[MAX_STRING_LEN]; - DBG(r, "start chxj_mysql_rollback()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "ROLLBACK;"); @@ -607,7 +621,7 @@ chxj_mysql_rollback(request_rec *r, mod_chxj_config *m) ERR(r, "%s:%d MySQL ERROR: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); return 0; /* FALSE */ } - DBG(r, "end chxj_mysql_rollback()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -622,11 +636,12 @@ chxj_mysql_load_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_id int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); mysql_escape_string(sql_safe_cookie_id,cookie_id,clen); apr_snprintf(query, sizeof(query)-1, "SELECT data, length(data) FROM %s WHERE cookie_id = '%s';", m->mysql.tablename, sql_safe_cookie_id); - DBG(r, "start chxj_mysql_load_cookie() query:[%s]", query); + DBG(r, "REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { @@ -667,7 +682,8 @@ chxj_mysql_load_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_id } if (result) mysql_free_result(result); - DBG(r, "end chxj_load_mysql_cookie() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return retval; } @@ -684,6 +700,7 @@ chxj_mysql_load_cookie_expire(request_rec *r, mod_chxj_config *m, const char *co int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); mysql_escape_string(sql_safe_cookie_id,cookie_id,clen); apr_snprintf(query, @@ -692,7 +709,7 @@ chxj_mysql_load_cookie_expire(request_rec *r, mod_chxj_config *m, const char *co m->mysql.tablename, sql_safe_cookie_id); - DBG(r, "start chxj_mysql_load_cookie_expire() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); do { if (!chxj_open_mysql_handle(r, m)) { @@ -730,7 +747,8 @@ chxj_mysql_load_cookie_expire(request_rec *r, mod_chxj_config *m, const char *co } if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_load_cookie_expire() query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return retval; } @@ -745,7 +763,8 @@ chxj_mysql_delete_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_delete_cookie() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); do { if (!chxj_open_mysql_handle(r, m)) { @@ -754,7 +773,7 @@ chxj_mysql_delete_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ } connection.reconnect = 0; apr_snprintf(query, sizeof(query)-1, "BEGIN;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { if (mysql_errno(connection.handle) == CR_SERVER_GONE_ERROR) { connection.reconnect = 1; @@ -777,7 +796,7 @@ chxj_mysql_delete_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ return 0; } apr_snprintf(query, sizeof(query)-1, "DELETE FROM %s WHERE cookie_id = '%s';", m->mysql.tablename, cid); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -785,7 +804,7 @@ chxj_mysql_delete_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ } apr_snprintf(query, sizeof(query)-1, "COMMIT;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -795,7 +814,7 @@ chxj_mysql_delete_cookie(request_rec *r, mod_chxj_config *m, const char *cookie_ result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_delete_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -810,7 +829,8 @@ chxj_mysql_delete_cookie_expire(request_rec *r, mod_chxj_config *m, const char * int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_delete_cookie_expire() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); do { if (!chxj_open_mysql_handle(r, m)) { @@ -819,7 +839,7 @@ chxj_mysql_delete_cookie_expire(request_rec *r, mod_chxj_config *m, const char * } connection.reconnect = 0; apr_snprintf(query, sizeof(query)-1, "BEGIN;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { if (mysql_errno(connection.handle) == CR_SERVER_GONE_ERROR) { connection.reconnect = 1; @@ -842,7 +862,7 @@ chxj_mysql_delete_cookie_expire(request_rec *r, mod_chxj_config *m, const char * return 0; } apr_snprintf(query, sizeof(query)-1, "DELETE FROM %s_expire WHERE cookie_id = '%s';", m->mysql.tablename, cid); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK,mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -850,7 +870,7 @@ chxj_mysql_delete_cookie_expire(request_rec *r, mod_chxj_config *m, const char * } apr_snprintf(query, sizeof(query)-1, "COMMIT;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -860,7 +880,8 @@ chxj_mysql_delete_cookie_expire(request_rec *r, mod_chxj_config *m, const char * result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_delete_cookie_expire() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]",TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -874,7 +895,7 @@ chxj_mysql_get_timeout_localtime(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_get_timeout_localtime()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); do { if (!chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d failed chxj_open_mysql_handle()", APLOG_MARK); @@ -883,7 +904,7 @@ chxj_mysql_get_timeout_localtime(request_rec *r, mod_chxj_config *m) connection.reconnect = 0; apr_snprintf(query, sizeof(query)-1, "SELECT DATE_SUB(localtime, interval %ld second);", (m->cookie_timeout == 0) ? DEFAULT_COOKIE_TIMEOUT : m->cookie_timeout); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { if (mysql_errno(connection.handle) == CR_SERVER_GONE_ERROR) { connection.reconnect = 1; @@ -914,7 +935,7 @@ chxj_mysql_get_timeout_localtime(request_rec *r, mod_chxj_config *m) } if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_get_timeout_localtime()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return retval; } @@ -928,7 +949,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) int retry_count = 0; apr_interval_time_t wait_time = CHXJ_MYSQL_RECONNECT_WAIT_TIME; - DBG(r, "start chxj_mysql_delete_expired_cookie()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); do { if (!chxj_open_mysql_handle(r, m)) { @@ -937,7 +958,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) } connection.reconnect = 0; apr_snprintf(query, sizeof(query)-1, "BEGIN;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { if (mysql_errno(connection.handle) == CR_SERVER_GONE_ERROR) { connection.reconnect = 1; @@ -962,7 +983,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) } apr_snprintf(query, sizeof(query)-1, "SELECT * FROM %s_expire WHERE created_at <= '%s'", m->mysql.tablename, timeout); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK,mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -981,7 +1002,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) timeout, m->mysql.tablename, m->mysql.tablename); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL ERROR: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -997,7 +1018,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) m->mysql.tablename, m->mysql.tablename, timeout); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL ERROR: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -1008,7 +1029,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) result = NULL; apr_snprintf(query, sizeof(query)-1, "COMMIT;"); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]",TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { ERR(r, "%s:%d MySQL WARN: %s: %s", APLOG_MARK, mysql_error(connection.handle), r->uri); chxj_mysql_rollback(r, m); @@ -1018,7 +1039,7 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_mysql_delete_expired_cookie()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return 1; } @@ -1035,59 +1056,64 @@ chxj_mysql_delete_expired_cookie(request_rec *r, mod_chxj_config *m) int chxj_save_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id, const char *store_string) { - DBG(r, "start chxj_save_cookie_mysql()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "Cannot open mysql connection"); - DBG(r, "end chxj_save_cookie_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table(r, m)) { - DBG(r, "not found cookie table:[%s]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_table(r, m)) { ERR(r, "cannot create cookie table:[%s]", m->mysql.tablename); - DBG(r, "end chxj_save_cookie_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } if (! chxj_mysql_insert_or_update_cookie(r, m, cookie_id, store_string)) { ERR(r, "cannot store to cookie table:[%s]", m->mysql.tablename); - DBG(r, "end chxj_save_cookie_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } /* *NEED NOT* close database. */ - DBG(r, "end chxj_save_cookie_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } int chxj_update_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id, const char *store_string) { - DBG(r, "start chxj_update_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "Cannot open mysql connection"); - DBG(r, "end chxj_update_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table(r, m)) { - DBG(r, "not found cookie table:[%s]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s]",TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_table(r, m)) { ERR(r, "cannot create cookie table:[%s]", m->mysql.tablename); - DBG(r, "end chxj_update_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } if (! chxj_mysql_insert_or_update_cookie(r, m, cookie_id, store_string)) { ERR(r, "cannot create cookie table:[%s]", m->mysql.tablename); - DBG(r, "end chxj_update_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } /* *NEED NOT* close database. */ /* chxj_close_mysql_handle(); */ - DBG(r, "end chxj_update_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1097,30 +1123,35 @@ chxj_load_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id { char *load_string; - DBG(r, "start chxj_load_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "Cannot open mysql connection"); - DBG(r, "end chxj_load_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } if (!chxj_mysql_exist_cookie_table(r, m)) { - DBG(r, "not found cookie table:[%s]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_table(r, m)) { ERR(r, "cannot create cookie table:[%s]", m->mysql.tablename); - DBG(r, "end chxj_load_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } } if (!(load_string = chxj_mysql_load_cookie(r, m, cookie_id))) { ERR(r, "%s:%d not found cookie. cookie_id:[%s]", APLOG_MARK, cookie_id); - DBG(r, "end chxj_load_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } /* *NEED NOT* close database. */ /* chxj_close_mysql_handle(); */ - DBG(r, "end chxj_load_cookie_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return load_string; } @@ -1128,13 +1159,14 @@ chxj_load_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id int chxj_delete_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id) { - DBG(r, "start chxj_delete_cookie_mysql() cookie_id=[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r),cookie_id); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d Cannot open mysql connection cookie_id=[%s]", APLOG_MARK, cookie_id); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table(r, m)) { - DBG(r, "not found cookie table:[%s]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_table(r, m)) { ERR(r, "%s:%d cannot create cookie table:[%s]", APLOG_MARK, m->mysql.tablename); return CHXJ_FALSE; @@ -1146,7 +1178,8 @@ chxj_delete_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_ return CHXJ_FALSE; } } - DBG(r, "end chxj_delete_cookie_mysql() cookie_id=[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id=[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1154,14 +1187,15 @@ chxj_delete_cookie_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_ int chxj_save_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id) { - DBG(r, "start chxj_save_cookie_expire_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d Cannot open mysql connection cookie_id=[%s]",APLOG_MARK, cookie_id); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table_expire(r, m)) { - DBG(r, "not found cookie table:[%s_expire]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s_expire]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_expire_table(r, m)) { ERR(r, "%s:%d cannot create cookie table:[%s_expire] cookie_id:[%s]", APLOG_MARK, m->mysql.tablename, cookie_id); return CHXJ_FALSE; @@ -1175,7 +1209,8 @@ chxj_save_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char *co /* *NEED NOT* close database. */ /* chxj_close_mysql_handle(); */ - DBG(r, "end chxj_save_cookie_expire_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1183,14 +1218,15 @@ chxj_save_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char *co int chxj_delete_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char *cookie_id) { - DBG(r, "start chxj_delete_cookie_expire_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "%s:%d Cannot open mysql connection", APLOG_MARK); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table_expire(r, m)) { - DBG(r, "not found cookie table:[%s_expire]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s_expire]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_expire_table(r, m)) { ERR(r, "%s:%d cannot create cookie table:[%s_expire] cookie_id:[%s]", APLOG_MARK, m->mysql.tablename, cookie_id); return CHXJ_FALSE; @@ -1201,7 +1237,8 @@ chxj_delete_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char * return CHXJ_FALSE; } } - DBG(r, "end chxj_delete_cookie_expire_mysql() cookie_id:[%s]", cookie_id); + DBG(r,"REQ[%X] cookie_id:[%s]", TO_ADDR(r),cookie_id); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1209,14 +1246,14 @@ chxj_delete_cookie_expire_mysql(request_rec *r, mod_chxj_config *m, const char * int chxj_cookie_expire_gc_mysql(request_rec *r, mod_chxj_config *m) { - DBG(r, "start chxj_cookie_expire_gc_mysql()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "Cannot open mysql connection"); - DBG(r, "end chxj_cookie_expire_gc_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table_expire(r, m)) { - DBG(r, "not found cookie table:[%s_expire]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s_expire]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_expire_table(r, m)) { ERR(r, "%s:%d cannot create cookie table:[%s_expire]", APLOG_MARK, m->mysql.tablename); return CHXJ_FALSE; @@ -1227,7 +1264,7 @@ chxj_cookie_expire_gc_mysql(request_rec *r, mod_chxj_config *m) return CHXJ_FALSE; } } - DBG(r, "end chxj_cookie_expire_gc_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1237,22 +1274,22 @@ chxj_cookie_lock_mysql(request_rec *r, mod_chxj_config *m) { MYSQL_RES *result; char query[MAX_STRING_LEN]; - DBG(r, "start chxj_cookie_lock_mysql()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (! chxj_open_mysql_handle(r, m)) { ERR(r, "Cannot open mysql connection"); - DBG(r, "end chxj_save_cookie_expire_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } if (!chxj_mysql_exist_cookie_table_expire(r, m)) { - DBG(r, "not found cookie table:[%s_expire]", m->mysql.tablename); + DBG(r,"REQ[%X] not found cookie table:[%s_expire]", TO_ADDR(r),m->mysql.tablename); if (!chxj_mysql_create_cookie_expire_table(r, m)) { ERR(r, "cannot create cookie table:[%s_expire]", m->mysql.tablename); - DBG(r, "end chxj_cookie_expire_gc_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_FALSE; } } apr_snprintf(query, sizeof(query)-1, "LOCK TABLES %s WRITE", m->mysql.tablename); - DBG(r, "query:[%s]", query); + DBG(r,"REQ[%X] query:[%s]", TO_ADDR(r),query); if (mysql_query(connection.handle, query) != 0) { chxj_mysql_rollback(r, m); ERR(r, "MySQL WARN: %s: %s", mysql_error(connection.handle), r->uri); @@ -1262,7 +1299,7 @@ chxj_cookie_lock_mysql(request_rec *r, mod_chxj_config *m) result = mysql_store_result(connection.handle); if (result) mysql_free_result(result); - DBG(r, "end chxj_cookie_lock_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } @@ -1271,16 +1308,16 @@ int chxj_cookie_unlock_mysql(request_rec *r, mod_chxj_config *UNUSED(m)) { char query[MAX_STRING_LEN]; - if (r) DBG(r, "start chxj_cookie_unlock_mysql()"); + if (r) DBG(r, "REQ[%X] start %s()",TO_ADDR(r),__func__); apr_snprintf(query, sizeof(query)-1, "UNLOCK TABLES"); if (mysql_query(connection.handle, query) != 0) { if (r) { ERR(r, "MySQL WARN: %s: %s", mysql_error(connection.handle), r->uri); - DBG(r, "end chxj_cookie_unlock_mysql()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); } return CHXJ_FALSE; } - if (r) DBG(r, "end chxj_cookie_unlock_mysql()"); + if (r) DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return CHXJ_TRUE; } #endif diff --git a/src/chxj_qr_code.c b/src/chxj_qr_code.c index 3915082d..c4841b28 100644 --- a/src/chxj_qr_code.c +++ b/src/chxj_qr_code.c @@ -591,10 +591,10 @@ chxj_qr_code_handler(request_rec *r) Node *root; mod_chxj_config *conf; - DBG(r,"start chxj_qr_code_handler()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); if (strcasecmp(r->handler, "chxj-qrcode")) { - DBG(r, "end chxj_qr_code_handler()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return DECLINED; } @@ -618,19 +618,24 @@ chxj_qr_code_handler(request_rec *r) qrcode.found = QR_NOT_FOUND; chxj_qrcode_node_to_qrcode(&qrcode, root); - if (qrcode.found == QR_NOT_FOUND) + if (qrcode.found == QR_NOT_FOUND) { + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return HTTP_NOT_FOUND; + } qs_all_free(&doc,QX_LOGMARK); sts = chxj_qrcode_create_image_data(&qrcode, &img, &len); - if (sts != OK) + if (sts != OK) { + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return sts; + } chxj_set_content_type(r, "image/jpg"); ap_rwrite((void *)img, len, r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return OK; } @@ -644,7 +649,7 @@ chxj_qr_code_blob_handler(request_rec *r, const char *indata, size_t *len) char *img; Node *root; - DBG(r, "start chxj_qr_code_blob_handler()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(&doc, 0, sizeof(Doc)); memset(&qrcode, 0, sizeof(qr_code_t)); @@ -660,18 +665,20 @@ chxj_qr_code_blob_handler(request_rec *r, const char *indata, size_t *len) chxj_qrcode_node_to_qrcode(&qrcode, root); qs_all_free(&doc,QX_LOGMARK); - if (qrcode.found == QR_NOT_FOUND) + if (qrcode.found == QR_NOT_FOUND) { + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; + } sts = chxj_qrcode_create_image_data(&qrcode, &img, len); if (sts != OK) { - DBG(r, "end chxj_qr_code_blob_handler()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } chxj_set_content_type(r, "image/jpg"); - DBG(r, "end chxj_qr_code_blob_handler()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return img; } @@ -693,7 +700,7 @@ chxj_qrcode_create_image_data( char **module; #ifdef QR_CODE_DEBUG - DBG(r,"start s_create_image_file()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); #endif module_count = v_module_count_table[qrcode->version]; @@ -769,7 +776,7 @@ chxj_qrcode_create_image_data( goto on_error; #ifdef QR_CODE_DEBUG - DBG(r,"convert to jpg"); + DBG(r,"REQ[%X] convert to jpg",TO_ADDR(r)); #endif tmp = (unsigned char*)MagickGetImageBlob(magick_wand,img_len); @@ -782,7 +789,7 @@ chxj_qrcode_create_image_data( #ifdef QR_CODE_DEBUG - DBG(r, "end chxj_qr_code_handler()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif return OK; @@ -810,7 +817,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) int module_count = v_module_count_table[qrcode->version]; #ifdef QR_CODE_DEBUG - DBG(r,"start chxj_qr_code()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); #endif do { /*------------------------------------------------------------------------*/ @@ -818,7 +825,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /*------------------------------------------------------------------------*/ binstr = apr_psprintf(r->pool, "%s", s_get_mode_spec(qrcode)); #ifdef QR_CODE_DEBUG - DBG(r,"s_get_mode_spec()"); + DBG(r,"REQ[%X] s_get_mode_spec()",TO_ADDR(r)); #endif /*------------------------------------------------------------------------*/ @@ -827,7 +834,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) binstr = apr_pstrcat(r->pool, binstr, s_get_char_bit_count(qrcode, strlen(qrcode->indata)), NULL); #ifdef QR_CODE_DEBUG - DBG(r, "s_get_char_bit_count()[%s]", binstr); + DBG(r,"REQ[%X] s_get_char_bit_count()[%s]", TO_ADDR(r),binstr); #endif /*------------------------------------------------------------------------*/ @@ -835,7 +842,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /*------------------------------------------------------------------------*/ data_code_count = v_data_code_count[qrcode->version][qrcode->level]; #ifdef QR_CODE_DEBUG - DBG(r,"data_code_count=[%d]", data_code_count); + DBG(r,"REQ[%X] data_code_count=[%d]", TO_ADDR(r),data_code_count); #endif /*------------------------------------------------------------------------*/ @@ -872,7 +879,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /*--------------------------------------------------------------------------*/ binstr = apr_pstrcat(r->pool, binstr, real_data, NULL); #ifdef QR_CODE_DEBUG - DBG(r,"Before TERM BIT[%s]", binstr); + DBG(r,"REQ[%X] Before TERM BIT[%s]", TO_ADDR(r),binstr); #endif if ((size_t)(data_code_count * 8) > strlen(binstr)) { int binstr_len = strlen(binstr); @@ -881,8 +888,8 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) } } #ifdef QR_CODE_DEBUG - DBG(r, "After TERM BIT[%s] len[%d]bit [%f]byte", binstr, strlen(binstr), (float)(((float)strlen(binstr))/8.0)); - DBG(r,"add term data"); + DBG(r,"REQ[%X] After TERM BIT[%s] len[%d]bit [%f]byte", TO_ADDR(r),binstr, strlen(binstr), (float)(((float)strlen(binstr))/8.0)); + DBG(r,"REQ[%X] add term data",TO_ADDR(r)); #endif /*--------------------------------------------------------------------------*/ @@ -890,8 +897,8 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /*--------------------------------------------------------------------------*/ binstr = s_tidy_8bit_code(qrcode, binstr, data_code_count); #ifdef QR_CODE_DEBUG - DBG(r,"After Tidy 8 BIT[%s]", binstr); - DBG(r,"s_tidy_8bit_code()"); + DBG(r,"REQ[%X] After Tidy 8 BIT[%s]", TO_ADDR(r),binstr); + DBG(r,"REQ[%X] s_tidy_8bit_code()",TO_ADDR(r)); #endif /*--------------------------------------------------------------------------*/ @@ -899,7 +906,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /*--------------------------------------------------------------------------*/ decstr = s_str_to_bin(qrcode, binstr, data_code_count); #ifdef QR_CODE_DEBUG - DBG(r,"s_str_to_bin()"); + DBG(r,"REQ[%X] s_str_to_bin()",TO_ADDR(r)); #endif #ifdef QR_CODE_DEBUG @@ -911,7 +918,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) for (ii=0; iipool, rows, apr_psprintf(r->pool, "[%02x]\n", (unsigned char)decstr[ii]), NULL); } - DBG(r,"decstr[%s]", rows); + DBG(r,"REQ[%X] decstr[%s]", TO_ADDR(r),rows); }while(0); #endif @@ -923,7 +930,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) eccstr = apr_palloc(r->pool, module_count* module_count); data_total_count = chxj_calc_ecc(qrcode, (unsigned char*)decstr, eccstr); #ifdef QR_CODE_DEBUG - DBG(r,"chxj_calc_ecc() total_count[%d]", data_total_count); + DBG(r,"REQ[%X] chxj_calc_ecc() total_count[%d]", TO_ADDR(r),data_total_count); #endif /*--------------------------------------------------------------------------*/ @@ -954,7 +961,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) /* ºÇŬ¥Þ¥¹¥¯¤ÇºÆÅÙºî¤ê¤Ê¤ª¤· */ /*--------------------------------------------------------------------------*/ #ifdef QR_CODE_DEBUG - DBG(r, "selected mask[%d]", min_mask_pattern); + DBG(r,"REQ[%X] selected mask[%d]", TO_ADDR(r),min_mask_pattern); #endif s_init_modules(qrcode, min_mask_pattern, module); @@ -972,7 +979,7 @@ chxj_qr_code(qr_code_t *qrcode, char *module[]) do { int xx, yy; int module_count = v_module_count_table[qrcode->version]; - DBG(r,"loop to [%d]", module_count); + DBG(r,"REQ[%X] loop to [%d]", TO_ADDR(r),module_count); for (yy=0; yypool, rows, "[", apr_psprintf(r->pool, "%c", module[yy][xx]), "]", NULL); - DBG(r,"%d:%s", yy,rows); + DBG(r,"REQ[%X] %d:%s", TO_ADDR(r),yy,rows); } } while(0); /* DEBUG END */ #endif #ifdef QR_CODE_DEBUG - DBG(r,"end chxj_qr_code()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } @@ -1226,10 +1233,10 @@ chxj_qrcode_node_to_qrcode(qr_code_t *qrcode, Node *node) } } #ifdef QR_CODE_DEBUG - DBG(r,"qrcode->version[%d]", qrcode->version); - DBG(r,"qrcode->level[%d]", qrcode->level); - DBG(r,"qrcode->mode[%d]", qrcode->mode); - DBG(r,"qrcode->indata[%s]", qrcode->indata); + DBG(r,"REQ[%X] qrcode->version[%d]", TO_ADDR(r),qrcode->version); + DBG(r,"REQ[%X] qrcode->level[%d]", TO_ADDR(r),qrcode->level); + DBG(r,"REQ[%X] qrcode->mode[%d]", TO_ADDR(r),qrcode->mode); + DBG(r,"REQ[%X] qrcode->indata[%s]", TO_ADDR(r),qrcode->indata); #endif } @@ -1245,7 +1252,7 @@ s_get_mode_spec(qr_code_t *qrcode) memset(result, 0, 5); memcpy(result, v_mode_table[qrcode->mode], 4); #ifdef QR_CODE_DEBUG - DBG(r,"Mode Spec[%s]", result); + DBG(r,"REQ[%X] Mode Spec[%s]", TO_ADDR(r),result); #endif return result; @@ -1264,7 +1271,7 @@ s_get_char_bit_count(qr_code_t *qrcode, int len) char *result; int data_capacity = v_capacity_table[qrcode->version*4+qrcode->level].size[qrcode->mode]; - DBG(qrcode->r, "len [%d]", len); + DBG(qrcode->r,"REQ[%X] len [%d]", TO_ADDR(qrcode->r),len); if (qrcode->mode == QR_KANJI_MODE && data_capacity * 2 < len) { len = data_capacity * 2; } @@ -1277,7 +1284,7 @@ s_get_char_bit_count(qr_code_t *qrcode, int len) len /= 2; } - DBG(qrcode->r, "len [%d]", len); + DBG(qrcode->r, "REQ[%X] len [%d]", TO_ADDR(qrcode->r),len); tmp = (char *)apr_palloc(qrcode->r->pool, bit_count + 1); for (ii=0; iir, "Character Count bit [%s]", result); + DBG(qrcode->r,"REQ[%X] Character Count bit [%s]", TO_ADDR(qrcode->r),result); #endif return result; @@ -1320,7 +1327,7 @@ s_data_to_bin_num(qr_code_t *qrcode, int UNUSED(data_code_count)) int data_capacity = v_capacity_table[qrcode->version*4+qrcode->level].size[qrcode->mode]; if (data_capacity < len) { - DBG(qrcode->r, "input data is too long"); + DBG(qrcode->r, "REQ[%X] input data is too long",TO_ADDR(qrcode->r)); len = data_capacity; } setn = len / 3; @@ -1390,7 +1397,7 @@ s_data_to_bin_alpha(qr_code_t *qrcode, int UNUSED(data_code_count)) int data_capacity = v_capacity_table[qrcode->version*4+qrcode->level].size[qrcode->mode]; if (data_capacity < len) { - DBG(qrcode->r, "input data is too long"); + DBG(qrcode->r, "REQ[%X] input data is too long",TO_ADDR(qrcode->r)); len = data_capacity; } setn = len / 2; @@ -1532,7 +1539,7 @@ s_data_to_bin_8bit(qr_code_t *qrcode, int UNUSED(data_code_count)) int data_capacity = v_capacity_table[qrcode->version*4+qrcode->level].size[qrcode->mode]; if (data_capacity < len) { - DBG(qrcode->r, "input data is too long"); + DBG(qrcode->r, "REQ[%X] input data is too long",TO_ADDR(qrcode->r)); len = data_capacity; } @@ -1556,7 +1563,7 @@ s_data_to_bin_8bit(qr_code_t *qrcode, int UNUSED(data_code_count)) result[kk] = 0; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "input data --> 2bin result[%s] len:[%d]", result, strlen(result)); + DBG(qrcode->r,"REQ[%X] input data --> 2bin result[%s] len:[%d]", TO_ADDR(qrcode->r),result, strlen(result)); #endif return result; @@ -1579,12 +1586,12 @@ s_data_to_bin_kanji(qr_code_t *qrcode, int UNUSED(data_code_count)) int data_capacity = v_capacity_table[qrcode->version*4+qrcode->level].size[qrcode->mode]; if (data_capacity * 2 < len) { - DBG(qrcode->r, "input data is too long"); + DBG(qrcode->r, "REQ[%X] input data is too long",TO_ADDR(qrcode->r)); len = data_capacity * 2; } if ((len % 2) != 0) { - DBG(qrcode->r, "invalid data."); + DBG(qrcode->r,"REQ[%X] invalid data.",TO_ADDR(qrcode->r)); qrcode->mode_change = QR_CHANGE; qrcode->mode = QR_8BIT_MODE; return NULL; @@ -1634,7 +1641,7 @@ s_data_to_bin_kanji(qr_code_t *qrcode, int UNUSED(data_code_count)) result[kk] = 0; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "input data --> 2bin result[%s] len:[%d]", result, strlen(result)); + DBG(qrcode->r,"REQ[%X] input data --> 2bin result[%s] len:[%d]", TO_ADDR(qrcode->r),result, strlen(result)); #endif return result; @@ -1654,7 +1661,7 @@ s_tidy_8bit_code(qr_code_t *qrcode, const char *indata, int data_code_count) char *result; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "len[%d] data_code_count * 8 [%d]", len, data_code_count * 8); + DBG(qrcode->r,"REQ[%X] len[%d] data_code_count * 8 [%d]", TO_ADDR(qrcode->r),len, data_code_count * 8); #endif assert (len <= data_code_count * 8); @@ -1688,7 +1695,7 @@ s_tidy_8bit_code(qr_code_t *qrcode, const char *indata, int data_code_count) } #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "tidy len[%d] data_code_count[%d]", strlen(result)/8, data_code_count); + DBG(qrcode->r,"REQ[%X] tidy len[%d] data_code_count[%d]", TO_ADDR(qrcode->r),strlen(result)/8, data_code_count); #endif return result; @@ -1730,9 +1737,9 @@ s_init_modules(qr_code_t *qrcode, qr_mask_pattern_t pat, char *dst[]) int yy; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_init_modules()"); - - DBG(qrcode->r, "module_count[%d]", module_count); + request_rec *r = qrcode->r; + DBG(qrcode->r,"REQ[%X] start %s()",TO_ADDR(qrcode->r),__func__); + DBG(qrcode->r,"REQ[%X] module_count[%d]", TO_ADDR(r),module_count); #endif for (yy=0; yyr, "end s_init_modules()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } @@ -1762,8 +1769,9 @@ s_setup_probe_position(qr_code_t *qrcode, char *dst[], int pos_x, int pos_y) int xx; int yy; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_probe_position()"); - DBG(qrcode->r, "module_count[%d]", module_count); + request_rec *r = qrcode->r; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] module_count[%d]", TO_ADDR(r),module_count); #endif for (yy=-1; yy<=7; yy++) { @@ -1818,7 +1826,7 @@ s_setup_probe_position(qr_code_t *qrcode, char *dst[], int pos_x, int pos_y) } } #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "end s_setup_probe_position()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } /* @@ -1830,8 +1838,9 @@ s_setup_timing_pattern(qr_code_t *qrcode, char *dst[]) int module_count = v_module_count_table[qrcode->version]; int xx, yy; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_timing_pattern()"); - DBG(qrcode->r, "module_count[%d]", module_count); + request_rec *r = qrcode->r; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] module_count[%d]", TO_ADDR(r),module_count); #endif yy=6; @@ -1857,7 +1866,7 @@ s_setup_timing_pattern(qr_code_t *qrcode, char *dst[]) } #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_timing_pattern()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } @@ -1874,7 +1883,8 @@ s_setup_position_adjust(qr_code_t *qrcode, char *dst[]) int dxx, dyy; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_position_adjust()"); + request_rec *r = qrcode->r; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); #endif for (yy=0; yy<7; yy++) { @@ -1910,7 +1920,7 @@ s_setup_position_adjust(qr_code_t *qrcode, char *dst[]) } #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "end s_setup_position_adjust()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } @@ -1926,8 +1936,9 @@ s_setup_type_info(qr_code_t *qrcode, char *dst[], qr_mask_pattern_t pat) int yy; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_type_info()"); - DBG(qrcode->r, "module_count[%d]", module_count); + request_rec *r = qrcode->r; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] module_count[%d]", TO_ADDR(r),module_count); #endif /* ·Á¼°¾ðÊó¥Ç¡¼¥¿¤ÎÀ¸À® */ @@ -1996,7 +2007,7 @@ s_setup_type_info(qr_code_t *qrcode, char *dst[], qr_mask_pattern_t pat) dst[module_count - 8][8] = '1'; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_setup_type_info()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } @@ -2053,9 +2064,10 @@ s_map_data(qr_code_t *qrcode, int mask; #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "start s_map_data()"); - DBG(qrcode->r, "module_count[%d]", module_count); - DBG(qrcode->r, "data_count[%d]", data_count); + request_rec *r = qrcode->r; + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] module_count[%d]",TO_ADDR(r),module_count); + DBG(r,"REQ[%X] data_count[%d]",TO_ADDR(r),data_count); #endif in_pos = 0; now_bit = 7; @@ -2113,7 +2125,7 @@ s_map_data(qr_code_t *qrcode, } } #ifdef QR_CODE_DEBUG - DBG(qrcode->r, "end s_map_data()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); #endif } diff --git a/src/chxj_serf.c b/src/chxj_serf.c index 0699dc2d..2d30dbc6 100644 --- a/src/chxj_serf.c +++ b/src/chxj_serf.c @@ -139,12 +139,14 @@ 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)(apr_size_t)ctx->r); + DBG(ctx->r, "REQ[%X] (ERROR)", TO_ADDR(ctx->r)); + DBG(ctx->r,"REQ[%X] end %s()",TO_ADDR(ctx->r),__func__); return rv; } if (APR_STATUS_IS_EAGAIN(rv)) { /* 0 byte return if EAGAIN returned. */ - DBG(ctx->r, "REQ[%X] end of s_handle_response() (EAGAIN) len:[%d]", (unsigned int)(apr_size_t)ctx->r, (int)len); + DBG(ctx->r,"REQ[%X] (EAGAIN) len:[%d]", TO_ADDR(ctx->r), (int)len); + DBG(ctx->r,"REQ[%X] end %s()",TO_ADDR(ctx->r),__func__); return rv; } @@ -197,18 +199,20 @@ s_handle_response(serf_request_t *UNUSED(request), serf_bucket_t *response, void val++; key = qs_trim_string(ctx->pool, key); val = qs_trim_string(ctx->pool, val); - DBG(ctx->r, "key:[%s], val:[%s]", key, val); + DBG(ctx->r,"REQ[%X] key:[%s], val:[%s]", TO_ADDR(ctx->r),key, val); apr_table_add(ctx->headers_out, key, val); } } ctx->rv = APR_SUCCESS; apr_atomic_dec32(&ctx->requests_outstanding); - DBG(ctx->r, "REQ[%X] end of s_handle_response()(NORMAL)", (unsigned int)(apr_size_t)ctx->r); + DBG(ctx->r,"REQ[%X] (NORMAL)", TO_ADDR(ctx->r)); + DBG(ctx->r,"REQ[%X] end %s()",TO_ADDR(ctx->r),__func__); return APR_EOF; } if (APR_STATUS_IS_EAGAIN(rv)) { - DBG(ctx->r, "REQ[%X] end of s_handle_response() (EAGAIN)", (unsigned int)(apr_size_t)ctx->r); + DBG(ctx->r,"REQ[%X] (EAGAIN)", TO_ADDR(ctx->r)); + DBG(ctx->r,"REQ[%X] end %s()",TO_ADDR(ctx->r),__func__); return rv; } } @@ -241,19 +245,19 @@ s_setup_request(serf_request_t *request, apr_array_header_t *headers = (apr_array_header_t*)apr_table_elts(r->headers_in); apr_table_entry_t *hentryp = (apr_table_entry_t*)headers->elts; for (ii=headers->nelts-1; ii>=0; ii--) { - DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, hentryp[ii].key, hentryp[ii].val); + DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", TO_ADDR(ctx->r), hentryp[ii].key, hentryp[ii].val); serf_bucket_headers_setc(hdrs_bkt, hentryp[ii].key, (hentryp[ii].val) ? hentryp[ii].val : ""); - DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, hentryp[ii].key, hentryp[ii].val); + DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", TO_ADDR(ctx->r), hentryp[ii].key, hentryp[ii].val); } if (ctx->post_data) { - DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, "X-Chxj-Forward", "Done"); + DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", TO_ADDR(ctx->r), "X-Chxj-Forward", "Done"); serf_bucket_headers_setc(hdrs_bkt, "X-Chxj-Forward", "Done"); - DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, "X-Chxj-Forward", "Done"); - DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, "X-Chxj-Content-Length", apr_psprintf(r->pool, "%" APR_SIZE_T_FMT, ctx->post_data_len)); + DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", TO_ADDR(ctx->r), "X-Chxj-Forward", "Done"); + DBG(ctx->r, "REQ[%X] REQUEST PREV key:[%s], val:[%s]", TO_ADDR(ctx->r), "X-Chxj-Content-Length", apr_psprintf(r->pool, "%" APR_SIZE_T_FMT, ctx->post_data_len)); serf_bucket_headers_setc(hdrs_bkt, "X-Chxj-Content-Length", apr_psprintf(r->pool, "%" APR_SIZE_T_FMT , ctx->post_data_len)); - DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", (unsigned int)(apr_size_t)ctx->r, "X-Chxj-Content-Length", apr_psprintf(r->pool, "%" APR_SIZE_T_FMT, ctx->post_data_len)); + DBG(ctx->r, "REQ[%X] REQUEST AFTER key:[%s], val:[%s]", TO_ADDR(ctx->r), "X-Chxj-Content-Length", apr_psprintf(r->pool, "%" APR_SIZE_T_FMT, ctx->post_data_len)); } - DBG(ctx->r, "REQ[%X] REQUEST Content-Length:[%s]", (unsigned int)(apr_size_t)r, serf_bucket_headers_get(hdrs_bkt, "Content-Length")); + DBG(ctx->r, "REQ[%X] REQUEST Content-Length:[%s]", TO_ADDR(ctx->r), serf_bucket_headers_get(hdrs_bkt, "Content-Length")); apr_atomic_inc32(&(ctx->requests_outstanding)); if (ctx->acceptor_ctx->ssl_flag) { @@ -399,7 +403,7 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path, handler_ctx_t handler_ctx; char *ret; - DBG(r, "REQ:[%X] start chxj_serf_post()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); s_init(ppool, &pool); @@ -477,9 +481,9 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path, } } - DBG(r, "end of serf request"); - DBG(r, "response_code:[%d]", handler_ctx.response_code); - DBG(r, "response:[%s][%" APR_SIZE_T_FMT "]", handler_ctx.response, handler_ctx.response_len); + DBG(r,"REQ[%X] end of serf request",TO_ADDR(r)); + DBG(r,"REQ[%X] response_code:[%d]", TO_ADDR(r),handler_ctx.response_code); + DBG(r,"REQ[%X] response:[%s][%" APR_SIZE_T_FMT "]", TO_ADDR(r),handler_ctx.response, handler_ctx.response_len); serf_connection_close(connection); if (handler_ctx.response) { ret = apr_palloc(ppool, handler_ctx.response_len + 1); @@ -494,7 +498,7 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path, *response_len = handler_ctx.response_len; char *contentType = (char *)apr_table_get(handler_ctx.headers_out, "Content-Type"); if (contentType) { - DBG(r, "response content type[%s]", contentType); + DBG(r,"REQ[%X] response content type[%s]", TO_ADDR(r),contentType); chxj_set_content_type(r, apr_pstrdup(r->pool, contentType)); } } @@ -502,7 +506,7 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path, *response_len = 0; } *response_code = handler_ctx.response_code; - DBG(r, "REQ:[%X] end chxj_serf_post()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return ret; } @@ -522,7 +526,7 @@ default_chxj_serf_head(request_rec *r, apr_pool_t *ppool, const char *url_path, handler_ctx_t handler_ctx; char *ret; - DBG(r, "REQ:[%X] start chxj_serf_head()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); s_init(ppool, &pool); @@ -603,9 +607,9 @@ default_chxj_serf_head(request_rec *r, apr_pool_t *ppool, const char *url_path, } } - DBG(r, "end of serf request"); - DBG(r, "response_code:[%d]", handler_ctx.response_code); - DBG(r, "response:[%s][%" APR_SIZE_T_FMT "]", handler_ctx.response, handler_ctx.response_len); + DBG(r,"REQ[%X] end of serf request",TO_ADDR(r)); + DBG(r,"REQ[%X] response_code:[%d]", TO_ADDR(r),handler_ctx.response_code); + DBG(r,"REQ[%X] response:[%s][%" APR_SIZE_T_FMT "]", TO_ADDR(r),handler_ctx.response, handler_ctx.response_len); serf_connection_close(connection); if (handler_ctx.response) { ret = apr_pstrdup(ppool, handler_ctx.response); @@ -614,7 +618,7 @@ default_chxj_serf_head(request_rec *r, apr_pool_t *ppool, const char *url_path, ret = apr_pstrdup(ppool, ""); } *response_code = handler_ctx.response_code; - DBG(r, "REQ:[%X] end chxj_serf_post()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return handler_ctx.headers_out; } /* diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c index f2633d17..1199f381 100755 --- a/src/chxj_specified_device.c +++ b/src/chxj_specified_device.c @@ -99,7 +99,6 @@ chxj_specified_device(request_rec *r, const char *user_agent) { device_table *dt = &UNKNOWN_DEVICE; mod_chxj_config *conf; - char *spec_check = NULL; mod_chxj_req_config *request_conf; DBG(r, "REQ[%X] start %s()", TO_ADDR(r),__func__); @@ -107,7 +106,7 @@ chxj_specified_device(request_rec *r, const char *user_agent) request_conf = (mod_chxj_req_config *)chxj_get_module_config(r->request_config, &chxj_module); if (request_conf && request_conf->spec) { DBG(r, "REQ[%x] Use spec cache.", TO_ADDR(r)); - DBG(r, "REQ[%x] end %s() (Exist spec cache)", (unsigned int)(apr_size_t)r, __func__); + DBG(r, "REQ[%x] end %s() (Exist spec cache)", TO_ADDR(r), __func__); return request_conf->spec; } @@ -261,7 +260,7 @@ s_specified_device_from_tsv(request_rec *r,device_table *spec,const char *user_a if(val == NULL){ continue; } - DBG(r, "start chxj_specified_device_from_tsv() [%s] = [%s]:[%s]",spec->device_id,k,val); + DBG(r, "REQ[%X] start chxj_specified_device_from_tsv() [%s] = [%s]:[%s]",TO_ADDR(r),spec->device_id,k,val); if (STRCASEEQ('d','D',"device_name",k)){ spec->device_name = apr_pstrdup(r->pool,val); } @@ -385,16 +384,6 @@ s_specified_device_from_tsv(request_rec *r,device_table *spec,const char *user_a DBG(r, "REQ[%X] end %s() [%d]",TO_ADDR(r),__func__,spec->provider); return spec; } - - -void -chxj_specified_cleanup(request_rec *r) -{ - DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); - DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); -} - - /* * vim:ts=2 et */ diff --git a/src/chxj_tag_util.c b/src/chxj_tag_util.c index ef7891f0..498fbe9b 100644 --- a/src/chxj_tag_util.c +++ b/src/chxj_tag_util.c @@ -468,7 +468,7 @@ chxj_chxjif_is_mine(device_table *spec, Doc *doc, Node *tag) char *value = qs_get_attr_value(doc,attr); if ((*name == 'l' || *name == 'L') && strcasecmp(name, "lang") == 0) { - DBG(r, "lang found [%s] spec [%d]", value, spec->html_spec_type); + DBG(r,"REQ[%X] lang found [%s] spec [%d]", TO_ADDR(r),value, spec->html_spec_type); if (STRCASEEQ('a','A',"all",value)) { return 1; } @@ -717,13 +717,14 @@ chxj_delete_chxj_cc_param( char *s; int xmlFlag = 0; - DBG(r, "REQ[%X] start chxj_delete_chxj_cc_param() str:[%s]", TO_ADDR(r),str); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); + DBG(r,"REQ[%X] str:[%s]", TO_ADDR(r),str); apr_pool_create(&pool, r->pool); s = apr_pstrdup(pool, str); - if (!s) { - DBG(r, "REQ[%X] end chxj_delete_chxj_cc_param() Memory Allocation Error", TO_ADDR(r)); + ERR(r,"REQ[%X] Memory Allocation Error", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return NULL; } char *result = NULL; @@ -754,7 +755,7 @@ chxj_delete_chxj_cc_param( } } DBG(r, "REQ[%X] result:[%s]", TO_ADDR(r), result); - DBG(r, "REQ[%X] end chxj_delete_chxj_cc_param() ", TO_ADDR(r)); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return result; } /* diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c index 9aa4b2ff..64ae102b 100755 --- a/src/chxj_xhtml_mobile_1_0.c +++ b/src/chxj_xhtml_mobile_1_0.c @@ -467,14 +467,14 @@ chxj_convert_xhtml_mobile_1_0( xhtml_t xhtml; Doc doc; - DBG(r,"start chxj_convert_xhtml_mobile_1_0()"); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); /*--------------------------------------------------------------------------*/ /* If qrcode xml */ /*--------------------------------------------------------------------------*/ *dstlen = srclen; dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen); if (dst != NULL) { - DBG(r,"end chxj_convert_xhtml_mobile_1_0() (found qrcode.xml)"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -534,7 +534,7 @@ chxj_convert_xhtml_mobile_1_0( chxj_dump_out("[dst] CHTML->XHTML", dst, *dstlen); #endif - DBG(r,"end chxj_convert_xhtml_mobile_1_0()"); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return dst; } @@ -589,7 +589,7 @@ s_xhtml_search_emoji(xhtml_t *xhtml, char *txt, char **rslt) r = xhtml->doc->r; if (spec == NULL) { - DBG(r,"spec is NULL"); + DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r)); } for (ee = xhtml->conf->emoji; @@ -598,7 +598,7 @@ s_xhtml_search_emoji(xhtml_t *xhtml, char *txt, char **rslt) unsigned char hex1byte; unsigned char hex2byte; if (!ee->imode) { - DBG(r,"emoji->imode is NULL"); + DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r)); continue; } @@ -714,7 +714,7 @@ chxj_xhtml_emoji_only_converter(request_rec *r, device_table *spec, const char * xhtml = &__xhtml; doc = &__doc; - DBG(r, "REQ[%X] start chxj_xhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__); memset(doc, 0, sizeof(Doc)); memset(xhtml, 0, sizeof(xhtml_t)); @@ -755,7 +755,7 @@ chxj_xhtml_emoji_only_converter(request_rec *r, device_table *spec, const char * } xhtml->out = chxj_buffered_write_flush(xhtml->out, &doc->buf); - DBG(r, "REQ[%X] end chxj_xhtml_emoji_eonly_converter()", (unsigned int)(apr_size_t)r); + DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__); return xhtml->out; } @@ -4883,7 +4883,7 @@ s_xhtml_1_0_text_tag(void *pdoc, Node *child) char *out; int rtn = s_xhtml_search_emoji(xhtml, &textval[ii], &out); if (rtn != 0) { - DBG(r,"[%s][%d]", out, rtn); + DBG(r,"REQ[%X] [%s][%d]", TO_ADDR(r),out, rtn); tdst = qs_out_apr_pstrcat(r, tdst, out, &tdst_len); ii+=(rtn - 1); continue; @@ -5998,9 +5998,9 @@ s_xhtml_1_0_link_tag(void *pdoc, Node *node) } if (rel && href && type) { - DBG(doc->r, "start load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href); xhtml->style = chxj_css_parse_from_uri(doc->r, doc->pool, xhtml->style, href); - DBG(doc->r, "end load CSS. url:[%s]", href); + DBG(doc->r,"REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href); } return xhtml->out; @@ -6302,9 +6302,9 @@ s_xhtml_1_0_style_tag(void *pdoc, Node *node) char *name = qs_get_node_name(doc, child); if (STRCASEEQ('t','T',"text", name)) { char *value = qs_get_node_value(doc, child); - DBG(doc->r, "start load CSS. buf:[%s]", value); + DBG(doc->r,"REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value); xhtml->style = chxj_css_parse_style_value(doc, xhtml->style, value); - DBG(doc->r, "end load CSS. value:[%s]", value); + DBG(doc->r,"REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value); } } return xhtml->out; diff --git a/src/mod_chxj.c b/src/mod_chxj.c index b1ce43dd..89cfee4a 100755 --- a/src/mod_chxj.c +++ b/src/mod_chxj.c @@ -278,9 +278,9 @@ chxj_headers_fixup(request_rec *r) if (r->method_number == M_POST) { if (! apr_table_get(r->headers_in, "X-Chxj-Forward")) { - DBG(r, "REQ[%X] set Input handler old:[%s] proxyreq:[%d] uri:[%s] filename:[%s]", TO_ADDR(r), r->handler, r->proxyreq, r->uri, r->filename); - r->proxyreq = PROXYREQ_NONE; - r->handler = apr_psprintf(r->pool, "chxj-input-handler"); + DBG(r, "REQ[%X] set Input handler old:[%s] proxyreq:[%d] uri:[%s] filename:[%s]", TO_ADDR(r), r->handler, r->proxyreq, r->uri, r->filename); + r->proxyreq = PROXYREQ_NONE; + r->handler = apr_psprintf(r->pool, "chxj-input-handler"); } else { char *client_ip = (char *)apr_table_get(r->headers_in, CHXJ_HEADER_ORIG_CLIENT_IP); @@ -1130,7 +1130,6 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) s_add_no_cache_headers(r, entryp); /* must not send body. */ rv = pass_data_to_filter(f, "", 0); - chxj_specified_cleanup(r); DBG(f->r, "REQ[%X] end %s()", TO_ADDR(r),__func__); return rv; } @@ -1185,15 +1184,13 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) s_add_no_cache_headers(r, entryp); ap_pass_brigade(f->next, bb); DBG(f->r, "REQ[%X] end %s()", TO_ADDR(r),__func__); - chxj_specified_cleanup(r); return APR_SUCCESS; } } else { DBG(r, "REQ[%X] not convert content-type:[(null)]", TO_ADDR(r)); ap_pass_brigade(f->next, bb); - chxj_specified_cleanup(r); - DBG(f->r, "REQ[%X] end %s()", TO_ADDR(r),__func__); + DBG(f->r, "REQ[%X] end %s()", TO_ADDR(f->r),__func__); return APR_SUCCESS; } @@ -1311,7 +1308,6 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) if (sts != OK) { ERR(r, "REQ[%X] qrcode create failed.", TO_ADDR(r)); chxj_cookie_unlock(r, lock); - chxj_specified_cleanup(r); DBG(f->r, "REQ[%X] end %s()", TO_ADDR(r),__func__); return sts; } @@ -1383,7 +1379,6 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) (const char *)ctx->buffer, (apr_size_t)ctx->len); } - chxj_specified_cleanup(r); DBG(f->r, "REQ[%X] end %s()", TO_ADDR(r),__func__); return rv; } @@ -1430,14 +1425,12 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) apr_table_setn(r->headers_out, "Content-Length", "0"); s_add_no_cache_headers(r, entryp); rv = pass_data_to_filter(f, (const char *)"", (apr_size_t)0); - chxj_specified_cleanup(r); return rv; } } } apr_brigade_destroy(bb); - chxj_specified_cleanup(r); DBG(r, "REQ[%X] end %s()", TO_ADDR(r),__func__); return APR_SUCCESS; @@ -1552,14 +1545,6 @@ chxj_input_handler(request_rec *r) apr_table_unset(r->headers_in, "Content-Length"); apr_table_setn(r->headers_in, "Content-Length", apr_psprintf(pool, "%" APR_SIZE_T_FMT, post_data_len)); response = chxj_serf_post(r, pool, url_path, post_data, post_data_len, 1, &res_len, &response_code); -#if 0 - DBG(r, "REQ[%X] -------------------------------------------------------", TO_ADDR(r)); - DBG(r, "REQ[%X] response length:[%" APR_SIZE_T_FMT "]", (unsigned int)(apr_size_t)r, res_len); - for (ii=0; iiheaders_out, "Transfer-Encoding")) != NULL) { -- 2.11.0