You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2016/12/07 12:28:26 UTC
svn commit: r1773063 - in /tcl/rivet/trunk: ChangeLog Makefile.in
configure.ac src/librivet/rivetWWW.c tests/rivet.test
Author: mxmanghi
Date: Wed Dec 7 12:28:26 2016
New Revision: 1773063
URL: http://svn.apache.org/viewvc?rev=1773063&view=rev
Log:
* 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)
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/src/librivet/rivetWWW.c
tcl/rivet/trunk/tests/rivet.test
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1773063&r1=1773062&r2=1773063&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Wed Dec 7 12:28:26 2016
@@ -1,3 +1,9 @@
+2016-12-07 Massimo Manghi <mx...@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 <mx...@apache.org>
* configure.ac: mod_rivet_ng now default for
builing mod_rivet
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1773063&r1=1773062&r2=1773063&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Wed Dec 7 12:28:26 2016
@@ -375,7 +375,6 @@ am__tar = @am__tar@
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@
Modified: tcl/rivet/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/configure.ac?rev=1773063&r1=1773062&r2=1773063&view=diff
==============================================================================
--- tcl/rivet/trunk/configure.ac (original)
+++ tcl/rivet/trunk/configure.ac Wed Dec 7 12:28:26 2016
@@ -266,34 +266,31 @@ AC_DEFUN([CHECK_APXS],[
[ --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 @@ AX_COMPARE_VERSION([$TCL_VERSION],[eq],[
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 @@ else
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])
Modified: tcl/rivet/trunk/src/librivet/rivetWWW.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/librivet/rivetWWW.c?rev=1773063&r1=1773062&r2=1773063&view=diff
==============================================================================
--- tcl/rivet/trunk/src/librivet/rivetWWW.c (original)
+++ tcl/rivet/trunk/src/librivet/rivetWWW.c Wed Dec 7 12:28:26 2016
@@ -180,7 +180,7 @@ TCL_CMD_HEADER( Rivet_EscapeStringCmd )
/* 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;
Modified: tcl/rivet/trunk/tests/rivet.test
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/rivet.test?rev=1773063&r1=1773062&r2=1773063&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/rivet.test (original)
+++ tcl/rivet/trunk/tests/rivet.test Wed Dec 7 12:28:26 2016
@@ -29,6 +29,8 @@ set testgroup1 1
set testgroup2 1
set testgroup3 1
+#lappend TestList failtest.test
+
# Run all tests against one server process.
if { $testgroup1 } {
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org