* src/librivet/rivetWWW.c: enlarging buffer
allocated in ::rivet::escape_sgml_chars
* configure.ac: removed test on the apache
version (we don't support apache-1 anymore)
diff --git a/ChangeLog b/ChangeLog
index e7986bb..8d967ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-07 Massimo Manghi <mxmanghi@apache.org>
+ * src/librivet/rivetWWW.c: enlarging buffer
+ allocated in ::rivet::escape_sgml_chars
+ * configure.ac: removed test on the apache
+ version (we don't support apache-1 anymore)
+
2016-12-06 Massimo Manghi <mxmanghi@apache.org>
* configure.ac: mod_rivet_ng now default for
builing mod_rivet
diff --git a/Makefile.in b/Makefile.in
index b189f53..9ecaf50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -375,7 +375,6 @@
am__untar = @am__untar@
apache_include = @apache_include@
apache_request = @apache_request@
-apache_version_dir = @apache_version_dir@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
diff --git a/configure.ac b/configure.ac
index 366e4e8..65eb6ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,34 +266,31 @@
[ --with-apxs=FILE location of Apache apxs tool],
[if test -x "${with_apxs}" ; then
apxs_found="${with_apxs}"
- AC_MSG_RESULT([$apxs_found])
- fi]
+ AC_MSG_RESULT([$apxs_found])
+ fi]
,
[
- APXS_NAMES=apxs
- if test "${apache_version}"="2"; then
- APXS_NAMES="$APXS_NAMES apxs2"
- fi
- for apxs_file in ${APXS_NAMES}; do
- for apxs_path in bin sbin; do
- if test -x "${apache_base}"/"${apxs_path}"/"${apxs_file}"; then
- apxs_found="${apache_base}"/"${apxs_path}"/"${apxs_file}"
- break 2
- fi
+ APXS_NAMES=apxs
+ for apxs_file in ${APXS_NAMES}; do
+ for apxs_path in bin sbin; do
+ if test -x "${apache_base}"/"${apxs_path}"/"${apxs_file}"; then
+ apxs_found="${apache_base}"/"${apxs_path}"/"${apxs_file}"
+ break 2
+ fi
+ done
done
- done
- if test x"$apxs_found" = x; then
- AC_PATH_PROGS(with_apxs, apxs)
- if test "${with_apxs+set}" = set ; then
- apxs_found="${with_apxs}"
+ if test x"$apxs_found" = x; then
+ AC_PATH_PROGS(with_apxs, apxs)
+ if test "${with_apxs+set}" = set ; then
+ apxs_found="${with_apxs}"
+ fi
fi
- fi
- if test x"${apxs_found}" = x; then
- AC_MSG_ERROR([Could not find apxs. apxs must be in your PATH or you must specify the location of the apxs script using --with-apxs])
- else
- AC_MSG_RESULT([$apxs_found])
- fi
- ]
+ if test x"${apxs_found}" = x; then
+ AC_MSG_ERROR([Could not find apxs. apxs must be in your PATH or you must specify the location of the apxs script using --with-apxs])
+ else
+ AC_MSG_RESULT([$apxs_found])
+ fi
+ ]
)
if test "${apxs_found+set}" = set ; then
dnl At this point we already have apr sorted out
@@ -443,32 +440,6 @@
fi
] , )
-# APACHE_VERSION
-#
-# let's determine whether we are building for apache1.x or apache2.x.
-# This variable has consequences on the default values for the remaining
-# site options. We try to guess some of them.
-#
-
-AC_DEFUN([APACHE_VERSION],[
- AC_ARG_WITH(
- apache_version,
- [ --with-apache-version[=VER] build for apache 1.x or 2.x],,
- [with_apache_version="2"]
- )
-
- AC_MSG_CHECKING([for apache version])
- if test "$with_apache_version" = "1"; then
- AC_MSG_ERROR([Rivet 2.1 is no more supporting Apache 1.x])
- else
- AC_MSG_RESULT([building for apache 2.x])
- AC_CONFIG_FILES([src/apache-2/Makefile])
- apache_version_dir="apache-2"
- AC_DEFINE(APACHE2,1,[APACHE2 definition in config.h])
- fi
- MOD_RIVET_INCLUDES="-I${apache_version_dir}"
-])
-
# MOD_RIVET_CORE
#
# Determining the path to the mod_rivet.* source files
@@ -881,7 +852,7 @@
fi
AC_C_INLINE
-AC_SUBST(apache_version_dir)
+#AC_SUBST(apache_version_dir)
AC_SUBST(MOD_RIVET_INCLUDES)
AC_DEFINE_UNQUOTED(RIVETLIB_DESTDIR,"${RIVET_TCL_TARGET}",[The path to the rivet tcl library])
diff --git a/src/librivet/rivetWWW.c b/src/librivet/rivetWWW.c
index dcbad2e..672bcbb 100644
--- a/src/librivet/rivetWWW.c
+++ b/src/librivet/rivetWWW.c
@@ -180,7 +180,7 @@
/* If they sent us an empty string, we're done */
if (origLength == 0) return TCL_OK;
- newString = (char *)Tcl_Alloc( (unsigned)origLength * 3 + 1 );
+ newString = (char *)Tcl_Alloc( (unsigned)origLength * 6 + 1 );
/* for all the characters in the source string */
for (origStringP = origString, newStringP = newString;
diff --git a/tests/rivet.test b/tests/rivet.test
index 8404178..3a83957 100755
--- a/tests/rivet.test
+++ b/tests/rivet.test
@@ -29,6 +29,8 @@
set testgroup2 1
set testgroup3 1
+#lappend TestList failtest.test
+
# Run all tests against one server process.
if { $testgroup1 } {
