naviserver-commits

[Stephen D. <sd...@us...>]

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

Modified Files:
	tclrequest.c 
Log Message:
        * nsd/tclrequest.c:
        * tests/ns_register_filter.test:
        * tests/ns_info.test: Fix bug where blank arg was being passed to
        filter and trace procs when no arg was registered.


Index: tclrequest.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclrequest.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tclrequest.c	11 Dec 2005 11:19:50 -0000	1.10
--- tclrequest.c	23 Dec 2005 04:27:22 -0000	1.11
***************
*** 104,108 ****
      NsInterp       *itPtr = arg;
      Ns_TclCallback *cbPtr;
!     char           *method, *url, *script, *scriptarg = "";
      int             flags = 0;
  
--- 104,108 ----
      NsInterp       *itPtr = arg;
      Ns_TclCallback *cbPtr;
!     char           *method, *url, *script, *scriptarg = NULL;
      int             flags = 0;
  
***************
*** 290,294 ****
      NsInterp        *itPtr = arg;
      Ns_TclCallback  *cbPtr;
!     char            *method, *urlPattern, *script, *scriptarg = "";
      int              when = 0;
  
--- 290,294 ----
      NsInterp        *itPtr = arg;
      Ns_TclCallback  *cbPtr;
!     char            *method, *urlPattern, *script, *scriptarg = NULL;
      int              when = 0;
  
***************
*** 486,494 ****
  
      /*
!      * Start building the command with the script and arg.
       */
  
      Tcl_DStringAppend(&cmd, cbPtr->script, -1);
!     Tcl_DStringAppendElement(&cmd, cbPtr->scriptarg);
  
      /*
--- 486,497 ----
  
      /*
!      * This really should be: cmd why ?arg?, but why and arg
!      * are reversed for backwards compatibility.
       */
  
      Tcl_DStringAppend(&cmd, cbPtr->script, -1);
!     if (cbPtr->scriptarg != NULL) {
!         Tcl_DStringAppendElement(&cmd, cbPtr->scriptarg);
!     }
  
      /*
***************
*** 506,509 ****
--- 509,515 ----
          Tcl_DStringAppendElement(&cmd, "trace");
          break;
+     case NS_FILTER_VOID_TRACE:
+         /* Registered with ns_register_trace; always type VOID TRACE, so don't append. */
+         break;
      }
  
***************
*** 534,538 ****
          status = NS_FILTER_RETURN;
      } else {
!         Ns_Log(Warning, "tclfilter: %s return invalid result: %s",
                 cbPtr->script, result);
          status = NS_ERROR;
--- 540,544 ----
          status = NS_FILTER_RETURN;
      } else {
!         Ns_Log(Error, "tclfilter: %s return invalid result: %s",
                 cbPtr->script, result);
          status = NS_ERROR;