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 2013/08/10 19:03:18 UTC
svn commit: r1512803 - in /tcl/rivet/branches/modular: ./ ChangeLog
Makefile.in configure.ac doc/ doc/xml/commands.xml src/Makefile.am
src/apache-2/mod_rivet.c
Author: mxmanghi
Date: Sat Aug 10 17:03:17 2013
New Revision: 1512803
URL: http://svn.apache.org/r1512803
Log:
merging latest trunk changes
Modified:
tcl/rivet/branches/modular/ (props changed)
tcl/rivet/branches/modular/ChangeLog
tcl/rivet/branches/modular/Makefile.in
tcl/rivet/branches/modular/configure.ac
tcl/rivet/branches/modular/doc/ (props changed)
tcl/rivet/branches/modular/doc/xml/commands.xml
tcl/rivet/branches/modular/src/Makefile.am
tcl/rivet/branches/modular/src/apache-2/mod_rivet.c
Propchange: tcl/rivet/branches/modular/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk:r1511392-1512335
Modified: tcl/rivet/branches/modular/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/ChangeLog?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/ChangeLog (original)
+++ tcl/rivet/branches/modular/ChangeLog Sat Aug 10 17:03:17 2013
@@ -1,6 +1,12 @@
2013-08-07 Massimo Manghi <mx...@apache.org>
* ./: merging changes done in trunk
+2013-08-07 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/mod_rivet.c: adding MPM descripting fields to the 'server' array
+ * configure.ac: warning message about Tcl version not supporting fork correctly
+ moved to the end of configure.ac, so that it's more readable by the user
+
+>>>>>>> .merge-right.r1512335
2013-08-06 Massimo Manghi <mx...@apache.org>
* rivetcmds/rivetCore.c,rivetInspect.c: moved core commands into this new directory.
Their code is (nearly) independent from Apache version and in future it might be shared
Modified: tcl/rivet/branches/modular/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/Makefile.in?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/Makefile.in (original)
+++ tcl/rivet/branches/modular/Makefile.in Sat Aug 10 17:03:17 2013
@@ -18,7 +18,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1500301 2013-07-06 16:26:05Z mxmanghi $
+# $Id: Makefile.am 1511397 2013-08-07 16:59:11Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
@@ -69,8 +69,6 @@ DIST_COMMON = README $(am__configure_dep
tclconfig/ltmain.sh tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/tclconfig/tcl.m4 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
@@ -322,6 +320,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+rivet_core_cmds = @rivet_core_cmds@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
Modified: tcl/rivet/branches/modular/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/configure.ac?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/configure.ac (original)
+++ tcl/rivet/branches/modular/configure.ac Sat Aug 10 17:03:17 2013
@@ -395,15 +395,6 @@ AX_COMPARE_VERSION([$TCL_VERSION],[eq],[
fi
] , )
-
-if test "$print_fileevent_msg" = "1"; then
- AC_MSG_NOTICE([------------------------------------------------------------------------])
- AC_MSG_NOTICE([The Tcl notifier (and consequently the event loop) might not be working ])
- AC_MSG_NOTICE([in Rivet with Tcl $TCL_VERSION$TCL_PATCH_LEVEL using the 'prefork' MPM. ])
- AC_MSG_NOTICE([Recommended versions are Tcl >= 8.5.15 or Tcl >= 8.6.1])
- AC_MSG_NOTICE([------------------------------------------------------------------------])
-fi
-
# APACHE_VERSION
#
# let's determine whether we are building for apache1.x or apache2.x.
@@ -472,6 +463,26 @@ AC_DEFUN([APACHE_REQUEST],[
AC_MSG_RESULT([$with_apache_request])
])
+# RIVET_CORE_CMDS
+#
+# selecting non default directory for Rivet code commands core
+#
+
+AC_DEFUN([RIVET_CORE_CMDS],[
+ AC_ARG_WITH(
+ rivet_core_cmds,
+ [ --with-rivet-core-cmds[=dir] select directory for Rivet core commands core],,
+ [with_rivet_core_cmds="rivetcmds"]
+ )
+
+ AC_MSG_CHECKING(for Rivet core commands code)
+ rivet_core_cmds=${with_rivet_core_cmds}
+ AC_SUBST(rivet_core_cmds)
+ AC_MSG_RESULT([$with_rivet_core_cmds])
+
+])
+
+
AC_DEFUN([RIVET_TCL_LIB],[
AC_ARG_WITH(
rivet_target_dir,
@@ -688,6 +699,7 @@ POST_MAX_SIZE
UPLOAD_TO_VAR
IMPORT_RIVET_COMMANDS
APACHE_REQUEST
+RIVET_CORE_CMDS
if test $import_rivet_commands = "yes"; then
AC_MSG_NOTICE([forcing Rivet to export commands from ::rivet namespace])
@@ -722,3 +734,13 @@ AC_CONFIG_FILES([Makefile src/Makefile s
#esac
AC_OUTPUT
+if test "$print_fileevent_msg" = "1"; then
+ AC_MSG_NOTICE([========================================================================])
+ AC_MSG_NOTICE([ WARNING!])
+ AC_MSG_NOTICE([========================================================================])
+ AC_MSG_NOTICE([The Tcl notifier (and consequently the event loop) might not be working ])
+ AC_MSG_NOTICE([in Rivet running with Tcl $TCL_VERSION$TCL_PATCH_LEVEL and with the 'prefork' MPM.])
+ AC_MSG_NOTICE([Recommended versions are Tcl >= 8.5.15 (8.5 version) or Tcl >= 8.6.1])
+ AC_MSG_NOTICE([========================================================================])
+fi
+
Propchange: tcl/rivet/branches/modular/doc/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk/doc:r1511392-1512335
Modified: tcl/rivet/branches/modular/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/doc/xml/commands.xml?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/doc/xml/commands.xml (original)
+++ tcl/rivet/branches/modular/doc/xml/commands.xml Sat Aug 10 17:03:17 2013
@@ -1691,7 +1691,8 @@ form_request end</programlisting>
separated by newline characters.
</para>
</refsect1>
- </refentry>
+ </refentry>
+
<refentry id="xml">
<refnamediv>
<refname>xml</refname>
@@ -1729,10 +1730,7 @@ form_request end</programlisting>
<programlisting><command>::rivet::xml "a string" [list div class box id testbox] b i</command>
<== <div class="box" id="testbox"><b><i>a string</i></b></div></programlisting>
<programlisting><command>::rivet::xml "text to be wrapped in XML" div [list a href "http://..../" title "info message"]</command>
-<== <div><a href="http://..../" title="info message">text to be wrapped in XML</a></div></programlisting>
-
-
+<== <div><a href="http://..../" title="info message">text to be wrapped in XML</a></div></programlisting>
</refsect1>
</refentry>
-
</section>
Modified: tcl/rivet/branches/modular/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/Makefile.am?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/Makefile.am Sat Aug 10 17:03:17 2013
@@ -30,8 +30,8 @@ mod_rivet_la_SOURCES =
@apache_request@/apache_request.c \
@apache_version_dir@/mod_rivet.c \
@apache_version_dir@/TclWebapache.c \
- rivetcmds/rivetCore.c \
- rivetcmds/rivetConf.c \
+ @rivet_core_cmds@/rivetCore.c \
+ @rivet_core_cmds@/rivetInspect.c \
channel/rivetChannel.c \
parser/rivetParser.c
Modified: tcl/rivet/branches/modular/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/apache-2/mod_rivet.c?rev=1512803&r1=1512802&r2=1512803&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/modular/src/apache-2/mod_rivet.c Sat Aug 10 17:03:17 2013
@@ -233,6 +233,44 @@ Rivet_InitServerVariables( Tcl_Interp *i
TCL_GLOBAL_ONLY);
Tcl_DecrRefCount(obj);
#endif
+
+ if (ap_mpm_query(AP_MPMQ_IS_THREADED,&ap_mpm_result) == APR_SUCCESS)
+ {
+ switch (ap_mpm_result)
+ {
+ case AP_MPMQ_STATIC:
+ obj = Tcl_NewStringObj("static", -1);
+ break;
+ case AP_MPMQ_NOT_SUPPORTED:
+ obj = Tcl_NewStringObj("unsupported", -1);
+ break;
+ default:
+ obj = Tcl_NewStringObj("undefined", -1);
+ break;
+ }
+ Tcl_IncrRefCount(obj);
+ Tcl_SetVar2Ex(interp,"server","MPM_THREADED",obj,TCL_GLOBAL_ONLY);
+ Tcl_DecrRefCount(obj);
+ }
+
+ if (ap_mpm_query(AP_MPMQ_IS_FORKED,&ap_mpm_result) == APR_SUCCESS)
+ {
+ switch (ap_mpm_result)
+ {
+ case AP_MPMQ_STATIC:
+ obj = Tcl_NewStringObj("static", -1);
+ break;
+ case AP_MPMQ_DYNAMIC:
+ obj = Tcl_NewStringObj("dynamic", -1);
+ break;
+ default:
+ obj = Tcl_NewStringObj("undefined", -1);
+ break;
+ }
+ Tcl_IncrRefCount(obj);
+ Tcl_SetVar2Ex(interp,"server","MPM_FORKED",obj,TCL_GLOBAL_ONLY);
+ Tcl_DecrRefCount(obj);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org