Merge branch 'branch_0.12.0'

Conflicts:
	src/chxj_chtml10.c

diff --cc src/chxj_chtml10.c
index 8b7cb7e,3262bcd..f2fc2e3
--- 1/src/chxj_chtml10.c
--- 2/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@@ -2128,11 -1859,12 +2128,12 @@@ s_chtml10_start_form_tag(void *pdoc, No
    int post_flag = (attr_method && strcasecmp(attr_method, "post") == 0) ? 1 : 0;
  
    W_L("<form");
 -  if (attr_value) {
 +  if (attr_action) {
      char *q;
-     q = strchr(attr_action, '?');
+     char *new_query_string = NULL;
+     q = strchr(attr_value, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_value, 0, post_flag, &new_query_string, CHXJ_TRUE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_chtml20.c
index 7217648,254c608..a034ac3
--- 1/src/chxj_chtml20.c
--- 2/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@@ -1718,12 -1495,11 +1718,13 @@@ s_chtml20_start_form_tag(void *pdoc, No
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 0);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, chtml20->cookie);
      char *q;
+     char *new_query_string = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &new_query_string, CHXJ_TRUE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_chtml30.c
index fac5948,fd1600e..76da5c5
--- 1/src/chxj_chtml30.c
--- 2/src/chxj_chtml30.c
+++ b/src/chxj_chtml30.c
@@@ -1608,12 -1349,11 +1608,13 @@@ s_chtml30_start_form_tag(void *pdoc, No
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 0);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, chtml30->cookie);
      char *q;
+     char *new_query_string = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &new_query_string, CHXJ_TRUE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_chtml40.c
index f28e154,667af52..7250aff
--- 1/src/chxj_chtml40.c
--- 2/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@@ -1558,12 -1355,11 +1558,13 @@@ s_chtml40_start_form_tag(void *pdoc, No
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 0);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, chtml40->cookie);
      char *q;
+     char *new_query_string = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &new_query_string, CHXJ_TRUE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_chtml50.c
index 5756c61,020f6a9..5be71d2
--- 1/src/chxj_chtml50.c
--- 2/src/chxj_chtml50.c
+++ b/src/chxj_chtml50.c
@@@ -1605,12 -1396,11 +1605,13 @@@ s_chtml50_start_form_tag(void *pdoc, No
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 0);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, chtml50->cookie);
      char *q;
+     char *new_query_string = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &new_query_string, CHXJ_TRUE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_jhtml.c
index 0f18796,cc252dc..803f8e7
--- 1/src/chxj_jhtml.c
--- 2/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@@ -1563,12 -1396,11 +1563,13 @@@ s_jhtml_start_form_tag(void *pdoc, Nod
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 0);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, jhtml->cookie);
      char *q;
+     char *unused = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 0, post_flag, &unused, CHXJ_FALSE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_jxhtml.c
index ce5a1f7,5f3e973..c2ce1c1
--- 1/src/chxj_jxhtml.c
--- 2/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@@ -1636,12 -1446,11 +1636,13 @@@ s_jxhtml_start_form_tag(void *pdoc, Nod
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 1);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, jxhtml->cookie);
      char *q;
+     char *unused = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 1, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 1, post_flag, &unused, CHXJ_FALSE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/chxj_tag_util.c
Simple merge

diff --cc src/chxj_xhtml_mobile_1_0.c
index 0e0cf4a,59b7da5..032c058
--- 1/src/chxj_xhtml_mobile_1_0.c
--- 2/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@@ -1552,12 -1354,11 +1552,13 @@@ s_xhtml_1_0_start_form_tag(void *pdoc, 
  
    W_L("<form");
    if (attr_action) {
 +    attr_action = chxj_encoding_parameter(r, attr_action, 1);
 +    attr_action = chxj_add_cookie_parameter(r, attr_action, xhtml->cookie);
      char *q;
+     char *unused = NULL;
      q = strchr(attr_action, '?');
      if (q) {
-       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 1, post_flag);
+       new_hidden_tag = chxj_form_action_to_hidden_tag(r, doc->pool, attr_action, 1, post_flag, &unused, CHXJ_FALSE);
        if (new_hidden_tag) {
          *q = 0;
        }

diff --cc src/mod_chxj.c
Simple merge