extern device_table* chxj_specified_device(
request_rec *r,
const char *user_agent);
-extern void chxj_specified_cleanup(request_rec *r);
#endif
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) {
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 +
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);
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
/* ¸µ¥Ç¡¼¥¿¤ò¥³¥Ô¡¼ */
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
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;
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
#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; jj<rs_total_block_count; jj++) {
char *rows = apr_psprintf(r->pool, "%02d size:[%d] rest:[%d]",jj, rs_block_size[jj], rs_block_rest[jj]);
for (ii=0; ii<rs_block_size[jj]; ii++) {
rows = apr_pstrcat(r->pool, 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
#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; ii<rslt_pos; ii++) {
- DBG(r,"[%d]", dst[ii]);
+ DBG(r,"REQ[%X] [%d]", TO_ADDR(r),dst[ii]);
}
} while(0);
#endif
dst = NULL;
t = apr_time_now();
- DBG(r, "start chxj_convert_chtml10() cookie_id=[%s]", (cookie) ? cookie->cookie_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 */
*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. */
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;
}
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;
ee = ee->next) {
if (!ee->imode) {
- DBG(r,"emoji->imode is NULL");
+ DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r));
continue;
}
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));
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;
}
}
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;
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;
*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;
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;
}
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));
}
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;
}
}
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;
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;
chtml30_t chtml30;
Doc doc;
- DBG(r, "start chxj_convert_chtml30()");
+ 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) {
- 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");
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;
}
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;
}
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));
}
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;
}
}
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;
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;
chtml40_t chtml40;
Doc doc;
- DBG(r, "start chxj_convert_chtml40()");
+ 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) {
- 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. */
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;
}
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;
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));
}
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;
}
}
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;
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;
chtml50_t chtml50;
Doc doc;
- DBG(r, "start chxj_convert_chtml50()");
+ 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) {
- 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. */
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;
}
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;
}
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));
}
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;
}
}
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;
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;
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;
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;
}
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;
}
}
*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;
}
/*
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;
}
}
*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;
}
/*
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;
}
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);
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;
}
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++;
}
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;
}
}
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;
}
on_error:
- DBG(r, "end chxj_save_cookie()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return 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;
}
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;
}
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);
}
"\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,
#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;
#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;
#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;
}
}
on_error:
- DBG(r, "end chxj_update_cookie()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return cookie;
}
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));
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);
#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;
#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;
#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;
}
}
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, '=');
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, ';');
}
}
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);
}
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;
}
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);
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;
}
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);
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;
}
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);
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;
}
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) {
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;
}
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;
}
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;
}
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);
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;
}
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;
}
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;
}
*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;
}
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;
}
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;
#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;
#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__);
}
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;
#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;
#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__);
}
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;
#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;
#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__);
}
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;
#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;
#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
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;
#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;
#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;
}
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;
}
#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;
}
#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;
}
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;
}
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 : "", "<a ", NULL);
for (attr = qs_get_attr(&doc,node);
attr;
attr = qs_get_next_attr(&doc,attr)) {
char *name = qs_get_attr_name(&doc,attr);
char *value = qs_get_attr_value(&doc,attr);
- DBG(r, "name:[%s] value=[%s]", name, value);
+ DBG(r,"REQ[%X] name:[%s] value=[%s]",TO_ADDR(r), name, value);
if (STRCASEEQ('h', 'H', "href", name)
&& ! chxj_starts_with(value, "mailto:")
&& ! chxj_starts_with(value, "tel:")) {
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 : "", "<img ", NULL);
for (attr = qs_get_attr(&doc,node);
attr;
attr = qs_get_next_attr(&doc,attr)) {
char *name = qs_get_attr_name(&doc,attr);
char *value = qs_get_attr_value(&doc,attr);
- DBG(r, "name:[%s] value=[%s]", name, value);
+ DBG(r,"REQ[%X] name:[%s] value=[%s]", TO_ADDR(r),name, value);
if (STRCASEEQ('s', 'S', "src", name)) {
if (strchr(value, '?') != 0) {
value = apr_pstrcat(pool, value, "&_chxj_cc=", cookie->cookie_id, "&_chxj_nc=true", NULL);
}
char *matchstr = ap_pregsub(pool, "$1", &s[nowpos], regexp->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 : "", "<input type='hidden' name='_chxj_cc' value='", cookie_id, "' />", matchstr, NULL);
plen += strlen(matchstr);
}
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);
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;
}
/*
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 */
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;
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;
}
}
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;
}
}
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;
}
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);
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;
}
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;
}
}
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);
/* 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;
}
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);
}
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;
}
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);
}
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;
}
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;
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;
}
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));
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);
}
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;
}
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));
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;
}
{
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;
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;
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) {
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;
}
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",
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;
}
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),
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;
}
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);
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;
}
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;
}
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;
}
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;
}
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;
}
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",
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;
}
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",
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);
}
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;
}
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;
}
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;
}
}
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;
}
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;
}
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;
}
/*
*/
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;
}
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,
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;
}
}
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;
}
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;
}
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;
}
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;
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);
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);
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;
}
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; ii<len/64; ii++) {
- chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &str[ii * 64]);
+ chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | [%-*.*s] |", TO_ADDR(r), 64, 64, &str[ii * 64]);
}
if (len % 64) {
- chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &str[ii * 64]);
+ chxj_log_rerror(filename, line, APLOG_DEBUG,0,r, "REQ[%X] | [%-*.*s] |", TO_ADDR(r), 64, 64, &str[ii * 64]);
}
- 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));
}
apr_pool_t *pool;
- DBG(r,"REQ[%X] start chxj_encoding()", (unsigned int)(apr_size_t)r);
+ DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__);
dconf = chxj_get_module_config(r->per_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;
}
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);
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;
}
}
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;
}
*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 */
*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 */
*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 */
*obuf += 1;
*olen -= 1;
*ibuf += 1;
- DBG(r, "passed 1byte.");
+ DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r));
}
else {
/* unknown charactor */
*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)
*obuf += 1;
*olen -= 1;
*ibuf +=3;
- DBG(r, "passed 3byte.");
+ DBG(r,"REQ[%X] passed 3byte.",TO_ADDR(r));
}
else {
/* 2byte charactor */
*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)
*obuf += 1;
*olen -= 1;
*ibuf += 2;
- DBG(r, "passed 2byte.");
+ DBG(r,"REQ[%X] passed 2byte.",TO_ADDR(r));
}
else {
/* 1byte charactor */
*obuf += 1;
*olen -= 1;
*ibuf += 1;
- DBG(r, "passed 1byte.");
+ DBG(r,"REQ[%X] passed 1byte.",TO_ADDR(r));
}
}
else {
*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);
}
}
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;
}
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;
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;
}
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;
}
}
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;
}
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);
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 {
}
}
}
- 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);
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);
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;
}
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;
}
*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 */
/* 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,
"<HDML VERSION=3.0 MARKABLE=TRUE PUBLIC=TRUE>\r\n"
"<NODISPLAY MARKABLE=TRUE PUBLIC=TRUE TITLE=\" \">\r\n"
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);
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);
}
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;
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;
}
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) {
for (ii=0; ii<MAX_RADIO_COUNT; ii++) {
if (! hdml->radio_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. */
/*----------------------------------------------------------------------*/
}
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. */
/*------------------------------------------------------------------------*/
}
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,
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=",
"RETVALS=\"_chk;;_\" >\r\n"
"</NODISPLAY>\r\n"
);
- DBG(r, "wrote checkbox hdml card.");
+ DBG(r,"REQ[%X] wrote checkbox hdml card.",TO_ADDR(r));
}
/*--------------------------------------------------------------------------*/
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,
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,
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) {
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);
/*----------------------------------------------------------------------*/
/* 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 */
/*------------------------------------------------------------------------*/
for (ii=0; ii<MAX_RADIO_COUNT; ii++) {
if (! hdml->radio_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;
}
}
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);
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] );
}
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);
}
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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
}
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--);
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;
}
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;
}
/* 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);
/*
* 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;
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;
}
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));
}
}
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;
}
}
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;
}
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;
}
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;
}
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;
}
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;
}
/*
* 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();
/*
* 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();
/*
* 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();
/*
* 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;
}
}
- DBG(r,"start convert and compression");
+ DBG(r,"REQ[%X] start convert and compression",TO_ADDR(r));
if (!fixFormatFlag) {
if (spec->available_jpeg) {
/*--------------------------------------------------------------------------*/
/* 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;
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));
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;
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));
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) {
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);
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;
}
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,
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,
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;
}
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;
}
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) {
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) {
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;
}
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;
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();
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");
}
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);
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);
}
}
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;
}
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;
}
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 {
}
}
- 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) {
}
}
- 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;
}
/* 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:
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) {
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)
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)
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++) {
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) {
}
}
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++) {
}
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);
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;
}
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++) {
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) {
}
}
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++) {
}
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);
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;
}
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);
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;
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
*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. */
r = ixhtml10->doc->r;
if (!spec) {
- DBG(r,"spec is NULL");
+ DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r));
}
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;
}
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("<?xml version=\"1.0\" encoding=\"");
W_V(ixhtml10->spec->output_encoding);
/*--------------------------------------------------------------------------*/
W_L("<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"ja\" xml:lang=\"ja\">");
- 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;
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 ) {
}
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;
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;
*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. */
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;
unsigned char hex2byte;
if (! ee->imode) {
- DBG(r,"emoji->imode is NULL");
+ DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r));
continue;
}
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));
}
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;
}
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("<html>");
- DBG(r, "end s_jhtml_start_html_tag()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return jhtml->out;
}
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) {
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;
}
}
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;
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;
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:")) {
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");
// 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;
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;
}
*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. */
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;
unsigned char hex2byte;
if (! ee->imode) {
- DBG(r,"emoji->imode is NULL");
+ DBG(r,"REQ[%X] emoji->imode is NULL",TO_ADDR(r));
continue;
}
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));
}
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;
}
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("<?xml version=\"1.0\" encoding=\"");
W_V(jxhtml->spec->output_encoding);
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;
}
}
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;
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;
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);
}
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;
}
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) {
return CHXJ_FALSE;
}
- DBG(r, "end chxj_memcache_server_create()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
{
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),
return CHXJ_FALSE;
}
- DBG(r, "end chxj_memcache_set_cookie()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
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);
return CHXJ_FALSE;
}
- DBG(r, "end chxj_memcache_reset_cookie()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
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) {
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;
}
{
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) {
return CHXJ_FALSE;
}
- DBG(r, "end chxj_memcache_delete_cookie()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
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);
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;
}
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;
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;
}
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);
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;
}
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;
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;
}
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;
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;
}
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;
}
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;
}
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);
}
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++;
apr_sleep(wait_time);
}
- DBG(r, "end chxj_cookie_lock_memcache()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
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;
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;
}
&& (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 {
}
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;
}
}
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;
}
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;
}
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);
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;
}
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)) {
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;
}
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);
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;
}
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)) {
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;
}
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);
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;
}
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)) {
}
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;
}
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);
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)) {
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);
}
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);
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;
}
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)) {
}
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;
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)) {
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);
}
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);
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;
}
{
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;");
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;
}
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)) {
}
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;
}
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,
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)) {
}
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;
}
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)) {
}
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;
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);
}
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);
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;
}
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)) {
}
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;
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);
}
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);
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;
}
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);
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;
}
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;
}
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)) {
}
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;
}
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);
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);
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);
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);
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;
}
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;
}
{
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;
}
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;
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;
}
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;
/* *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;
}
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;
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;
}
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;
return CHXJ_FALSE;
}
}
- DBG(r, "end chxj_cookie_expire_gc_mysql()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
return CHXJ_TRUE;
}
{
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);
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;
}
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
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;
}
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;
}
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));
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;
}
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];
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);
#ifdef QR_CODE_DEBUG
- DBG(r, "end chxj_qr_code_handler()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
return OK;
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 {
/*------------------------------------------------------------------------*/
/*------------------------------------------------------------------------*/
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
/*------------------------------------------------------------------------*/
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
/*------------------------------------------------------------------------*/
/*------------------------------------------------------------------------*/
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
/*------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
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);
}
}
#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
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
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
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
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
for (ii=0; ii<data_code_count; ii++) {
rows = apr_pstrcat(r->pool, 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
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
/*--------------------------------------------------------------------------*/
/* ºÇŬ¥Þ¥¹¥¯¤ÇºÆÅÙºî¤ê¤Ê¤ª¤· */
/*--------------------------------------------------------------------------*/
#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);
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; yy<module_count; yy++) {
char *rows ;
for (xx=0; xx<module_count; xx++)
rows = apr_pstrcat(r->pool, 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
}
}
}
#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
}
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;
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;
}
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; ii<bit_count; ii++) {
result[bit_count] = '\0';
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "Character Count bit [%s]", result);
+ DBG(qrcode->r,"REQ[%X] Character Count bit [%s]", TO_ADDR(qrcode->r),result);
#endif
return result;
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;
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;
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;
}
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;
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;
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;
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);
}
#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;
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; yy<module_count; yy++)
s_setup_version_info(qrcode, dst);
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "end s_init_modules()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
}
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++) {
}
}
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "end s_setup_probe_position()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
}
/*
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;
}
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "start s_setup_timing_pattern()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
}
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++) {
}
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "end s_setup_position_adjust()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
}
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
/* ·Á¼°¾ðÊó¥Ç¡¼¥¿¤ÎÀ¸À® */
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
}
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;
}
}
#ifdef QR_CODE_DEBUG
- DBG(qrcode->r, "end s_map_data()");
+ DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
#endif
}
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;
}
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;
}
}
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) {
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);
}
}
- 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);
*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));
}
}
*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;
}
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);
}
}
- 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);
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;
}
/*
{
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__);
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;
}
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);
}
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
*/
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;
}
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;
}
}
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;
}
/*
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;
}
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;
}
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;
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;
}
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));
}
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;
}
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;
}
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;
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;
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);
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;
}
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;
}
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;
}
(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;
}
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;
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; ii<res_len/64; ii++) {
- DBG(r, "REQ[%X] response:[%.*s]", TO_ADDR(r), 64, &response[ii*64]);
- }
- DBG(r, "REQ[%X] -------------------------------------------------------", TO_ADDR(r));
-#endif
char *chunked;
if ((chunked = (char *)apr_table_get(r->headers_out, "Transfer-Encoding")) != NULL) {
OSDN Git Service
