* merge from RELEASE_0_8_1

  * update 0.8.1 to 0.9.0

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

diff --git a/ChangeLog b/ChangeLog
index b1750f2..f4119ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,10 @@ libapache2-mod-chxj (0.8.1-1) unstable; urgency=low
 
   * Changed for Apache 2.2.x.
   * Changed so that ``Configure'' might run well by CentOS5.1. 
-  * Fixed Bug that Segmentation Falt had occurred when browser inforamtion was 
+  * Fixed bug that Segmentation Falt had occurred when browser inforamtion was 
     read in the AMD64 environment. 
-  * Fixed buf that the HTML conversion operates when connecting it from PC. 
+  * Fixed bug that the HTML conversion operates when connecting it from PC. 
+  * Fixed bug that the HTML conversion for jhtml.
 
  -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 19 Jun 2006 17:29:48 +0900
 

diff --git a/configure b/configure
index 397245e..4b9bc79 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.8.0.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.9.0.
 #
 # 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.8.0'
-PACKAGE_STRING='mod_chxj 0.8.0'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='mod_chxj 0.9.0'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/mod_chxj.c"
@@ -1398,7 +1398,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.8.0 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1469,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.8.0:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.8.0
+mod_chxj configure 0.9.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1593,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.8.0, which was
+It was created by mod_chxj $as_me 0.9.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2391,7 +2391,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.8.0
+ VERSION=0.9.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21581,7 +21581,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.8.0, which was
+This file was extended by mod_chxj $as_me 0.9.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21634,7 +21634,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.8.0
+mod_chxj config.status 0.9.0
 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 7c6ea1e..6e568c2 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.8.0])
+AC_INIT([mod_chxj],[0.9.0])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/debian/changelog b/debian/changelog
index 2cf8d75..206f08c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-libapache2-mod-chxj (0.9.0-1) unstable; urgency=low
+libapache2-mod-chxj (0.8.1-1) unstable; urgency=low
 
   * fix warning.
   * It is corrected that it is possible to use it with apache2.2. 
+  * Changed for Apache 2.2.x.
+  * Changed so that ``Configure'' might run well by CentOS5.1.
+  * Fixed Bug that Segmentation Falt had occurred when browser inforamtion was
+    read in the AMD64 environment.
+  * Fixed buf that the HTML conversion operates when connecting it from PC.
+  * Fixed bug that the HTML conversion for jhtml.
+
 
  -- Atsushi Konno <konn@users.sourceforge.jp>  Fri, 11 Jan 2008 18:39:44 +0900
 

diff --git a/debian/control b/debian/control
index 0eb0bfa..882de1e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libapache2-mod-chxj
 Priority: optional
 Maintainer: Atsushi Konno <konn@users.sourceforge.jp>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, apache2 (>=2.0.54-5), libapr0 (>=2.0.54-5), libmagick9-dev (>=6.2.4.5-0.6), libiconv-hook1 (>=0.0.20021209-6.1)
+Build-Depends: debhelper (>= 5.0.42), autotools-dev, apache2 (>=2.2.3), libapr1 (>=1.2.7), libaprutil1 (>=1.2.7), libmagick9-dev (>=6.2.4.5-0.6), libiconv-hook1 (>=0.0.20021209-6.1)
 Standards-Version: 3.6.2
 Section: libs
 

diff --git a/debian/files b/debian/files
index a3a400f..702296f 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1,2 +1,2 @@
-libapache2-mod-chxj-dev_0.6.1-1_i386.deb libdevel optional
-libapache2-mod-chxj_0.6.1-1_i386.deb libs optional
+libapache2-mod-chxj-dev_0.8.1-1_i386.deb libdevel optional
+libapache2-mod-chxj_0.8.1-1_i386.deb libs optional

diff --git a/debian/rules b/debian/rules
index c9f4045..80b1b6f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ major=2
 config.status: configure
        dh_testdir
        # Add here commands to configure the package.
-       CFLAGS="$(CFLAGS) -Wl " ./configure --with-apache-header=/usr/include/apache2 
+       CFLAGS="$(CFLAGS)  " ./configure --with-apache-header=/usr/include/apache2 
 
 
 

