[naviserver-commits] naviserver/nsd driver.c,1.28,1.29 nsd.h,1.43,1.44 tclcmds.c,1.28,1.29

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6172/nsd

Modified Files:
	driver.c nsd.h tclcmds.c 
Log Message:
See ChangeLog for more info


Index: tclcmds.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tclcmds.c	30 Dec 2005 11:07:34 -0000	1.28
--- tclcmds.c	12 Jan 2006 01:17:57 -0000	1.29
***************
*** 196,200 ****
      NsTclWriteContentObjCmd,
      NsTclWriteFpObjCmd,
!     NsTclWriteObjCmd;
  
  extern Tcl_CmdProc
--- 196,201 ----
      NsTclWriteContentObjCmd,
      NsTclWriteFpObjCmd,
!     NsTclWriteObjCmd,
!     NsTclUploadStatsObjCmd;
  
  extern Tcl_CmdProc
***************
*** 441,444 ****
--- 442,447 ----
      {"nsv_unset", NULL, NsTclNsvUnsetObjCmd},
  
+     {"ns_upload_stats", NULL, NsTclUploadStatsObjCmd},
+ 
      /*
       * Add more server Tcl commands here.

Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** driver.c	10 Jan 2006 12:43:35 -0000	1.28
--- driver.c	12 Jan 2006 01:17:57 -0000	1.29
***************
*** 45,48 ****
--- 45,49 ----
  #define SOCK_READY  0
  #define SOCK_MORE   1
+ #define SOCK_SPOOL  2
  #define SOCK_ERROR  (-1)
  
***************
*** 78,81 ****
--- 79,85 ----
  } ServerMap;
[...1086 lines suppressed...]
+      */
+ 
+     if (trigger) {
+         SockTrigger(spoolerPipe[1]);
+     }
+     return 1;
+ }
+ 
+ Sock *SockSpoolPop(void)
+ {
+     Sock *sockPtr = 0;
+ 
+     Ns_MutexLock(&spoolerLock);
+     sockPtr = spoolerSockPtr;
+     if (spoolerSockPtr) {
+          spoolerSockPtr = spoolerSockPtr->nextPtr;
+     }
+     Ns_MutexUnlock(&spoolerLock);
+     return sockPtr;
+ }

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** nsd.h	4 Jan 2006 10:15:52 -0000	1.43
--- nsd.h	12 Jan 2006 01:17:57 -0000	1.44
***************
*** 361,364 ****
--- 361,365 ----
      int maxheaders;             /* Maximum number of request headers. */
      int readahead;              /* Maximum request size in memory. */
+     int uploadsize;             /* Minimum upload size for statistics tracking. */
      unsigned int loggingFlags;  /* Logging control flags */
  
***************
*** 398,401 ****
--- 399,408 ----
      size_t tsize;
  
+     struct {
+       char *url;
+       unsigned long size;
+       unsigned long length;
+     } upload;
+ 
  } Sock;