You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/09/09 10:21:15 UTC
cvs commit: tcl-websh/src/generic web.c
ronnie 2005/09/09 01:21:15
Modified: src/generic web.c
Log:
- all created files with configurable permissions
- added requestData to logData and reordered initialization to supprot that
Revision Changes Path
1.9 +17 -15 tcl-websh/src/generic/web.c
Index: web.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/web.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.c 31 Jul 2002 22:21:52 -0000 1.8
+++ web.c 9 Sep 2005 08:21:15 -0000 1.9
@@ -26,6 +26,7 @@
UrlData *urlData;
RequestData *requestData;
+ LogData *logData;
if (interp == NULL)
return TCL_ERROR;
@@ -36,12 +37,6 @@
Tcl_InitStubs(interp, "8.2", 0);
/* --------------------------------------------------------------------------
- * the logging module
- * ----------------------------------------------------------------------- */
- if (log_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-
- /* --------------------------------------------------------------------------
* the encoding module (htmlify,uricode)
* ----------------------------------------------------------------------- */
if (conv_Init(interp) == TCL_ERROR)
@@ -54,12 +49,6 @@
return TCL_ERROR;
/* --------------------------------------------------------------------------
- * filecounter
- * ----------------------------------------------------------------------- */
- if (filecounter_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-
- /* --------------------------------------------------------------------------
* messages on streams
* ----------------------------------------------------------------------- */
#ifndef WIN32
@@ -89,14 +78,27 @@
return TCL_ERROR;
/* --------------------------------------------------------------------------
- * interlink the two
+ * logging (needs to be after request_Init, because it needs requestData)
+ * ----------------------------------------------------------------------- */
+ if (log_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
+
+ /* --------------------------------------------------------------------------
+ * filecounter (needs to be after request_Init, because it needs requestData)
+ * ----------------------------------------------------------------------- */
+ if (filecounter_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
+
+ /* --------------------------------------------------------------------------
+ * interlink some data
* ----------------------------------------------------------------------- */
requestData =
(RequestData *) Tcl_GetAssocData(interp, WEB_REQ_ASSOC_DATA, NULL);
urlData = (UrlData *) Tcl_GetAssocData(interp, WEB_URL_ASSOC_DATA, NULL);
+ logData = (LogData *) Tcl_GetAssocData(interp, WEB_LOG_ASSOC_DATA, NULL);
-/* requestData->urlData = urlData; */
urlData->requestData = requestData;
+ logData->requestData = requestData;
/* --------------------------------------------------------------------------
* utilities
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org