diff --git a/include/config.h b/include/config.h
index 393a107..180aaa1 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -35,10 +35,10 @@
 #define HAVE_LIBGEN_H 1
 
 /* Define to 1 if you have the iconv library file. */
-#define HAVE_LIBICONV 
+/* #undef HAVE_LIBICONV */
 
 /* Define to 1 if you have the iconv_hook library file. */
-/* #undef HAVE_LIBICONV_HOOK */
+#define HAVE_LIBICONV_HOOK 
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
@@ -102,19 +102,19 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.8.0"
+#define PACKAGE_STRING "mod_chxj 0.9.0"
 
 /* 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.8.0"
+#define PACKAGE_VERSION "0.9.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.8.0"
+#define VERSION "0.9.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index aaecc8a..c2348b5 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -17,7 +17,6 @@
 #ifndef __MOD_CHXJ_H__
 #define __MOD_CHXJ_H__
 
-
 #ifdef UNUSED
 #elif defined(__GNUC__)
 # define UNUSED(x) UNUSED_ ## x __attribute__((unused))

diff --git a/include/qs_parse_string.h b/include/qs_parse_string.h
index 3ef042d..148d6fc 100644 (file)
--- a/include/qs_parse_string.h
+++ b/include/qs_parse_string.h
@@ -192,9 +192,8 @@ extern char* qs_get_node_name(
   Node* node);
 
 extern int qs_get_node_size(Doc* doc, Node* node) ;
-
-extern Node* qs_get_child_node(Doc* doc, Node* node) ;
-extern Node* qs_get_next_node(Doc* doc, Node* node) ;
+extern Node *qs_get_child_node(Doc *doc, Node *node) ;
+extern Node *qs_get_next_node(Doc *doc, Node *node) ;
 
 Attr* qs_get_attr(Doc* doc, Node* node) ;
 Attr* qs_get_next_attr(Doc* doc, Attr* attr) ;

diff --git a/include/qs_parse_tag.h b/include/qs_parse_tag.h
index b4361f9..e642896 100644 (file)
--- a/include/qs_parse_tag.h
+++ b/include/qs_parse_tag.h
@@ -25,12 +25,12 @@ extern Node* qs_parse_tag(
   int          len) ;
 
 extern Node* qs_new_tag(
-  Doc*         doc);
+  Doc       *doc);
 
-extern Node* qs_add_attr(
-  Doc*         doc,
-  Node*        node, 
-  Attr*        attr);
+extern Node *qs_add_attr(
+  Doc       *doc,
+  Node      *node, 
+  Attr      *attr);
 
 
 #endif

diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c
index fd96afa..cf280b6 100644 (file)
--- a/src/chxj_jhtml.c
+++ b/src/chxj_jhtml.c
@@ -2138,21 +2138,21 @@ s_jhtml_start_select_tag(void* pdoc, Node* child)
     char* nm  = qs_get_attr_name(doc,attr);
     char* val = qs_get_attr_value(doc,attr);
 
-    if ((*name == 's' || *name == 'S') && strcasecmp(nm, "size") == 0) {
+    if ((*nm == 's' || *nm == 'S') && strcasecmp(nm, "size") == 0) {
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0 version 2.0                                                */
       /*----------------------------------------------------------------------*/
       size = apr_pstrdup(r->pool, val);
     }
     else
-    if ((*name == 'n' || *name == 'N') && strcasecmp(nm, "name") == 0) {
+    if ((*nm == 'n' || *nm == 'N') && strcasecmp(nm, "name") == 0) {
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0 version 2.0                                                */
       /*----------------------------------------------------------------------*/
       name = apr_pstrdup(r->pool, val);
     }
     else
-    if ((*name == 'm' || *name == 'M') && strcasecmp(nm, "multiple") == 0) {
+    if ((*nm == 'm' || *nm == 'M') && strcasecmp(nm, "multiple") == 0) {
       /*----------------------------------------------------------------------*/
       /* CHTML 1.0 version 2.0                                                */
       /*----------------------------------------------------------------------*/