You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_dtcl-cvs@tcl.apache.org by da...@apache.org on 2001/11/03 17:29:06 UTC

cvs commit: tcl-moddtcl/debian changelog

davidw      01/11/03 08:29:06

  Modified:    .        mod_dtcl.c
               debian   changelog
  Log:
  Fixed bug: check return value for ApacheRequest___parse.
  Cast a few things to make compiler happy.
  
  Revision  Changes    Path
  1.52      +6 -5      tcl-moddtcl/mod_dtcl.c
  
  Index: mod_dtcl.c
  ===================================================================
  RCS file: /home/cvs/tcl-moddtcl/mod_dtcl.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- mod_dtcl.c	2001/10/19 16:43:37	1.51
  +++ mod_dtcl.c	2001/11/03 16:29:06	1.52
  @@ -57,7 +57,7 @@
    * originally written at the National Center for Supercomputing Applications,
    * University of Illinois, Urbana-Champaign.  */
   
  -/* $Id: mod_dtcl.c,v 1.51 2001/10/19 16:43:37 davidw Exp $  */
  +/* $Id: mod_dtcl.c,v 1.52 2001/11/03 16:29:06 davidw Exp $  */
   
   /* mod_dtcl.c by David Welton <da...@apache.org> - originally mod_include.  */
   /* See http://tcl.apache.org/mod_dtcl/credits.ttml for additional credits. */
  @@ -174,7 +174,7 @@
       char *temp;
       Tcl_DString dstr;
       Tcl_DStringInit(&dstr);
  -    Tcl_ExternalToUtfDString(NULL, input, strlen(input), &dstr);
  +    Tcl_ExternalToUtfDString(NULL, input, (int)strlen(input), &dstr);
   
       temp = ap_pstrdup(pool, Tcl_DStringValue(&dstr));
       Tcl_DStringFree(&dstr);
  @@ -227,7 +227,7 @@
   
       if (dsc->dtcl_before_script) 
   	Tcl_AppendObjToObj(outbuf, dsc->dtcl_before_script);
  -    result = Tcl_ReadChars(chan, outbuf, r->finfo.st_size, 1);
  +    result = Tcl_ReadChars(chan, outbuf, (int)r->finfo.st_size, 1);
       if (dsc->dtcl_after_script) 
   	Tcl_AppendObjToObj(outbuf, dsc->dtcl_after_script);
   
  @@ -497,7 +497,8 @@
       }
   #endif
   
  -    ApacheRequest___parse(globals->req);
  +    if ((errstatus = ApacheRequest___parse(globals->req)) != OK)
  +	return errstatus;
   
       /* take results and create tcl variables from them */
   #if USE_ONLY_VAR_COMMAND == 0
  @@ -687,7 +688,7 @@
   	*(dsc->cache_free) = *(dsc->cache_size);
       }
       /* Initializing cache structures */
  -    dsc->objCacheList = ap_pcalloc(p, *(dsc->cache_size) * sizeof(char *));
  +    dsc->objCacheList = ap_pcalloc(p, (int)(*(dsc->cache_size) * sizeof(char *)));
       Tcl_InitHashTable(dsc->objCache, TCL_STRING_KEYS);
   
       sr = s;
  
  
  
  1.15      +6 -0      tcl-moddtcl/debian/changelog
  
  Index: changelog
  ===================================================================
  RCS file: /home/cvs/tcl-moddtcl/debian/changelog,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- changelog	2001/10/15 18:40:16	1.14
  +++ changelog	2001/11/03 16:29:06	1.15
  @@ -1,3 +1,9 @@
  +libapache-mod-dtcl (0.11.5-1) unstable; urgency=low
  +
  +  * Check return value for ApacheRequest___parse.
  +
  + -- David N. Welton <da...@debian.org>  Sat,  3 Nov 2001 17:38:08 +0100
  +
   libapache-mod-dtcl (0.11.4-1) unstable; urgency=low
   
     * Fixed bug in Parse command.