* Added features.

    - For anchor's name.

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

diff --git a/ChangeLog b/ChangeLog
index f1565df..9e33745 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.10-1) unstable; urgency=low
+
+  * Added Features.
+    - For anchor's name for cookie simulator.
+    (Requested by tiruda1600 _at_ users.sourceforge.jp. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 21 Jul 2008 15:11:53 +0900
+
 libapache2-mod-chxj (0.12.9-1) unstable; urgency=low
 
   * Changed Specification.

diff --git a/configure b/configure
index 9334428..9f4bae1 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.9-1.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.10-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.9-1'
-PACKAGE_STRING='mod_chxj 0.12.9-1'
+PACKAGE_VERSION='0.12.10-1'
+PACKAGE_STRING='mod_chxj 0.12.10-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.9-1 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.12.10-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.9-1:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.12.10-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.9-1
+mod_chxj configure 0.12.10-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.9-1, which was
+It was created by mod_chxj $as_me 0.12.10-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.9-1
+ VERSION=0.12.10-1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21836,7 +21836,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.9-1, which was
+This file was extended by mod_chxj $as_me 0.12.10-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21889,7 +21889,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.12.9-1
+mod_chxj config.status 0.12.10-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 7bfe19b..101f67a 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.9-1])
+AC_INIT([mod_chxj],[0.12.10-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 4cfdb52..d77741a 100644 (file)
--- a/debian-sarge/changelog
+++ b/debian-sarge/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.10-1) unstable; urgency=low
+
+  * Added Features.
+    - For anchor's name for cookie simulator.
+    (Requested by tiruda1600 _at_ users.sourceforge.jp. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 21 Jul 2008 15:11:53 +0900
+
 libapache2-mod-chxj (0.12.9-1) unstable; urgency=low
 
   * Changed Specification.

diff --git a/debian/changelog b/debian/changelog
index b4fc33f..1b18ee9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-chxj (0.12.10-1) unstable; urgency=low
+
+  * Added Features.
+    - For anchor's name for cookie simulator.
+    (Requested by tiruda1600 _at_ users.sourceforge.jp. thanks!)
+
+ -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 21 Jul 2008 15:11:53 +0900
+
 libapache2-mod-chxj (0.12.9-1) unstable; urgency=low
 
   * Changed Specification.

diff --git a/include/config.h b/include/config.h
index 47187ef..7da0f33 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.9-1"
+#define PACKAGE_STRING "mod_chxj 0.12.10-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.9-1"
+#define PACKAGE_VERSION "0.12.10-1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.12.9-1"
+#define VERSION "0.12.10-1"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index ad337ef..368f627 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -755,6 +755,7 @@ chxj_add_cookie_parameter(request_rec *r, char *value, cookie_t *cookie)
 {
   char *qs;
   char *dst;
+  char *name = "";
 
   DBG(r, "start chxj_add_cookie_parameter() cookie_id=[%s]", (cookie) ? cookie->cookie_id : NULL);
 
@@ -771,12 +772,18 @@ chxj_add_cookie_parameter(request_rec *r, char *value, cookie_t *cookie)
     goto on_error;
   }
 
+  qs = strchr(dst, '#');
+  if (qs) {
+    name = apr_pstrdup(r->pool, qs);
+    *qs = 0;
+  }
+
   qs = strchr(dst, '?');
   if (qs) {
-    dst = apr_psprintf(r->pool, "%s&%s=%s", dst, CHXJ_COOKIE_PARAM, cookie->cookie_id);
+    dst = apr_psprintf(r->pool, "%s&%s=%s%s", dst, CHXJ_COOKIE_PARAM, cookie->cookie_id, name);
   }
   else {
-    dst = apr_psprintf(r->pool, "%s?%s=%s", dst, CHXJ_COOKIE_PARAM, cookie->cookie_id);
+    dst = apr_psprintf(r->pool, "%s?%s=%s%s", dst, CHXJ_COOKIE_PARAM, cookie->cookie_id, name);
   }
 
   DBG(r, "end   chxj_add_cookie_parameter() dst=[%s]", dst);