You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2002/01/06 20:27:01 UTC
cvs commit: tcl-rivet/src mod_rivet.c tcl_commands.c
davidw 02/01/06 11:27:01
Modified: . ChangeLog
doc README.hpux commands.html help.html install.html
nav.html other.html split.tcl style.css top.html
src mod_rivet.c tcl_commands.c
Log:
* Documentation: Big cleanup, updating everything from mod_dtcl.
Revision Changes Path
1.11 +2 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 6 Jan 2002 13:30:54 -0000 1.10
+++ ChangeLog 6 Jan 2002 19:27:01 -0000 1.11
@@ -1,5 +1,7 @@
2002-01-06 David N. Welton <da...@dedasys.com>
+ * Documentation: Big cleanup, updating everything from mod_dtcl.
+
* General: Changed .ttml to .rvt. Also changed mime type to
x-httpd-rivet. Changed all references in documentation to .rvt
from .ttml.
1.3 +3 -3 tcl-rivet/doc/README.hpux
Index: README.hpux
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/README.hpux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.hpux 19 Sep 2001 22:59:01 -0000 1.2
+++ README.hpux 6 Jan 2002 19:27:01 -0000 1.3
@@ -1,15 +1,15 @@
A bit of information from Craig Huckabee (huck@nosc.mil) regarding
building Rivet on HPUX:
-
+
I had to tweak the makefile to get everything to build (adding some
- include and library paths and -DEAPI) Apparently that Rivet_module
+ include and library paths and -DEAPI) Apparently that rivet_module
[this is from an error he was getting - davidw] came from one of the
steps described in the Apache documentation for installing a DSO. I
rebuilt and redid the steps and now it appears to work OK. My next
test will be using some of the tcl extensions and seeing how well they
work.
-
+
I also have to track down and beat out a linker problem with Tcl
itself. I had to add -lm to your makefile to include the math
libraries when linking against my Tcl build which is wrong. Somewhere
1.6 +130 -120 tcl-rivet/doc/commands.html
Index: commands.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/commands.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- commands.html 6 Jan 2002 13:30:54 -0000 1.5
+++ commands.html 6 Jan 2002 19:27:01 -0000 1.6
@@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <!-- $Id: commands.html,v 1.5 2002/01/06 13:30:54 davidw Exp $ -->
+ <!-- $Id: commands.html,v 1.6 2002/01/06 19:27:01 davidw Exp $ -->
<html>
<head>
- <title>Rivet tcl commands</title>
+ <title>Apache Rivet Tcl Commands</title>
<link rel="stylesheet" href="style.css">
</head>
<body>
@@ -13,77 +13,83 @@
<li><code><b>var</b></code><br> These commands retrieve or
retrieve information about "CGI" variables that are passed to
the rivet script via GET or POST operations.
- </li>
- <li>
- <code><b>var get <i>varname</i></b></code><br> Returns the
- value of variable 'varname' as a string (even if there are
- multiple values).
- </li>
- <li>
- <code><b>var list <i>varname</i></b></code><br>
- Returns the value of variable 'varname' as a list, if there
- are multiple values.
- </li>
- <li>
- <code><b>var exists <i>varname</i></b></code><br>
- Returns 1 if <i>varname</i> exists, 0 if it doesn't.
- </li>
- <li>
- <code><b>var number</b></code><br>
- Returns the number of variables.
- </li>
- <li>
- <code><b>var all</b></code><br>
- Return a list of variable names and values.
+ <ul>
+ <li>
+ <code><b>var get <i>varname</i></b></code><br> Returns the
+ value of variable 'varname' as a string (even if there are
+ multiple values).
+ </li>
+ <li>
+ <code><b>var list <i>varname</i></b></code><br>
+ Returns the value of variable 'varname' as a list, if there
+ are multiple values.
+ </li>
+ <li>
+ <code><b>var exists <i>varname</i></b></code><br>
+ Returns 1 if <i>varname</i> exists, 0 if it doesn't.
+ </li>
+ <li>
+ <code><b>var number</b></code><br>
+ Returns the number of variables.
+ </li>
+ <li>
+ <code><b>var all</b></code><br>
+ Return a list of variable names and values.
+ </li>
+ </ul>
</li>
<li><code><b>upload</b></code><br> These commands retrieve or
retrieve information about files that have been uploaded to
- the server. They replace the <code>UPLOAD</code> variable.
- </li>
- <li>
- <code><b>upload get <i>varname</i> channel</b></code><br>
- Returns a Tcl channel that can be used to access the uploaded file.
- </li>
- <li>
- <code><b>upload get <i>varname</i> save <i>name</i></b></code><br>
- Moves the uploaded file to the give name.
- </li>
- <li>
- <code><b>upload get <i>varname</i> data</b></code><br>
- Returns data uploaded to the server. This is binary clean.
+ the server.
+ <ul>
+ <li>
+ <code><b>upload get <i>varname</i> channel</b></code><br>
+ Returns a Tcl channel that can be used to access the uploaded file.
+ </li>
+ <li>
+ <code><b>upload get <i>varname</i> save <i>name</i></b></code><br>
+ Moves the uploaded file to the give name.
+ </li>
+ <li>
+ <code><b>upload get <i>varname</i> data</b></code><br>
+ Returns data uploaded to the server. This is binary clean.
+ </li>
+
+ <li>
+ <code><b>upload info <i>varname</i> exists</b></code><br>
+ Returns 1 if the variable exists, 0 if not.
+ </li>
+ <li>
+ <code><b>upload info <i>varname</i> size</b></code><br>
+ Returns the size of the file uploaded.
+ </li>
+ <li>
+ <code><b>upload info <i>varname</i> type</b></code><br>If the
+ Content-type is set, it is returned, otherwise, an empty
+ string.
+ </li>
+ <li>
+ <code><b>upload info <i>varname</i> filename</b></code><br>
+ Returns the filename on the remote host that uploaded the file.
+ </li>
+ <li>
+ <code><b>upload names</b></code><br> Returns the variable
+ names, as a list, of all the files uploaded.
+ </li>
+ </ul>
</li>
<li>
- <code><b>upload info <i>varname</i> exists</b></code><br>
- Returns 1 if the variable exists, 0 if not.
- </li>
- <li>
- <code><b>upload info <i>varname</i> size</b></code><br>
- Returns the size of the file uploaded.
- </li>
- <li>
- <code><b>upload info <i>varname</i> type</b></code><br>If the
- Content-type is set, it is returned, otherwise, an empty
- string.
- </li>
- <li>
- <code><b>upload info <i>varname</i> filename</b></code><br>
- Returns the filename on the remote host that uploaded the file.
- </li>
- <li>
- <code><b>upload names</b></code><br> Returns the variable
- names, as a list, of all the files uploaded.
+ <code><b>load_env <i>array_name</i></b></code><br> Load the
+ array of environment variables into the specified array name.
</li>
<li>
- <code><b>hgetvars</b></code><br> Get environmental, and Cookie
- variables. This is in a seperate command so as not to make the
- server do this every time you load an .rvt file. <code>ENVS</code> and
- <code>COOKIES</code> are the associative arrays created. <code>ENVS</code> contains
- environmental variables, and <code>COOKIES</code> contains any cookies
- recieved from the client.
+ <code><b>load_cookies <i>array_name</i></b></code><br> Load
+ the array of cookie variables into the specified array name.
</li>
+
<li>
<code><b>include <i>filename</i></b></code><br>
Include a file without parsing it. This is the best
@@ -95,37 +101,41 @@
other .rvt files.
</li>
<li>
- <code><b>headers redirect <i>uri</i></b></code><br>
-
- Redirect from the current page to a new
- URI. <b>Must</b> be done in the first block of TCL code.
- </li>
- <li>
- <code><b>headers setcookie <i>-name cookie-name
- -value cookie-value ?-expires date/time? ?-domain domain?
- ?-path path? ?-secure?</i></b></code><br>
-
- This command is for setting cookies. Cookie-name is
- the name of the cookie, cookie-value is the data
- associated with the variable. Expires sets an
- expiration date for the cookie, and must be in the
- format 'DD-Mon-YY HH:MM:SS', path sets the path for
- which the cookie is valid, and secure specifies that
- the cookie is only to be transmitted if the connection
- is secure (HTTPS).
- </li>
- <li>
- <code><b>headers type
- <i>content-type</i></b></code><br>
-
- This command sets the "Content-type:" header returned
- by the script, which is useful if you wish to create a
- PNG (image), for example, with Rivet.
- </li>
- <li>
- <code><b>headers set <i>headername value</i></b></code><br>
-
- Set arbitrary header names and values.
+ <code><b>headers</b></code><br>
+ Commands to manipulate http headers.
+ <ul>
+ <li>
+ <code><b>headers redirect <i>uri</i></b></code><br>
+ Redirect from the current page to a new
+ URI. <b>Must</b> be done in the first block of TCL code.
+ </li>
+ <li>
+ <code><b>headers setcookie <i>-name cookie-name
+ -value cookie-value ?-expires date/time? ?-domain domain?
+ ?-path path? ?-secure?</i></b></code><br>
+ This command is for setting cookies. Cookie-name is
+ the name of the cookie, cookie-value is the data
+ associated with the variable. Expires sets an
+ expiration date for the cookie, and must be in the
+ format 'DD-Mon-YY HH:MM:SS', path sets the path for
+ which the cookie is valid, and secure specifies that
+ the cookie is only to be transmitted if the connection
+ is secure (HTTPS).
+ </li>
+ <li>
+ <code><b>headers type
+ <i>content-type</i></b></code><br>
+
+ This command sets the "Content-type:" header returned
+ by the script, which is useful if you wish to create a
+ PNG (image), for example, with Rivet.
+ </li>
+ <li>
+ <code><b>headers set <i>headername value</i></b></code><br>
+
+ Set arbitrary header names and values.
+ </li>
+ </ul>
</li>
<li>
@@ -143,34 +153,34 @@
HTML. Currently, only the PID and size of the object
cache are reported.
</li>
-<!--
+ <!--
<li>
- Note that these variables may be lists if more than one file
- is uploaded at a time.<br>
- <code><b>$::request::UPLOAD(filename)</b></code><br>
- The filename of the uploaded file.<br>
-
- <code><b>$::request::UPLOAD(name)</b></code><br>
- The form variable name of the upload.<br>
-
- <code><b>$::request::UPLOAD(size)</b></code><br>
- The size of the uploaded file.<br>
-
- <code><b>$::request::UPLOAD(type)</b></code><br>
- The content type of the file upload. <i>Not always available!</i><br>
-
- <code><b>$::request::UPLOAD(channelname)</b></code><br> The
- name of a Tcl channel which may be used to manipulate the
- uploaded file. If Rivet_UploadFilesToVar is set, this
- variable doesn't get created. If no file is passed to the
- server, this variable does not exist! Be sure to check for
- this.<br>
-
- <code><b>$::request::UPLOAD(data)</b></code><br>
- Contents of the uploaded file, if Rivet_UploadFilesToVar is
- set.<br>
- </li>
--->
+ Note that these variables may be lists if more than one file
+ is uploaded at a time.<br>
+ <code><b>$::request::UPLOAD(filename)</b></code><br>
+ The filename of the uploaded file.<br>
+
+ <code><b>$::request::UPLOAD(name)</b></code><br>
+ The form variable name of the upload.<br>
+
+ <code><b>$::request::UPLOAD(size)</b></code><br>
+ The size of the uploaded file.<br>
+
+ <code><b>$::request::UPLOAD(type)</b></code><br>
+ The content type of the file upload. <i>Not always available!</i><br>
+
+ <code><b>$::request::UPLOAD(channelname)</b></code><br> The
+ name of a Tcl channel which may be used to manipulate the
+ uploaded file. If Rivet_UploadFilesToVar is set, this
+ variable doesn't get created. If no file is passed to the
+ server, this variable does not exist! Be sure to check for
+ this.<br>
+
+ <code><b>$::request::UPLOAD(data)</b></code><br>
+ Contents of the uploaded file, if Rivet_UploadFilesToVar is
+ set.<br>
+ </li>
+ -->
</ul>
</body>
</html>
1.3 +5 -5 tcl-rivet/doc/help.html
Index: help.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/help.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- help.html 19 Sep 2001 22:59:01 -0000 1.2
+++ help.html 6 Jan 2002 19:27:01 -0000 1.3
@@ -6,7 +6,7 @@
</head>
<body>
<h2>Where to get help with Rivet</h2>
-
+
<ul>
<li><b>Mailing list</b><br>
<p>
@@ -15,11 +15,11 @@
</p>
<p>
<a
- href="mailto:Rivet@tcl.apache.org">Rivet@tcl.apache.org</a>
- is the mailing list address.
+ href="mailto:rivet-dev@tcl.apache.org">rivet-dev@tcl.apache.org</a>
+ is the mailing list address.
<p>To subscribe to the mailing list, send an empty email
to <a
- href="mailto:Rivet-subscribe@tcl.apache.org">Rivet-subscribe@tcl.apache.org</a>.</p>
+ href="mailto:rivet-dev-subscribe@tcl.apache.org">rivet-dev-subscribe@tcl.apache.org</a>.</p>
</p>
<p>
Currently, lists are not archived. If you'd like to help
@@ -29,4 +29,4 @@
</ul>
</body>
</html>
- <!-- $Id: help.html,v 1.2 2001/09/19 22:59:01 davidw Exp $ -->
\ No newline at end of file
+ <!-- $Id: help.html,v 1.3 2002/01/06 19:27:01 davidw Exp $ -->
\ No newline at end of file
1.4 +34 -56 tcl-rivet/doc/install.html
Index: install.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/install.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- install.html 6 Jan 2002 13:30:54 -0000 1.3
+++ install.html 6 Jan 2002 19:27:01 -0000 1.4
@@ -6,7 +6,7 @@
</head>
<body>
- <!-- $Id: install.html,v 1.3 2002/01/06 13:30:54 davidw Exp $ -->
+ <!-- $Id: install.html,v 1.4 2002/01/06 19:27:01 davidw Exp $ -->
<h2 align="center">Rivet Installation</h2>
<ol>
@@ -19,18 +19,19 @@
</li>
<li><b>Get Rivet</b><br>
- If you are running a Debian or FreeBSD system, there
+<!-- If you are running a Debian or FreeBSD system, there
are pre-built packages available at:
<a target="_top" href="http://www.debian.org/Packages/unstable/web/libapache-mod-rivet.html">http://www.debian.org/Packages/unstable/web/libapache-mod-rivet.html</a>
or
- <a
- target="_top" href="http://www.freebsd.org/cgi/ports.cgi?query=Rivet">http://www.freebsd.org/cgi/ports.cgi?query=Rivet</a>.<br>
+ <a target="_top"
+ href="http://www.freebsd.org/cgi/ports.cgi?query=Rivet">http://www.freebsd.org/cgi/ports.cgi?query=Rivet</a>.<br>
+ -->
- Otherwise, download the sources at <a target="_top"
+ Download the sources at <a target="_top"
href="download/">http://tcl.apache.org/Rivet/download/</a>.
- <br>
+
</li>
<li><b>Uncompress the sources</b><br>
<code>
@@ -59,71 +60,48 @@
<ul>
<li><b>For shared objects</b><br>
- <code>cd ../Rivet/<br></code>
- Edit the <code>buildrivet.sh</code> script. The 3
- variables you may need to change are:
- <ul>
- <li><code>TCLSH</code><br>
- Name of the tclsh program on your computer.
- </li>
- <li><code>APACHE</code><br>
- Location of the Apache sources (for static builds only).
- </li>
- <li><code>INC</code><br>
- Location of the Apache headers (you will need this even
- for building shared objects).
- </li>
- </ul>
-
+ <code>cd ../tcl-rivet/<br></code> Edit the
+ <code>make.tcl</code> script. You need to change the
+ <code>INC</code> variable to reflect the location of your
+ Apache include files.
+ <p>
+ Run the Tcl "make" script:<br>
<code>
- ./buildrivet.sh shared
+ ./make.tcl
</code><br>
-
- <code>
- cp Rivet.so
- /usr/lib/apache/wherever/the/other/shared/objects/reside
- </code> For shared object builds, you need to copy the
- object into the directory where the other shared
- objects are kept for your Apache build. On Debian
- GNU/Linux systems, for instance, this is in
- <code>/usr/lib/apache/1.3/</code>.
-
+ </p>
+ <p>
+ <code>
+ cp mod_rivet.so /usr/lib/apache/libexec/...
+ </code> <br>
+ For shared object builds, you need to copy the object
+ into the directory where the other shared objects are
+ kept for your Apache build. On Debian GNU/Linux
+ systems, for instance, this is in
+ <code>/usr/lib/apache/1.3/</code>.
+ </p>
</li>
<li><b>For static builds</b><br>
<code>
cd apache-1.3.X/<br>
- ./configure<br>
+ ./configure [<b>without</b> options]<br>
</code>
- <code>cd ../Rivet/<br></code>
- Edit the <code>buildrivet.sh</code> script. The 3
- variables you may need to change are:
- <ul>
- <li><code>TCLSH</code><br>
- Name of the tclsh program on your computer.
- </li>
- <li><code>APACHE</code><br>
- Location of the Apache sources (for static builds only).
- </li>
- <li><code>INC</code><br>
- Location of the Apache headers (you will need this even
- for building shared objects).
- </li>
- </ul>
-
+ <code>cd path/to/tcl-rivet/<br></code> Edit the
+ <code>make.tcl</code> script. You need to change the
+ <code>INC</code> variable to reflect the location of your
+ Apache include files.<br>
<code>
- ./buildrivet.sh static
+ ./make.tcl static
</code><br>
<code>
- ./buildrivet.sh install
+ ./make.tcl install
</code><br>
<code>cd ../apache-1.3.X<br></code>
- <code>./configure
- --activate-module=src/modules/Rivet/Rivet.a [ other configure
- options ]<br></code>
+ <code>./configure --activate-module=src/modules/Rivet/Rivet.a [ other configure options ]<br></code>
<code>export EXTRA_LIBS="-ltcl8.X -lm"</code><br>
<code>make -e<br></code>
<code>make install<br></code>
@@ -135,7 +113,7 @@
<ul>
<li>
<b>http.conf</b><br> <code>LoadModule rivet_module
- /usr/lib/apache/1.3/Rivet.so</code><br>
+ /usr/lib/apache/1.3/mod_rivet.so</code><br>
This points Apache to the shared object if
Rivet is being used as a loadable module.
</li>
1.3 +4 -4 tcl-rivet/doc/nav.html
Index: nav.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/nav.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nav.html 19 Sep 2001 22:59:01 -0000 1.2
+++ nav.html 6 Jan 2002 19:27:01 -0000 1.3
@@ -7,7 +7,7 @@
div.box {
border: solid;
border-width: medium;
- border-color: #cc3300;
+ border-color: #003399;
padding: 0.25em;
}
</style>
@@ -43,11 +43,11 @@
</tr>
<tr>
- <td><a target="_top" href="http://tcl.apache.org/Rivet/">Rivet
- web site</a></td>
+ <td><a target="_top"
+ href="http://tcl.apache.org/rivet/">Apache Rivet web site</a></td>
</tr>
<tr>
- <td><a target="_top" href="http://tcl.activestate.com/">Tcl
+ <td><a target="_top" href="http://www.tcl-tk.net/">Tcl
web site</a></td>
</tr>
<tr>
1.5 +1 -2 tcl-rivet/doc/other.html
Index: other.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/other.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- other.html 6 Jan 2002 13:30:54 -0000 1.4
+++ other.html 6 Jan 2002 19:27:01 -0000 1.5
@@ -12,7 +12,6 @@
<li><b>Read the code!</b></li>
<li>
<b>Initialization</b><br>
-
When Apache is started, (or when child Apache
processes are started if a threaded Tcl is used),
<code>tcl_init_stuff</code> is called, which creates
@@ -58,4 +57,4 @@
</ul>
</body>
</html>
- <!-- $Id: other.html,v 1.4 2002/01/06 13:30:54 davidw Exp $ -->
\ No newline at end of file
+ <!-- $Id: other.html,v 1.5 2002/01/06 19:27:01 davidw Exp $ -->
\ No newline at end of file
1.2 +2 -3 tcl-rivet/doc/split.tcl
Index: split.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/split.tcl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- split.tcl 19 Sep 2001 13:12:58 -0000 1.1
+++ split.tcl 6 Jan 2002 19:27:01 -0000 1.2
@@ -12,7 +12,6 @@
</head>
<body>
}
-
foreach fl $argv {
set ofl [ open $fl r ]
set dump [ read $ofl ]
@@ -21,7 +20,7 @@
foreach ln $lines {
if { [ string first "<body>" $ln ] != -1 } {
set inbody 1
- } elseif { [ string first "</body>" $ln ] != -1 } {
+ } elseif { [ string first "</body>" $ln ] != -1 } {
set inbody 0
} else {
if { $inbody == 1 } { puts $ln }
@@ -31,7 +30,7 @@
puts {
</body>
</html>
- }
+ }
}
main
1.2 +4 -0 tcl-rivet/doc/style.css
Index: style.css
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- style.css 19 Sep 2001 13:12:58 -0000 1.1
+++ style.css 6 Jan 2002 19:27:01 -0000 1.2
@@ -3,6 +3,7 @@
font-style: normal;
color: #000000;
background-color: #FFFFFF;
+ font-size: smaller;
}
A:link { color: #cc3300 }
@@ -10,11 +11,13 @@
A:hover { color : #000000 ; background-color : #aaaaaa }
h1 {
+ font-size: xx-large;
font-family: Arial, sans-serif;
color: #000000;
}
h2 {
+ font-size: larger;
font-family: Arial, sans-serif;
}
@@ -32,6 +35,7 @@
}
code {
+ font-size: larger;
color: #006600;
}
1.3 +4 -4 tcl-rivet/doc/top.html
Index: top.html
===================================================================
RCS file: /home/cvs/tcl-rivet/doc/top.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- top.html 19 Sep 2001 22:59:01 -0000 1.2
+++ top.html 6 Jan 2002 19:27:01 -0000 1.3
@@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title></title>
+ <title>Apache Rivet Documentation</title>
<link rel="stylesheet" href="style.css">
<style type="text/css">
- body {
- color: #cc3300;
+ body {
+ color: #cc3300;
background-color: #003399;
}
h1 { color: #cc3300 }
@@ -13,6 +13,6 @@
</head>
<body>
- <h1 align="center">Rivet documentation</h1>
+ <h1 align="center">Apache Rivet Documentation</h1>
</body>
</html>
1.15 +2 -2 tcl-rivet/src/mod_rivet.c
Index: mod_rivet.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/mod_rivet.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_rivet.c 6 Jan 2002 13:30:54 -0000 1.14
+++ mod_rivet.c 6 Jan 2002 19:27:01 -0000 1.15
@@ -55,7 +55,7 @@
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign. */
-/* $Id: mod_rivet.c,v 1.14 2002/01/06 13:30:54 davidw Exp $ */
+/* $Id: mod_rivet.c,v 1.15 2002/01/06 19:27:01 davidw Exp $ */
/* mod_rivet.c by David Welton <da...@apache.org>
* and Damon Courtney <da...@unreality.com>
@@ -668,7 +668,7 @@
*(rsc->cache_free) = *(rsc->cache_size);
}
/* Initializing cache structures */
- rsc->objCacheList = ap_pcalloc(p,
+ rsc->objCacheList = ap_pcalloc(p,
(signed)(*(rsc->cache_size) * sizeof(char *)));
Tcl_InitHashTable(rsc->objCache, TCL_STRING_KEYS);
@@ -984,7 +984,7 @@
while(sr)
{
rsc = RIVET_SERVER_CONF(sr->module_config);
- if( rsc->rivet_child_init_script != NULL )
+ if( rsc->rivet_child_init_script != NULL )
{
if (Tcl_EvalObjEx(rsc->server_interp,
rsc->rivet_child_init_script, 0) != TCL_OK) {
1.14 +1 -1 tcl-rivet/src/tcl_commands.c
Index: tcl_commands.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/tcl_commands.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tcl_commands.c 5 Jan 2002 14:40:22 -0000 1.13
+++ tcl_commands.c 6 Jan 2002 19:27:01 -0000 1.14
@@ -874,7 +874,7 @@
if (*(rsc->content_sent) == 1)
return TCL_ERROR;
-
+
*(rsc->content_sent) = 1;
return TCL_OK;
}