Merge branch 'branch_0.11.0' into branch_0.12.0

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_12_0@2407 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index 8205ee7..e395f16 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -691,7 +691,6 @@ valid_expires(request_rec *r, const char *value)
   DBG(r, "name=[%s] val=[%s]", name, val);
   now = apr_time_now();
   expires = chxj_parse_cookie_expires(val);
-  DBG(r, "now=[%lld] expires=[%lld]", now, expires);
   if (expires < now) {
     DBG(r, "end valid_expire() value:[%s] (expired)", value);
     return CHXJ_FALSE;

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index f90503e..22adb38 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1867,7 +1867,7 @@ s_hdml_do_input_radio_tag(hdml_t* hdml, Node* tag)
   s_output_to_hdml_out(hdml, 
                   apr_psprintf(r->pool, 
                           "<A TASK=GOSUB "
-                          "LABEL=\"\x93\xfc\x97\xcd\" "
+                          "LABEL=\"check\" "
                           "DEST=#R%d VARS=\"VAL=%s\" "
                           "RECEIVE=\"%s;", 
                           ii, 
@@ -2025,7 +2025,7 @@ s_hdml_do_input_checkbox_tag(hdml_t* hdml, Node* tag)
     nm   = qs_alloc_zero_byte_string(r);
 
   s_output_to_hdml_out(hdml, apr_psprintf(r->pool, 
-                                "<A TASK=GOSUB LABEL=\"a\xaf\xb8\" "
+                                "<A TASK=GOSUB LABEL=\"check\" "
                                    "DEST=\"#$%s%02d\" "
                                    "VARS=\"V=%s\" "
                                    "RECEIVE=\"%s%02d;%s%02d;%s%02d\">"

diff --git a/src/chxj_img_conv_format.c b/src/chxj_img_conv_format.c
index e9566d1..5e1ee6c 100644 (file)
--- a/src/chxj_img_conv_format.c
+++ b/src/chxj_img_conv_format.c
@@ -302,16 +302,16 @@ chxj_img_conv_format_handler(request_rec* r)
  * @param src [i]   It is former image binary data.
  * @param len [i/o] It is length of former image binary data.
  */
-char*
-chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len)
+char *
+chxj_exchange_image(request_rec *r, const char **src, apr_size_t *len)
 {
-  mod_chxj_config*      conf;
-  query_string_param_t* qsp;
-  char*                 user_agent;
-  device_table*         spec;
-  char*                 dst;
-  char*                 conv_check;
-  chxjconvrule_entry* entryp;
+  mod_chxj_config       *conf;
+  query_string_param_t  *qsp;
+  char                  *user_agent;
+  device_table          *spec;
+  char                  *dst;
+  char                  *conv_check;
+  chxjconvrule_entry    *entryp;
 
   DBG(r, "start chxj_exchange_image()");
 

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index a061df9..65d3d8e 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -818,11 +818,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
           for (child = qs_get_child_node(&doc,root);
                child ;
                child = qs_get_next_node(&doc,child)) {
-        
-            char* name;
-        
-            name = qs_get_node_name(&doc,child);
-        
+            char *name = qs_get_node_name(&doc,child);
             if (strcasecmp("qrcode",name) == 0) {
               sts++;
               break;
@@ -837,7 +833,7 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
               ERR(r, "qrcode create failed.");
               return sts;
             }
-            r->content_type = apr_psprintf(r->pool, "image/jpg");
+            r->content_type = apr_psprintf(r->pool, "image/jpeg");
           }
         }
 
@@ -860,23 +856,13 @@ chxj_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 
             memset(tmp, 0, ctx->len + 1);
             memcpy(tmp, ctx->buffer, ctx->len);
-
-#if 0
-            DBG(r, "input data=[%s]", tmp);
-#endif
-
-
             ctx->buffer = 
               chxj_exchange_image(r, 
                                   (const char**)&tmp,
                                   (apr_size_t*)&ctx->len);
-
-            if (ctx->buffer == NULL)
+            if (ctx->buffer == NULL) {
               ctx->buffer = tmp;
-
-#if 0
-            DBG(r, "output data=[%.*s]", ctx->len,ctx->buffer);
-#endif
+            }
           }
         }