This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch winbuild
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit de7611e33e3c248433e382ae34c5df74d1ad7cda
Merge: 803b468 3ee8278
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Thu Jan 31 10:02:16 2019 +0100
Merge branch 'master' into winbuild
.appveyor.yml | 22 ++++++++++++++++--
ChangeLog | 30 +++++++++++++++++++++++++
README.md | 4 ++--
cmake/CMakeLists.txt | 8 ++++---
configure.ac | 1 +
doc/rivet.xml | 35 ++++++++++++++++-------------
doc/rivet.xml.in | 45 ++++++++++++++++++++-----------------
doc/xml/installation.xml | 20 ++++++++---------
doc/xml/internals.xml | 15 +++++++------
doc/xml/intro.xml | 23 +++++++++----------
doc/xml/processing.xml | 3 ++-
src/mod_rivet_ng/rivetCore.c | 4 ++--
src/mod_rivet_ng/rivet_types.h | 27 ++++++++++++++++++++--
src/mod_rivet_ng/rivet_worker_mpm.c | 13 +++++------
src/rivet.h | 1 +
15 files changed, 166 insertions(+), 85 deletions(-)
diff --cc doc/rivet.xml
index 91e929a,a4fe95e..3acaa65
--- a/doc/rivet.xml
+++ b/doc/rivet.xml
@@@ -35,22 -35,25 +35,25 @@@
<!ENTITY asciiglyphs.xml SYSTEM "xml/asciiglyphs.xml" >
<!ENTITY lazybridge.xml SYSTEM "xml/lazybridge.xml" >
<!ENTITY formbroker.xml SYSTEM "xml/formbroker.xml" >
- <!ENTITY version "3.2" >
- <!ENTITY fullversion "3.2.0" >
- <!ENTITY version2-series "2.0,2.1,2.2,2.3,2.4" >
- <!ENTITY version2-generic "2.x" >
- <!ENTITY version30 "3.0" >
- <!ENTITY version31 "3.1" >
+ <!ENTITY version "3.2" >
+ <!ENTITY fullversion "3.2.1" >
+ <!ENTITY version2-series "2.0,2.1,2.2,2.3" >
+ <!ENTITY version2-generic "2.x" >
+ <!ENTITY version30 "3.0" >
+ <!ENTITY version31 "3.1" >
<!ENTITY tcltk-url "http://www.tcl.tk/"; >
<!ENTITY apache-url "http://httpd.apache.org"; >
+ <!ENTITY apache-apr "http://apr.apache.org/"; >
+ <!ENTITY apache-apreq "http://httpd.apache.org/apreq/"; >
+ <!ENTITY rivet-download
"http://tcl.apache.org/rivet/html/download.html"; >
<!ENTITY apachedoc-vhost "https://httpd.apache.org/docs/2.4/vhosts";
>
- <!ENTITY apachedoc-mpm
"https://httpd.apache.org/docs/2.4/mpm.html"; >
- <!ENTITY apachedoc-prefork
"https://httpd.apache.org/docs/2.4/mod/prefork.html"; >
- <!ENTITY apachedoc-worker
"https://httpd.apache.org/docs/2.4/mod/worker.html"; >
- <!ENTITY apachedoc-event
"https://httpd.apache.org/docs/2.4/mod/event.html"; >
- <!ENTITY apachedoc-winnt
"https://httpd.apache.org/docs/2.4/mod/mpm_winnt.html"; >
+ <!ENTITY apachedoc-mpm
"https://httpd.apache.org/docs/2.4/mpm.html"; >
+ <!ENTITY apachedoc-prefork
"https://httpd.apache.org/docs/2.4/mod/prefork.html"; >
+ <!ENTITY apachedoc-worker
"https://httpd.apache.org/docs/2.4/mod/worker.html"; >
+ <!ENTITY apachedoc-event
"https://httpd.apache.org/docs/2.4/mod/event.html"; >
+ <!ENTITY apachedoc-winnt
"https://httpd.apache.org/docs/2.4/mod/mpm_winnt.html"; >
<!ENTITY apachedoc-docroot
"https://httpd.apache.org/docs/2.4/mod/core.html#documentroot"; >
- <!ENTITY apachedoc-alias
"https://httpd.apache.org/docs/2.4/mod/mod_alias.html"; >
+ <!ENTITY apachedoc-alias
"https://httpd.apache.org/docs/2.4/mod/mod_alias.html"; >
<!ENTITY apachedoc-rewrite
"https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html"; >
<!ENTITY apachedoc-perftuning
"https://httpd.apache.org/docs/2.4/misc/perf-tuning.html"; >
]>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
