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 2015/12/03 13:59:33 UTC
svn commit: r1717754 - in /tcl/rivet/trunk: ./ doc/ doc/images/ doc/xml/
rivet/ rivet/packages/hexglyphs/ rivet/rivet-tcl/ src/mod_rivet/
Author: mxmanghi
Date: Thu Dec 3 12:59:32 2015
New Revision: 1717754
URL: http://svn.apache.org/viewvc?rev=1717754&view=rev
Log:
* doc/xml/internals.xml: explaining the MPM bridge jump table
* doc/rivet.css: changing colors adopting 2.3 style temporarily
* doc/images: new images with new colors
* doc/xml/intro.xml,install.xml: removing reference no longer
valid for version 3.0
* packages/hexglyphs/hexglyphs.tcl: new glyphs for more punctuation
characters
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/doc/images/next.png
tcl/rivet/trunk/doc/images/prev.png
tcl/rivet/trunk/doc/images/up.png
tcl/rivet/trunk/doc/rivet.css
tcl/rivet/trunk/doc/rivet.xml
tcl/rivet/trunk/doc/xml/commands.xml
tcl/rivet/trunk/doc/xml/install.xml
tcl/rivet/trunk/doc/xml/internals.xml
tcl/rivet/trunk/doc/xml/intro.xml
tcl/rivet/trunk/rivet/init.tcl
tcl/rivet/trunk/rivet/packages/hexglyphs/hexglyphs.tcl
tcl/rivet/trunk/rivet/rivet-tcl/catch.tcl
tcl/rivet/trunk/src/mod_rivet/mod_rivet.h
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Thu Dec 3 12:59:32 2015
@@ -1,3 +1,12 @@
+2015-12-03 Massimo Manghi <mx...@apache.org>
+ * doc/xml/internals.xml: explaining the MPM bridge jump table
+ * doc/rivet.css: changing colors adopting 2.3 style temporarily
+ * doc/images: new images with new colors
+ * doc/xml/intro.xml,install.xml: removing reference no longer
+ valid for version 3.0
+ * packages/hexglyphs/hexglyphs.tcl: new glyphs for more punctuation
+ characters
+
2015-11-27 Massimo Manghi <mx...@apache.org>
* VERSION,configure.ac: Major version number increased to 3.0.0
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Thu Dec 3 12:59:32 2015
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -24,17 +24,7 @@
# before invoking pkg_mkIndex.
# 2013/01/20: removing libtool created .la files
VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,6 +88,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(top_srcdir)/rivet/init.tcl.in \
+ ChangeLog tclconfig/ChangeLog INSTALL README TODO \
+ tclconfig/compile tclconfig/config.guess tclconfig/config.sub \
+ tclconfig/depcomp tclconfig/install-sh tclconfig/missing \
+ tclconfig/ltmain.sh $(top_srcdir)/tclconfig/compile \
+ $(top_srcdir)/tclconfig/config.guess \
+ $(top_srcdir)/tclconfig/config.sub \
+ $(top_srcdir)/tclconfig/install-sh \
+ $(top_srcdir)/tclconfig/ltmain.sh \
+ $(top_srcdir)/tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_split_version.m4 \
@@ -107,8 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -172,17 +172,6 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/rivet/init.tcl.in \
- $(top_srcdir)/tclconfig/compile \
- $(top_srcdir)/tclconfig/config.guess \
- $(top_srcdir)/tclconfig/config.sub \
- $(top_srcdir)/tclconfig/install-sh \
- $(top_srcdir)/tclconfig/ltmain.sh \
- $(top_srcdir)/tclconfig/missing ChangeLog INSTALL README TODO \
- tclconfig/ChangeLog tclconfig/compile tclconfig/config.guess \
- tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
- tclconfig/ltmain.sh tclconfig/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -410,7 +399,6 @@ psdir = @psdir@
rivet_channel = @rivet_channel@
rivet_commands = @rivet_commands@
rivet_core = @rivet_core@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -450,6 +438,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -682,15 +671,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -726,17 +715,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build/sub \
- && ../../configure \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -914,8 +903,6 @@ uninstall-am: uninstall-local
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-local
-.PRECIOUS: Makefile
-
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
Modified: tcl/rivet/trunk/doc/images/next.png
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/images/next.png?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/trunk/doc/images/prev.png
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/images/prev.png?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/trunk/doc/images/up.png
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/images/up.png?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/trunk/doc/rivet.css
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/rivet.css?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/rivet.css (original)
+++ tcl/rivet/trunk/doc/rivet.css Thu Dec 3 12:59:32 2015
@@ -30,14 +30,14 @@ PRE.PROGRAMLISTING
font-family: monospace;
white-space: pre;
width: 95%;
- background-color: #eeffee;
+ background-color: #ffeeee;
border: solid;
color: #000000;
- border-color: #009999;
- border-left: solid #009999 1px;
- border-right: solid #009999 1px;
- border-top: solid #009999 1px;
- border-bottom: solid #009999 1px;
+ border-color: #990099;
+ border-left: solid #990099 1px;
+ border-right: solid #990099 1px;
+ border-top: solid #990099 1px;
+ border-bottom: solid #990099 1px;
font-size: normal;
padding-top: 1em;
padding-left: 1em;
@@ -81,9 +81,9 @@ H2
{
COLOR: #ffffff ;
font-style: italic;
- BACKGROUND-color: #a0d0a0;
- BORDER: solid 3px #609060;
- PADDING: 5px
+ BACKGROUND-color: #d0a0a0;
+ BORDER: solid 3px #906060;
+ PADDING: 0.5em;
}
TABLE.IMPORTANT
@@ -262,11 +262,11 @@ P.C2 {
DIV.NAVFOOTER {
color: #000000;
- background-color: #DFFFDF;
+ background-color: #FFDFDF;
padding: 5px;
margin-top: 10px;
width: 100%;
- border: thin solid #a0a0d0;
+ border: 2px solid #d0a0a0;
}
DIV.NUKEFOOTER {
@@ -280,11 +280,11 @@ DIV.NUKEFOOTER {
DIV.NAVHEADER {
color: #000000;
- background-color: #DFFFDF;
+ background-color: #FFDFDF;
padding: 5px;
margin-bottom: 10px;
width: 100%;
- border: thin solid #a0a0d0;
+ border: 2px solid #d0a0a0;
}
DIV.SECT1,DIV.SECT2,DIV.SECT3 {
@@ -296,7 +296,7 @@ DIV.EXAMPLE,DIV.TOC {
padding-left: 10px;
padding-right: 10px;
color: #000000;
- background-color: #E8FFE8;
+ background-color: #FFE8E8;
}
DIV.EXAMPLE {
border: thin dotted #22AA22;
Modified: tcl/rivet/trunk/doc/rivet.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/rivet.xml?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/rivet.xml (original)
+++ tcl/rivet/trunk/doc/rivet.xml Thu Dec 3 12:59:32 2015
@@ -78,12 +78,6 @@
</author>
</articleinfo>
- <!--para>
- This document is also available in the following languages:
- <ulink url="index.it.html">Italian</ulink>,
- <ulink url="index.ru.html">Russian</ulink>
- </para-->
-
<para>
Document revision: $Revision$, last modified <?dbtimestamp format="Y-m-d X" ?>$ by $Author$.
</para>
Modified: tcl/rivet/trunk/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/commands.xml?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/commands.xml (original)
+++ tcl/rivet/trunk/doc/xml/commands.xml Thu Dec 3 12:59:32 2015
@@ -336,6 +336,43 @@
</variablelist>
</refsect1>
</refentry>
+ <refentry id="catch">
+ <refnamediv>
+ <refname>catch</refname>
+ <refpurpose>wraps core command <command>catch</command> and handles in
+ a special way fake error conditions resulting from calls to <command>exit</command>
+ and <command>abort_page</command></refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>::rivet::catch</command>
+ <arg><replaceable>script</replaceable></arg>
+ <arg><replaceable>error_code_var_name</replaceable></arg>
+ <arg><replaceable>options_var_name</replaceable></arg>
+
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+ <para>
+ <command>::rivet::catch</command> is a utility command wrapping of the core language's same command.
+ Within mod_rivet a script execution can be interrupted by either calling
+ <command>::rivet::exit</command> or <command>::rivet::abort_page</command> that
+ return an error code and hand the execution down to any <command>AbortScript</command> and
+ eventually to <command>AfterEveryScript</command>.
+ Any procedure fired under control of the core <command>::catch</command> would be trapped and
+ the error code should be checked and in case the error should be confirmed. <command>::rivet::catch</command>
+ checks for these conditions and in case handles the condition in a proper way interrupting the execution
+ and returning control to mod_rivet which in turn calls <link linkend="directives"><command>AbortScript</command></link>
+ </para>
+
+ <note>
+ This command is not exported from the <command>::rivet</command> namespace and therefore has
+ to be fully qualified.
+ </note>
+ </refsect1>
+ </refentry>
<!-- Reference page for command 'clock_to_rfc' -->
<refentry id="clock_to_rfc">
<refnamediv>
@@ -569,7 +606,7 @@
</refsect1>
</refentry>
- <refentry id="exit">
+ <refentry id="exit">
<refnamediv>
<refname>exit</refname>
<refpurpose>terminate execution and child process</refpurpose>
@@ -618,21 +655,20 @@
<ulink url="https://httpd.apache.org/docs/2.4/mod/prefork.html">prefork MPM documentation</ulink>
</note>
</refsect1>
- </refentry>
+ </refentry>
<refentry id="headers">
<refnamediv>
- <refname>headers</refname>
- <refpurpose>set and parse HTTP headers.</refpurpose>
+ <refname>headers</refname>
+ <refpurpose>set and parse HTTP headers.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>::rivet::headers</command>
<group choice="req">
- <arg>get</arg>
+ <arg>get</arg>
<arg>set</arg>
- <arg>sent</arg>
<arg>redirect</arg>
<arg>add</arg>
<arg>type</arg>
@@ -642,15 +678,15 @@
</refsynopsisdiv>
<refsect1>
- <title>Description</title>
- <para>
- The <command>headers</command> command is for setting and
- parsing HTTP headers.
- </para>
+ <title>Description</title>
+ <para>
+ The <command>headers</command> command is for setting and
+ parsing HTTP headers.
+ </para>
- <variablelist>
-
- <varlistentry>
+ <variablelist>
+
+ <varlistentry>
<term>
<cmdsynopsis>
<command>::rivet::headers</command>
@@ -664,105 +700,105 @@
Read arbitrary header names and values from output HTTP headers
</para>
</listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <cmdsynopsis>
- <command>::rivet::headers</command>
- <arg choice="plain">set</arg>
- <arg><replaceable>headername</replaceable></arg>
- <arg><replaceable>value</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Set arbitrary header names and values into output HTTP headers
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <cmdsynopsis>
- <command>::rivet::headers</command>
- <arg choice="plain">sent</arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Test internal status of the module and returns 1
- if the HTTP headers have been already sent
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <cmdsynopsis>
- <command>::rivet::headers</command>
- <arg choice="plain">redirect</arg>
- <arg><replaceable>uri</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Redirect from the current page to a
- new URI. <emphasis>Must</emphasis> be
- done in the first block of TCL code.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <cmdsynopsis>
- <command>::rivet::headers</command>
- <arg choice="plain">add</arg>
- <arg><replaceable>headername</replaceable></arg>
- <arg><replaceable>value</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>Add text to header
- <varname>headername</varname>.
- </para>
- </listitem>
- </varlistentry>
+ </varlistentry>
- <varlistentry>
- <term>
- <cmdsynopsis>
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
+ <command>::rivet::headers</command>
+ <arg choice="plain">set</arg>
+ <arg><replaceable>headername</replaceable></arg>
+ <arg><replaceable>value</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ Set arbitrary header names and values into output HTTP headers
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
<command>::rivet::headers</command>
- <arg choice="plain">type</arg>
- <arg><replaceable>content-type</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- This command sets the <constant>Content-type</constant>
- header returned by the script, which is useful if you wish
- to send content other than HTML with Rivet - PNG or jpeg
- images, for example.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
- <cmdsynopsis>
- <command>::rivet::headers</command>
- <arg choice="plain">numeric</arg>
- <arg><replaceable>response code</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Set a numeric response code, such as 200, 404 or 500.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ <arg choice="plain">sent</arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ Test internal status of the module and returns 1
+ if the HTTP headers have been already sent
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
+ <command>::rivet::headers</command>
+ <arg choice="plain">redirect</arg>
+ <arg><replaceable>uri</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ Redirect from the current page to a new
+ URI. <emphasis>Must</emphasis> be done in the first block
+ of TCL code.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
+ <command>::rivet::headers</command>
+ <arg choice="plain">add</arg>
+ <arg><replaceable>headername</replaceable></arg>
+ <arg><replaceable>value</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>Add text to header
+ <varname>headername</varname>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
+ <command>::rivet::headers</command>
+ <arg choice="plain">type</arg>
+ <arg><replaceable>content-type</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ This command sets the <constant>Content-type</constant>
+ header returned by the script, which is useful if you wish
+ to send content other than HTML with Rivet - PNG or jpeg
+ images, for example.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <cmdsynopsis>
+ <command>::rivet::headers</command>
+ <arg choice="plain">numeric</arg>
+ <arg><replaceable>response code</replaceable></arg>
+ </cmdsynopsis>
+ </term>
+ <listitem>
+ <para>
+ Set a numeric response code, such as 200, 404 or 500.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
</refentry>
@@ -1439,30 +1475,6 @@ bab</programlisting>
not a POST or there is no data, then "" - an empty string - is returned.
</para>
</refentry>
-
- <refentry id="read_file">
- <refnamediv>
- <refname>read_file</refname>
- <refpurpose>
- Read the entire contents of a file and return it as a string.
- </refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>::rivet::read_file</command>
- <arg>file name</arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>Description</title>
- <para>
- This is a utility command which loads the entire content of
- a file and returns it as a result.
- </para>
- </refsect1>
- </refentry>
-
<refentry id="redirect">
<refnamediv>
<refname>redirect</refname>
@@ -1507,7 +1519,30 @@ bab</programlisting>
</para>
</refsect1>
</refentry>
+
+ <refentry id="read_file">
+ <refnamediv>
+ <refname>read_file</refname>
+ <refpurpose>
+ Read the entire contents of a file and return it as a string.
+ </refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>::rivet::read_file</command>
+ <arg>file name</arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>Description</title>
+ <para>
+ This is a utility command which loads the entire content of
+ a file and returns it as a result.
+ </para>
+ </refsect1>
+ </refentry>
+
<refentry id="unescape_string">
<refnamediv>
<refname>unescape_string</refname>
Modified: tcl/rivet/trunk/doc/xml/install.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/install.xml?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/install.xml (original)
+++ tcl/rivet/trunk/doc/xml/install.xml Thu Dec 3 12:59:32 2015
@@ -12,11 +12,11 @@
<para>
Currently there is no way to run Apache Rivet 2.2 on Windows© because
Rivet currently requires the
- <ulink url="http://httpd.apache.org/docs/2.2/mod/prefork.html">prefork</ulink>, which
+ <ulink url="http://httpd.apache.org/docs/2.4/mod/prefork.html">prefork</ulink>, which
is supported only on Unix/Linux systems. Efforts are under way to extend the support to the
- <ulink url="http://httpd.apache.org/docs/2.2/mod/worker.html">worker</ulink>
+ <ulink url="http://httpd.apache.org/docs/2.4/mod/worker.html">worker</ulink>
and the
- <ulink url="http://httpd.apache.org/docs/2.2/mod/mpm_winnt.html">winnt</ulink> MPMs.
+ <ulink url="http://httpd.apache.org/docs/2.4/mod/mpm_winnt.html">winnt</ulink> MPMs.
Check our
<ulink url="http://tcl.apache.org/rivet/static/about.html">development mailing list</ulink>
for the latests updates about Rivet development
Modified: tcl/rivet/trunk/doc/xml/internals.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/internals.xml?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/internals.xml (original)
+++ tcl/rivet/trunk/doc/xml/internals.xml Thu Dec 3 12:59:32 2015
@@ -10,7 +10,124 @@
(<command>svn</command>) can provide you with information about
what has been happening with the code.
</para>
- <section>
+ <sect2>
+ <title>Rivet approach to Apache Multiprocessing Models</title>
+ <para>
+ The Apache HTTP web server has an extremely modular architecture
+ that made it very popular among web developers. Most of the server
+ features can be implemented in external modules, including some of
+ the way the server interfaces to the operative system. The multiprocessing
+ modules are meant to provide different models for distributing the
+ server workload but also to cope with different operative systems
+ having their specific architectures and services.
+ </para>
+ <para>
+ From the very beginning mod_rivet was designed to work with
+ the <ulink url="http://httpd.apache.org/docs/2.4/mod/prefork.html">prefork MPM</ulink>
+ MPM (Multi Processing Module) which assumes the OS to have 'fork' capabilities.
+ This prerequisite basically restricted mod_rivet to work only with
+ Unix-like operative systems. Starting with version 3.0 we reorganized
+ mod_rivet to offer a design that could fit with different MPM and
+ hopefully pave the way to support different OS that have no 'fork'
+ call. At the same time we tried to preserve some of the basic
+ feature the 'fork' call, like the ability of 'cloning' a parent process
+ memory into its child, thus allowing fast initialization of interpreters
+ (even though this feature works only with the prefork MPM), having at the same
+ time a more general design
+ </para>
+ <para>
+ The central design of mod_rivet is relies on <quote>MPM bridges</quote>,
+ loadable modules that are supposed to adapt the module internal organization to
+ a given MPM class. This design is open to the development of more
+ MPM bridges implementing new models and adapting more efficiently to
+ specific MPMs. By now we have only 2 bridges
+ </para>
+ <itemizedlist>
+ <listitem>rivet_prefork_mpm.c: a bridge for the prefork MPM</listitem>
+ <listitem>rivet_worker_mpm.c: a threaded bridge creating a pool of threads
+ each running Tcl interpreters and communicating with the worker MPM threads
+ through a thread safe queue. This bridge is needed by the worker MPM.</listitem>
+ </itemizedlist>
+ </sect2>
+ <sect2>
+ <title>mod_rivet MPM Bridge callbacks</title>
+ <para>
+ A bridge is a loadable library implementing different ways to handle
+ specific features needed to mod_rivet. It was originally meant as a way
+ to handle the prefork/worker/event MPM specificities that prevented mod_rivet
+ from supporting each of them. Furthermore some features of fork capable
+ MPM (prefork) were fundamentally incompatible with threaded MPMs such as worker
+ and in principle would have needed to stuff the code with conditional
+ statements that implied useless complexity, error prone programming and performance costs.
+ New bridges could be imagined also to implement different models of workload
+ distribution and resource management (like the resources demanded by the Tcl interpreters).
+ We designed mod_rivet in order to call functions defined in the rivet_bridge_table structure
+ </para>
+ <programlisting>typedef struct _mpm_bridge_table {
+ RivetBridge_ServerInit *mpm_server_init;
+ RivetBridge_ChildInit *mpm_child_init;
+ RivetBridge_Request *mpm_request;
+ RivetBridge_Finalize *mpm_finalize;
+ RivetBridge_Master_Interp *mpm_master_interp;
+ RivetBridge_Exit_Handler *mpm_exit_handler;
+} rivet_bridge_table;</programlisting>
+ <para>
+ <itemizedlist>
+ <listitem><emphasis>mpm_server_init</emphasis>: pointer to any
+ specific server inititalization function. This field can be NULL
+ if no bridge specific initialization has to be done. The core of
+ mod_rivet runs the <command>ServerInitScript</command> before
+ calling this function.</listitem>
+ <listitem><emphasis>mpm_child_init</emphasis>: Bridge specific
+ child process initialization. If the pointer is assigned with
+ a non-NULL value the function is called by Rivet_ChildInit.
+ </listitem>
+ <listitem><emphasis>mpm_request</emphasis>: This pointer must
+ be assigned with a valid function pointer to the content generator
+ implemented by the bridge. If the pointer is not defined the Apache
+ web server will stop during start up. This condition is motivated by
+ the need of avoiding useless testing of the pointer. The fundamental
+ purpose of a content generator module (like mod_rivet) is to respond
+ to requests creating content, thus whatever it is
+ a content generating function must exist (during the early stages of
+ development you can create a simple test function for that)
+ </listitem>
+ <listitem><emphasis>mpm_finalize</emphasis>: pointer to a finalization
+ function called during a child process exit. This function is registered
+ as child process memory pool cleanup function. If the pointer is NULL
+ the pool is given a default cleanup function (apr_pool_cleanup_null)
+ defined in src/mod_rivet/mod_rivet.c. For instance the finalize function
+ in the <emphasis>worker</emphasis> MPM bridge notifies
+ a supervisor thread demanding the whole pool of threads running Tcl
+ interpreters to orderly exit. This pointer can be NULL if the bridge
+ has no special need when a child process must exit.
+ </listitem>
+ <listitem><emphasis>mpm_master_interp</emphasis>: This pointer must
+ be assigned with a valid function returning the child process master
+ interpreter descriptor. The master interpreter should be either the only
+ interpreter descriptor pointer of the child process (when
+ <command>SeparateVirtualInterps</command> is off (default)) or one of
+ the virtual host interpreter pointers. The current implementation of
+ the prefork and worker bridges return the interpreter associated to
+ the first record in the linked list of <command>server_rec</command>
+ records. When <command>SeparateVirtualInterps</command> is off
+ the <emphasis>prefork</emphasis> MPM bridge returns the interpreter
+ inherited through the fork call from the server parent process
+ </listitem>
+ <listitem><emphasis>mpm_exit_handler</emphasis>: mod_rivet replaces
+ the core <command>exit</command> command with a new one
+ (<command>::rivet::exit</command>) with a special handling of
+ the process exit allowing the current request process to be finished
+ interrupting the script execution and handing execution down to
+ <command>AbortScript</command>. If the bridge needs to be aware of
+ the exit call the is the function when special tasks can be carried out.
+ With the <emphasis>worker</emphasis> MPM bridge the finalize function
+ is called after the current thread itself is set up for termination.
+ </listitem>
+ </itemizedlist>
+ </para>
+ </sect2>
+ <sect2>
<title>Initialization</title>
<para>
When Apache is started, (or when child Apache processes are
@@ -24,8 +141,8 @@
system is also set up, and if there is a
<command>GlobalInitScript</command>, it is run.
</para>
- </section>
- <section>
+ </sect2>
+ <sect2>
<title>RivetChan</title>
<para>
The <structname>RivetChan</structname> system was created in
@@ -36,10 +153,10 @@
predetermined times, passes it on to Apache's IO system.
Tcl's regular standard output is replaced with an instance of
this channel type, so that, by default, output will go to the
- web page.
+ web page.
</para>
- </section>
- <section>
+ </sect2>
+ <sect2>
<title>The <command>global</command> Command</title>
<para>
Rivet aims to run standard Tcl code with as few surprises as
@@ -57,8 +174,8 @@
<command>::global</command> or add the :: namespace qualifier
to variables you wish to make global.
</para>
- </section>
- <section>
+ </sect2>
+ <sect2>
<title>Page Parsing, Execution and Caching</title>
<para>
When a Rivet page is requested, it is transformed into an
@@ -89,8 +206,8 @@
The number of scripts stored in memory is configurable. This
feature can significantly improve performance.
</para>
- </section>
- <section>
+ </sect2>
+ <sect2>
<title>Extending Rivet by developing C procedures implementing new commands</title>
<para>
Rivet endows the Tcl interpreter with new commands
@@ -129,8 +246,9 @@
Define the command and associated C language procedure
in src/rivetcmds/rivetCore.c using the macro
<option>RIVET_OBJ_CMD</option>
- <programlisting>RIVET_OBJ_CMD("mycmd",Rivet_MyCmd)</programlisting>
+ <programlisting>RIVET_OBJ_CMD("mycmd",Rivet_MyCmd,private)</programlisting>
This macro ensures the command is defined as <command>::rivet::mycmd</command>
+ and its ClientData pointer is defined with the thread private data
</listitem>
<listitem>
Add the code of Rivet_MyCmd to src/rivetcmd/rivetCore.c (in case
@@ -143,9 +261,11 @@
put add the macro testing for the pointer
<programlisting>TCL_CMD_HEADER( Rivet_MyCmd )
{
- rivet_interp_globals *globals = Tcl_GetAssocData( interp, "rivet", NULL );
+ /* we have to fetch the thread private data */
+
+ THREAD_PRIVATE_DATA(private)
....
- CHECK_REQUEST_REC(globals->r,"::rivet::mycmd");
+ CHECK_REQUEST_REC(private,"::rivet::mycmd");
...
}</programlisting>
</listitem>
@@ -166,28 +286,30 @@ mycmd->1</programlisting>
The value associated to the test must be <option>0</option> in case the
command doesn't need to test the <command>globals->r</command> pointer.
</listitem>
-
</itemizedlist>
- </section>
- <section>
+ </sect2>
+ <sect2>
<title>Debugging Rivet and Apache</title>
<para>
- If you are interested in hacking on Rivet, you're welcome to
- contribute! Invariably, when working with code, things go
- wrong, and it's necessary to do some debugging. In a server
- environment like Apache, it can be a bit more difficult to
- find the right way to do this. Here are some techniques to
- try.
- </para>
- <para>
- The first thing you should know is that Apache can be launched
- as a <emphasis>single process</emphasis> with the
- <option>-X</option> argument:</para>
- <programlisting>httpd -X</programlisting>.
- <para>
- On Linux, one of the first things to try is the system call
- tracer, <command>strace</command>. You don't even have to
- recompile Rivet or Apache for this to work.
+ If you are interested in hacking on Rivet, you're welcome to
+ contribute! Invariably, when working with code, things go
+ wrong, and it's necessary to do some debugging. In a server
+ environment like Apache, it can be a bit more difficult to
+ find the right way to do this. Here are some techniques to
+ try.
+ </para>
+ <para>
+ The first thing you should know is that Apache can be launched
+ as a <emphasis>single process</emphasis> with the
+ <option>-X</option> argument:
+ </para>
+
+ <programlisting>httpd -X</programlisting>.
+
+ <para>
+ On Linux, one of the first things to try is the system call
+ tracer, <command>strace</command>. You don't even have to
+ recompile Rivet or Apache for this to work.
</para>
<programlisting>strace -o /tmp/outputfile -S 1000 httpd -X</programlisting>
@@ -216,6 +338,7 @@ mycmd->1</programlisting>
<option>-enable-symbols</option> option and after you have
set the CFLAGS and LDFLAGS environment variables
</para>
+
<programlisting>export CFLAGS="-g -O0"
export LDFLAGS="-g"
./configure --enable-symbols ......
@@ -233,8 +356,7 @@ make install</programlisting>
Apache in single process mode with -X:
</para>
- <programlisting>
-@ashland [~] $ gdb /usr/sbin/apache.dbg
+ <programlisting>@ashland [~] $ gdb /usr/sbin/apache.dbg
GNU gdb 5.3-debian
Copyright 2002 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
@@ -247,16 +369,12 @@ Starting program: /usr/sbin/apache.dbg -
[New Thread 16384 (LWP 13598)]
.
.
-.
- </programlisting>
+.</programlisting>
<para>
- When your apache session is up and running, you can request a
- web page with the browser, and see where things go wrong (if
- you are dealing with a crash, for instance).
+ When your apache session is up and running, you can request a
+ web page with the browser, and see where things go wrong (if
+ you are dealing with a crash, for instance).
</para>
-
- </section>
-
- </section>
-
+ </sect2>
+ </section>
\ No newline at end of file
Modified: tcl/rivet/trunk/doc/xml/intro.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/intro.xml?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/intro.xml (original)
+++ tcl/rivet/trunk/doc/xml/intro.xml Thu Dec 3 12:59:32 2015
@@ -17,7 +17,6 @@
giving you ideas on how to best take advantage of Rivet's
architecture to create different styles of web site.
</para>
-
<para>
This documentation is focused on the current version of Rivet, but
still a work in progress, and, like everything
@@ -28,21 +27,19 @@
</para>
<simplesect>
- <title>Acknowledgements</title>
+ <title>Introduction</title>
<para>
- Rivet's development took advantage from contributions from
- several users who provided whole new componenents, bug fixes and
- enhancements.
+ Rivet 3.0 ships with a major rewriting of mod_rivet, the Apache HTTP
+ Websever module at the core of Rivet. With this version of the module
+ we attained full support of different MPM (Multiprocessing Modules) for
+ the Apache framework, whereas previous version of mod_rivet only supported
+ the prefork MPM.
</para>
- <itemizedlist>
+ <!-- itemizedlist>
+ <listitem>
+ </listitem>
<listitem>
- <emphasis>Harald Oehlmann</emphasis> (now member of the Apache Tcl Team)
- who wrote package RivetEntitites, command ::rivet::http_accept and filed
- several bug reports with relative patches
</listitem>
- <listitem><emphasis>Cyril Shtumf</emphasis> filed several important bugfixes</listitem>
- <listitem><emphasis>Jeff Lawson</emphasis> who patched Rivet parser to add the
- shorthand syntax for string output and filed several bug reports</listitem>
- </itemizedlist>
- </simplesect>
+ </itemizedlist -->
+ </simplesect>
</section>
Modified: tcl/rivet/trunk/rivet/init.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/init.tcl?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/init.tcl (original)
+++ tcl/rivet/trunk/rivet/init.tcl Thu Dec 3 12:59:32 2015
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package provide Rivet 2.3
+package provide Rivet 3.0
namespace eval ::Rivet {
Modified: tcl/rivet/trunk/rivet/packages/hexglyphs/hexglyphs.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/packages/hexglyphs/hexglyphs.tcl?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/packages/hexglyphs/hexglyphs.tcl (original)
+++ tcl/rivet/trunk/rivet/packages/hexglyphs/hexglyphs.tcl Thu Dec 3 12:59:32 2015
@@ -168,6 +168,178 @@ set ::HexGlyphs::HEXGLYPH(G) {
\_____/
}
+set ::HexGlyphs::HEXGLYPH(H) {
+ _ _
+| | | |
+| |_| |
+| _ |
+| | | |
+|_| |_|
+}
+
+set ::HexGlyphs::HEXGLYPH(I) {
+ ___
+| |
+ | |
+ | |
+ | |
+|___|
+}
+
+set ::HexGlyphs::HEXGLYPH(J) {
+ ___
+ | |
+ | |
+ _ | |
+| || |
+\____/
+}
+
+set ::HexGlyphs::HEXGLYPH(K) {
+ _ _
+| | / |
+| |/ /
+| <
+| |\ \
+|_| \_\
+}
+
+set ::HexGlyphs::HEXGLYPH(L) {
+ _
+| |
+| |
+| |
+| |___
+|_____|
+}
+
+set ::HexGlyphs::HEXGLYPH(M) {
+ _ _
+| \ / |
+| \/ |
+| | | |
+| | | |
+|_| |_|
+}
+
+set ::HexGlyphs::HEXGLYPH(N) {
+ _ _
+| \ | |
+| \ | |
+| \ \| |
+| |\ |
+|_| \__|
+}
+
+set ::HexGlyphs::HEXGLYPH(O) {
+ _____
+| _ |
+| | | |
+| | | |
+| |_| |
+|_____|
+}
+
+set ::HexGlyphs::HEXGLYPH(P) {
+ ____
+| _ \
+| |_| |
+| __/
+| |
+|_|
+}
+
+set ::HexGlyphs::HEXGLYPH(Q) {
+ _____
+| _ |
+| | | |
+| |_| |
+|___\\|
+ \\
+}
+
+set ::HexGlyphs::HEXGLYPH(R) {
+ ____
+| _ \
+| |_| |
+| /
+| |\ \
+|_| \_\
+}
+
+set ::HexGlyphs::HEXGLYPH(S) {
+ ____
+/ __|
+| |__
+\__ \
+ __| |
+|____/
+}
+
+set ::HexGlyphs::HEXGLYPH(T) {
+ _____
+|_ _|
+ | |
+ | |
+ | |
+ |_|
+}
+
+set ::HexGlyphs::HEXGLYPH(U) {
+ _ _
+| | | |
+| | | |
+| | | |
+| |_| |
+ \___/
+}
+
+set ::HexGlyphs::HEXGLYPH(V) {
+ __ __
+ \ \ / /
+ \ \ / /
+ \ v /
+ \ /
+ v
+}
+
+set ::HexGlyphs::HEXGLYPH(W) {
+ __ __
+ \ \ / /
+ \ \/\/ /
+ \ /
+ \__/
+
+}
+
+set ::HexGlyphs::HEXGLYPH(X) {
+ __ __
+ \ \/ /
+ \ /
+ / \
+ / /\ \
+/_/ \_\
+}
+
+set ::HexGlyphs::HEXGLYPH(Y) {
+ __ __
+ \ \ / /
+ \ \/ /
+ \ /
+ / /
+ /_/
+}
+
+set ::HexGlyphs::HEXGLYPH(Z) {
+ ______
+ |____ |
+ / /
+ / /
+ / /___
+ /______|
+}
+
+
set ::HexGlyphs::HEXGLYPH(0) {
___
/ _ \
@@ -258,23 +430,69 @@ set ::HexGlyphs::HEXGLYPH(9) {
}
set ::HexGlyphs::HEXGLYPH(-) {
-
-
- _____
-|_____|
-
-
+
+
+ ____
+|____|
+
+
+}
+
+set ::HexGlyphs::HEXGLYPH(_) {
+
+
+
+
+ ______
+|______|
}
set ::HexGlyphs::HEXGLYPH(:) {
-
- __
- |__|
- __
- |__|
-
-
+
+ _
+ |_|
+ _
+ |_|
+
+}
+
+set ::HexGlyphs::HEXGLYPH(;) {
+
+ _
+ |_|
+ _
+ | |
+ |/
+}
+
+set ::HexGlyphs::HEXGLYPH(.) {
+
+
+
+ _
+ |_|
+
+}
+
+set ::HexGlyphs::HEXGLYPH(/) {
+ __
+ / /
+ / /
+ / /
+ / /
+ /_/
+}
+
+set ::HexGlyphs::HEXGLYPH(\) {
+ __
+ \ \
+ \ \
+ \ \
+ \ \
+ \_\
}
+
+
package provide HexGlyphs 0.1
Modified: tcl/rivet/trunk/rivet/rivet-tcl/catch.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/rivet-tcl/catch.tcl?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/rivet-tcl/catch.tcl (original)
+++ tcl/rivet/trunk/rivet/rivet-tcl/catch.tcl Thu Dec 3 12:59:32 2015
@@ -28,11 +28,11 @@ namespace eval ::rivet {
if {$catch_ret && [::rivet::abort_page -aborting]} {
- return -code error -errorcode ABORTPAGE
+ return -code error -errorcode ABORTPAGE 1
} elseif {$catch_ret && [::rivet::abort_page -exiting]} {
- return -code error -errorcode EXITPAGE
+ return -code error -errorcode EXITPAGE 1
} else {
Modified: tcl/rivet/trunk/src/mod_rivet/mod_rivet.h
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/mod_rivet/mod_rivet.h?rev=1717754&r1=1717753&r2=1717754&view=diff
==============================================================================
--- tcl/rivet/trunk/src/mod_rivet/mod_rivet.h (original)
+++ tcl/rivet/trunk/src/mod_rivet/mod_rivet.h Thu Dec 3 12:59:32 2015
@@ -105,7 +105,7 @@ typedef struct _rivet_server_conf {
/* This flag is used with the above directives. If any of them have changed, it gets set. */
- unsigned int user_scripts_status;
+ unsigned int user_scripts_status;
int default_cache_size;
int upload_max;
@@ -184,8 +184,8 @@ typedef struct _mod_rivet_globals {
server_interp; /* server and prefork MPM interpreter */
apr_thread_mutex_t* pool_mutex; /* threads commmon pool mutex */
- rivet_bridge_table* bridge_jump_table; /* Jump table to bridge specific procedures */
- mpm_bridge_status* mpm; /* bridge private control structure */
+ rivet_bridge_table* bridge_jump_table; /* Jump table to bridge specific procedures */
+ mpm_bridge_status* mpm; /* bridge private control structure */
#ifdef RIVET_SERIALIZE_HTTP_REQUESTS
apr_thread_mutex_t* req_mutex;
@@ -225,7 +225,7 @@ typedef struct _thread_worker_private {
/* eventually we will transfer 'global' variables in here and 'de-globalize' them */
typedef struct _rivet_interp_globals {
- Tcl_Namespace* rivet_ns; /* Rivet commands namespace */
+ Tcl_Namespace* rivet_ns; /* Rivet commands namespace */
} rivet_interp_globals;
/* Job types a worker thread is supposed to respond to */
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org