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/03/12 17:57:24 UTC
cvs commit: tcl-rivet/src rivetCore.c TclWebapache.c
davidw 02/03/12 08:57:24
Modified: src rivetCore.c TclWebapache.c
Log:
* src/TclWebapache.c (TclWeb_MakeURL): Use Tcl_SetStringObj instead of
creating a new object.
* src/rivetCore.c (Rivet_MakeURL): Pass already created object to
TclWeb_MakeURL.
Revision Changes Path
1.18 +2 -4 tcl-rivet/src/rivetCore.c
Index: rivetCore.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/rivetCore.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rivetCore.c 12 Mar 2002 06:51:57 -0000 1.17
+++ rivetCore.c 12 Mar 2002 16:57:24 -0000 1.18
@@ -2,7 +2,7 @@
* rivetCore.c - Core commands which are compiled into mod_rivet itself.
*/
-/* $Id: rivetCore.c,v 1.17 2002/03/12 06:51:57 damonc Exp $ */
+/* $Id: rivetCore.c,v 1.18 2002/03/12 16:57:24 davidw Exp $ */
#include "httpd.h"
#include "http_config.h"
@@ -46,6 +46,7 @@
Tcl_WrongNumArgs(interp, 1, objv, "filename");
return TCL_ERROR;
}
+ result = Tcl_NewObj();
TclWeb_MakeURL(result, Tcl_GetString(objv[1]), globals->req);
Tcl_SetObjResult(interp, result);
return TCL_OK;
@@ -480,9 +481,6 @@
return TCL_ERROR;
}
} else if (!strcmp(method, "data")) {
- /* this sucks - we should use the hook, but I want to
- get everything fixed and working first */
-
if (TclWeb_UploadData(varname, result, globals->req) != TCL_OK) {
return TCL_ERROR;
}
1.15 +3 -2 tcl-rivet/src/TclWebapache.c
Index: TclWebapache.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/TclWebapache.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TclWebapache.c 12 Mar 2002 08:33:57 -0000 1.14
+++ TclWebapache.c 12 Mar 2002 16:57:24 -0000 1.15
@@ -7,7 +7,7 @@
* operations.
*/
-/* $Id: TclWebapache.c,v 1.14 2002/03/12 08:33:57 damonc Exp $ */
+/* $Id: TclWebapache.c,v 1.15 2002/03/12 16:57:24 davidw Exp $ */
#include <tcl.h>
@@ -119,7 +119,8 @@
INLINE int
TclWeb_MakeURL(Tcl_Obj *result, char *filename, TclWebRequest *req)
{
- result = Tcl_NewStringObj(ap_construct_url(TCLWEBPOOL, filename, req->req), -1);
+ Tcl_SetStringObj(result, ap_construct_url(TCLWEBPOOL,
+ filename, req->req), -1);
return TCL_OK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-dev-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-dev-help@tcl.apache.org