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/05/03 19:27:14 UTC
cvs commit: tcl-rivet/tests/apachetest apachetest.tcl
davidw 02/05/03 10:27:14
Modified: . ChangeLog
src TclWeb.h TclWebapache.c mod_rivet.c
tests/apachetest apachetest.tcl
Log:
* src/TclWebapache.c (TclWeb_GetVarAsList): Added check to length to
make sure we fully compare the two variables. Idem for
TclWeb_VarExists.
Revision Changes Path
1.55 +11 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 19 Apr 2002 23:03:43 -0000 1.54
+++ ChangeLog 3 May 2002 17:27:14 -0000 1.55
@@ -1,3 +1,9 @@
+2002-05-03 David N. Welton <da...@dedasys.com>
+
+ * src/TclWebapache.c (TclWeb_GetVarAsList): Added check to length
+ to make sure we fully compare the two variables. Idem for
+ TclWeb_VarExists.
+
2002-04-19 Damon J. Courtney <da...@unreality.com>
* src/TclWebapache.c
Added 'TclWeb_GetVirtualFile' command which returns the full
@@ -48,6 +54,11 @@
* rivet/init.tcl
Appended packages-local to the auto_path. This will be a great
place for people to place local packages that we won't mess with.
+
+2002-03-18 David N. Welton <da...@dedasys.com>
+
+ * tests/apachetest/apachetest.tcl: Added TclX to requirements.
+ Damn.
2002-03-16 David N. Welton <da...@dedasys.com>
1.15 +1 -3 tcl-rivet/src/TclWeb.h
Index: TclWeb.h
===================================================================
RCS file: /home/cvs/tcl-rivet/src/TclWeb.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TclWeb.h 19 Apr 2002 23:03:43 -0000 1.14
+++ TclWeb.h 3 May 2002 17:27:14 -0000 1.15
@@ -5,7 +5,7 @@
* Common API layer.
*/
-/* $Id: TclWeb.h,v 1.14 2002/04/19 23:03:43 damonc Exp $ */
+/* $Id: TclWeb.h,v 1.15 2002/05/03 17:27:14 davidw Exp $ */
/* Error wrappers */
#define ER1 "<hr><p><code><pre>\n"
@@ -106,8 +106,6 @@
int TclWeb_GetVarNames(Tcl_Obj *result, TclWebRequest *req);
int TclWeb_GetAllVars(Tcl_Obj *result, TclWebRequest *req);
-
-int TclWeb_GetCookieVars(Tcl_Obj *cookievar, TclWebRequest *req);
int TclWeb_GetEnvVars(Tcl_Obj *envvar, TclWebRequest *req);
1.28 +7 -3 tcl-rivet/src/TclWebapache.c
Index: TclWebapache.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/TclWebapache.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TclWebapache.c 19 Apr 2002 23:03:43 -0000 1.27
+++ TclWebapache.c 3 May 2002 17:27:14 -0000 1.28
@@ -7,7 +7,7 @@
* operations.
*/
-/* $Id: TclWebapache.c,v 1.27 2002/04/19 23:03:43 damonc Exp $ */
+/* $Id: TclWebapache.c,v 1.28 2002/05/03 17:27:14 davidw Exp $ */
#include <tcl.h>
@@ -187,7 +187,9 @@
for (i = 0; i < parmsarray->nelts; ++i)
{
- if (!strncmp(varname, TclWeb_StringToUtf(parms[i].key, req), strlen(varname)))
+ if (!strncmp(varname, TclWeb_StringToUtf(parms[i].key, req), strlen(varname)
+ strlen(varname) < strlen(parms[i].key) ?
+ strlen(parms[i].key) : strlen(varname)))
{
Tcl_ListObjAppendElement(req->interp, result,
TclWeb_StringToUtfToObj(parms[i].val, req));
@@ -254,7 +256,9 @@
/* This isn't real efficient - move to hash table later on. */
for (i = 0; i < parmsarray->nelts; ++i)
{
- if (!strncmp(varname, TclWeb_StringToUtf(parms[i].key, req), strlen(varname)))
+ if (!strncmp(varname, TclWeb_StringToUtf(parms[i].key, req),
+ strlen(varname) < strlen(parms[i].key) ?
+ strlen(parms[i].key) : strlen(varname)))
{
Tcl_SetIntObj(result, 1);
return TCL_OK;
1.45 +3 -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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_rivet.c 15 Mar 2002 17:35:57 -0000 1.44
+++ mod_rivet.c 3 May 2002 17:27:14 -0000 1.45
@@ -55,7 +55,7 @@
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign. */
-/* $Id: mod_rivet.c,v 1.44 2002/03/15 17:35:57 davidw Exp $ */
+/* $Id: mod_rivet.c,v 1.45 2002/05/03 17:27:14 davidw Exp $ */
/* mod_rivet.c by David Welton <da...@apache.org>
* and Damon Courtney <da...@unreality.com>
@@ -361,8 +361,9 @@
return HTTP_NOT_FOUND;
}
- if ((errstatus = ap_meets_conditions(r)) != OK)
+ if ((errstatus = ap_meets_conditions(r)) != OK) {
return errstatus;
+ }
ap_cpystrn(error, DEFAULT_ERROR_MSG, sizeof(error));
ap_cpystrn(timefmt, DEFAULT_TIME_FORMAT, sizeof(timefmt));
1.3 +3 -3 tcl-rivet/tests/apachetest/apachetest.tcl
Index: apachetest.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/tests/apachetest/apachetest.tcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apachetest.tcl 18 Mar 2002 21:49:19 -0000 1.2
+++ apachetest.tcl 3 May 2002 17:27:14 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: apachetest.tcl,v 1.2 2002/03/18 21:49:19 davidw Exp $
+# $Id: apachetest.tcl,v 1.3 2002/05/03 17:27:14 davidw Exp $
# Tcl based Apache test suite, by David N. Welton <da...@dedasys.com>
@@ -49,8 +49,8 @@
variable binname
# There has got to be a better way to do this, aside from waiting.
- set serverpid [eval exec $binname -X -f \
- "[file join [pwd] server.conf]" $options &]
+ set serverpid [eval exec $binname -X -f \
+ [file join [pwd] server.conf] $options &]
apachetest::connect
puts "Apache started as PID $serverpid"
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-dev-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-dev-help@tcl.apache.org