Merge branch 'master' into branch_0.12.0

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

diff --git a/ChangeLog b/ChangeLog
index 2072843..b66b01c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.2-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Failed reading cookie for SoftBank.
+      (Reported by R.Komoriya. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Sun,  1 Jun 2008 02:11:33 +0900
+
 libapache2-mod-chxj (0.12.1-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/configure b/configure
index 810b149..dc67a1f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.1-1.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.2-1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.12.1-1'
-PACKAGE_STRING='mod_chxj 0.12.1-1'
+PACKAGE_VERSION='0.12.2-1'
+PACKAGE_STRING='mod_chxj 0.12.2-1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/mod_chxj.c"
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_chxj 0.12.1-1 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.12.2-1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.12.1-1:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.12.2-1:";;
    esac
   cat <<\_ACEOF
 
@@ -1592,7 +1592,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.12.1-1
+mod_chxj configure 0.12.2-1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1606,7 +1606,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_chxj $as_me 0.12.1-1, which was
+It was created by mod_chxj $as_me 0.12.2-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2424,7 +2424,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.12.1-1
+ VERSION=0.12.2-1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21835,7 +21835,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_chxj $as_me 0.12.1-1, which was
+This file was extended by mod_chxj $as_me 0.12.2-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21888,7 +21888,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.12.1-1
+mod_chxj config.status 0.12.2-1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 68e2a28..34e3043 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.12.1-1])
+AC_INIT([mod_chxj],[0.12.2-1])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/debian-sarge/changelog b/debian-sarge/changelog
index 9f4554c..432f264 100644 (file)
--- a/debian-sarge/changelog
+++ b/debian-sarge/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.2-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Failed reading cookie for SoftBank.
+      (Reported by R.Komoriya. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Sun,  1 Jun 2008 02:11:33 +0900
+
 libapache2-mod-chxj (0.12.1-1) unstable; urgency=low
 
   * Fixed bug.

diff --git a/debian/changelog b/debian/changelog
index feedf69..2d78390 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.2-1) unstable; urgency=low
+
+  * Fixed bug.
+    - Failed reading cookie for SoftBank.
+      (Reported by R.Komoriya. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Sun,  1 Jun 2008 02:11:33 +0900
+
 libapache2-mod-chxj (0.12.1-1) unstable; urgency=low
 
   * Fixed bug. 

diff --git a/include/config.h b/include/config.h
index a1216f1..fb14c58 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -96,19 +96,19 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.12.1-1"
+#define PACKAGE_STRING "mod_chxj 0.12.2-1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.12.1-1"
+#define PACKAGE_VERSION "0.12.2-1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.12.1-1"
+#define VERSION "0.12.2-1"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index 1676c84..deb231f 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -1355,8 +1355,6 @@ s_jhtml_start_form_tag(void *pdoc, Node *node)
   Doc          *doc;
   request_rec  *r;
   Attr         *attr;
-  int          dcflag = 0;
-  char         *dc = NULL;
 
   jhtml = GET_JHTML(pdoc);
   doc   = jhtml->doc;
@@ -1375,13 +1373,10 @@ s_jhtml_start_form_tag(void *pdoc, Node *node)
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0                                                            */
       /*----------------------------------------------------------------------*/
+      value = chxj_add_cookie_parameter(r, value, jhtml->cookie);
       W_L(" action=\"");
       W_V(value);
       W_L("\"");
-      dc = chxj_add_cookie_parameter(r, value, jhtml->cookie);
-      if (strcmp(dc, value)) {
-        dcflag = 1;
-      } 
     }
     else if (STRCASEEQ('m','M',"method",name)) {
       /*----------------------------------------------------------------------*/
@@ -1400,22 +1395,6 @@ s_jhtml_start_form_tag(void *pdoc, Node *node)
     }
   }
   W_L(">");
-  /*-------------------------------------------------------------------------*/
-  /* ``action=""''                                                           */
-  /*-------------------------------------------------------------------------*/
-  if (! dc) {
-    dcflag = 1;
-  }
-  /*-------------------------------------------------------------------------*/
-  /* Add cookie parameter                                                    */
-  /*-------------------------------------------------------------------------*/
-  if (jhtml->cookie && jhtml->cookie->cookie_id && dcflag == 1) {
-    char *vv = apr_psprintf(doc->buf.pool, "%s<input type='hidden' name='%s' value='%s'>",
-                            jhtml->out, 
-                            CHXJ_COOKIE_PARAM,
-                            chxj_url_decode(doc->buf.pool, jhtml->cookie->cookie_id));
-    W_V(vv);
-  }
   W_NLCODE();
   return jhtml->out;
 }

diff --git a/src/chxj_jxhtml.c b/src/chxj_jxhtml.c
index e03e497..5855138 100644 (file)
--- a/src/chxj_jxhtml.c
+++ b/src/chxj_jxhtml.c
@@ -1412,8 +1412,6 @@ s_jxhtml_start_form_tag(void *pdoc, Node *node)
   Doc          *doc;
   request_rec  *r;
   Attr         *attr;
-  int          dcflag = 0;
-  char         *dc = NULL;
 
   jxhtml = GET_JXHTML(pdoc);
   doc   = jxhtml->doc;
@@ -1432,13 +1430,10 @@ s_jxhtml_start_form_tag(void *pdoc, Node *node)
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0                                                            */
       /*----------------------------------------------------------------------*/
+      value = chxj_add_cookie_parameter(r, value, jxhtml->cookie);
       W_L(" action=\"");
       W_V(value);
       W_L("\"");
-      dc = chxj_add_cookie_parameter(r, value, jxhtml->cookie);
-      if (strcmp(dc, value)) {
-        dcflag = 1;
-      } 
     }
     else if (STRCASEEQ('m','M',"method",name)) {
       /*----------------------------------------------------------------------*/
@@ -1458,23 +1453,6 @@ s_jxhtml_start_form_tag(void *pdoc, Node *node)
   }
   W_L(">");
   W_NLCODE();
-  /*-------------------------------------------------------------------------*/
-  /* ``action=""''                                                           */
-  /*-------------------------------------------------------------------------*/
-  if (! dc) {
-    dcflag = 1;
-  }
-  /*-------------------------------------------------------------------------*/
-  /* Add cookie parameter                                                    */
-  /*-------------------------------------------------------------------------*/
-  if (jxhtml->cookie && jxhtml->cookie->cookie_id && dcflag == 1) {
-    char *vv = apr_psprintf(doc->buf.pool, "%s<input type='hidden' name='%s' value='%s' />",
-                            jxhtml->out, 
-                            CHXJ_COOKIE_PARAM,
-                            chxj_url_decode(doc->buf.pool, jxhtml->cookie->cookie_id));
-    W_V(vv);
-    W_NLCODE();
-  }
   return jxhtml->out;
 }