tcl-mod_dtcl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject cvs commit: tcl-moddtcl/docs install.html nav.html
Date Fri, 19 Oct 2001 16:43:38 GMT
davidw      01/10/19 09:43:38

  Modified:    .        mod_dtcl.c
               docs     install.html nav.html
  Log:
  Updated docs from web site.
  
  Revision  Changes    Path
  1.51      +10 -9     tcl-moddtcl/mod_dtcl.c
  
  Index: mod_dtcl.c
  ===================================================================
  RCS file: /home/cvs/tcl-moddtcl/mod_dtcl.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mod_dtcl.c	2001/10/15 10:44:09	1.50
  +++ mod_dtcl.c	2001/10/19 16:43:37	1.51
  @@ -57,7 +57,7 @@
    * originally written at the National Center for Supercomputing Applications,
    * University of Illinois, Urbana-Champaign.  */
   
  -/* $Id: mod_dtcl.c,v 1.50 2001/10/15 10:44:09 davidw Exp $  */
  +/* $Id: mod_dtcl.c,v 1.51 2001/10/19 16:43:37 davidw Exp $  */
   
   /* mod_dtcl.c by David Welton <davidw@apache.org> - originally mod_include.  */
   /* See http://tcl.apache.org/mod_dtcl/credits.ttml for additional credits. */
  @@ -87,6 +87,8 @@
   static void copy_dtcl_config(pool *p, dtcl_server_conf *olddsc, dtcl_server_conf *newdsc);
   static int get_ttml_file(request_rec *r, dtcl_server_conf *dsc,
   			 Tcl_Interp *interp, char *filename, int toplevel, Tcl_Obj *outbuf);
  +static int get_tcl_file(request_rec *r, dtcl_server_conf *dsc, 
  +			Tcl_Interp *interp, char *filename, Tcl_Obj *outbuf);
   static int send_content(request_rec *);
   static int execute_and_check(Tcl_Interp *interp, Tcl_Obj *outbuf, request_rec *r);
   
  @@ -208,15 +210,12 @@
   
   /* Load, cache and eval a Tcl file  */
   
  -static int get_tcl_file(request_rec *r, Tcl_Interp *interp, char *filename, Tcl_Obj *outbuf)
  +static int get_tcl_file(request_rec *r, dtcl_server_conf *dsc, Tcl_Interp *interp, char
*filename, Tcl_Obj *outbuf)
   {
       int result = 0;
  -#if 1
       /* Taken, in part, from tclIOUtil.c out of the Tcl
          distribution, and modified */
   
  -    /* Basically, what we are doing here is a Tcl_EvalFile, but
  -       with the addition of caching code. */
       Tcl_Channel chan = Tcl_OpenFileChannel(interp, r->filename, "r", 0644);
       if (chan == (Tcl_Channel) NULL)
       {
  @@ -226,7 +225,12 @@
   	return TCL_ERROR;
       }
   
  +    if (dsc->dtcl_before_script) 
  +	Tcl_AppendObjToObj(outbuf, dsc->dtcl_before_script);
       result = Tcl_ReadChars(chan, outbuf, r->finfo.st_size, 1);
  +    if (dsc->dtcl_after_script) 
  +	Tcl_AppendObjToObj(outbuf, dsc->dtcl_after_script);
  +
       if (result < 0)
       {
   	Tcl_Close(interp, chan);
  @@ -239,9 +243,6 @@
   	return TCL_ERROR;
   
       return TCL_OK;
  -#else
  -    Tcl_EvalFile(interp, r->filename);
  -#endif /* 1 */
   }
   
   /* Parse and execute a ttml file */
  @@ -395,7 +396,7 @@
   	    result = get_ttml_file(r, dsc, interp, filename, toplevel, outbuf);
   	} else {
   	    /* It's a plain Tcl file */
  -	    result = get_tcl_file(r, interp, filename, outbuf);
  +	    result = get_tcl_file(r, dsc, interp, filename, outbuf);
   	}
   	if (result != TCL_OK)
   	    return result;
  
  
  
  1.2       +2 -2      tcl-moddtcl/docs/install.html
  
  Index: install.html
  ===================================================================
  RCS file: /home/cvs/tcl-moddtcl/docs/install.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- install.html	2001/06/15 17:19:47	1.1
  +++ install.html	2001/10/19 16:43:38	1.2
  @@ -6,7 +6,7 @@
     </head>
     <body>
   
  -    <!-- $Id: install.html,v 1.1 2001/06/15 17:19:47 davidw Exp $ -->
  +    <!-- $Id: install.html,v 1.2 2001/10/19 16:43:38 davidw Exp $ -->
       <h2 align="center">mod_dtcl Installation</h2>
       
       <ol>
  @@ -29,7 +29,7 @@
   	  target="_top" href="http://www.freebsd.org/cgi/ports.cgi?query=mod_dtcl">http://www.freebsd.org/cgi/ports.cgi?query=mod_dtcl</a>.<br>
   
   	Otherwise, download the sources at <a target="_top"
  -	href="download/">http://tcl.apache.org/mod_dtcl/download/</a>.
  +	href="http://tcl.apache.org/mod_dtcl/download/">http://tcl.apache.org/mod_dtcl/download/</a>.
   	<br>
         </li>
         <li><b>Uncompress the sources</b><br>
  
  
  
  1.4       +1 -1      tcl-moddtcl/docs/nav.html
  
  Index: nav.html
  ===================================================================
  RCS file: /home/cvs/tcl-moddtcl/docs/nav.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- nav.html	2001/09/02 14:04:16	1.3
  +++ nav.html	2001/10/19 16:43:38	1.4
  @@ -47,7 +47,7 @@
   	      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>
  
  
  

Mime
View raw message