naviserver-commits — Commit notices

[naviserver-commits] naviserver ChangeLog,1.42,1.43

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

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

Modified Files:
	ChangeLog 
Log Message:
Add missing tests for urlencode fix.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ChangeLog	9 Apr 2005 17:44:32 -0000	1.42
--- ChangeLog	12 Apr 2005 03:53:02 -0000	1.43
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-04-11  Stephen Deasey  <sd...@us...>
+ 
+ 	* tests/ns_urlencode.test: Add missing tests for urlencode fix.
+ 
  2005-04-09  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] modules Makefile,1.1.1.1,NONE README,1.1.1.1,NONE include.adp,1.1.1.1,NONE include.tcl,1.1.1.1,NONE index.adp,1.1.1.1,NONE index.tcl,1.1.1.1,NONE master.adp,1.1.1.1,NONE nstk.tcl,1.1.1.1,NONE

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

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

Removed Files:
	Makefile README include.adp include.tcl index.adp index.tcl 
	master.adp nstk.tcl 
Log Message:
Wrong initial import to modules


--- include.tcl DELETED ---

--- include.adp DELETED ---

--- master.adp DELETED ---

--- README DELETED ---

--- index.adp DELETED ---

--- Makefile DELETED ---

--- index.tcl DELETED ---

--- nstk.tcl DELETED ---

[naviserver-commits] naviserver/tests ns_parseargs.test,1.2,1.3

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

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

Modified Files:
	ns_parseargs.test 
Log Message:
Re-enable test for corrupted literal table.


Index: ns_parseargs.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_parseargs.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ns_parseargs.test	3 Apr 2005 06:38:01 -0000	1.2
--- ns_parseargs.test	9 Apr 2005 17:44:32 -0000	1.3
***************
*** 46,52 ****
  } -result {}
  
! test ns_parseargs-2.3 {object type conversion / display} -constraints {
!     knownBug
! } -body {
      set tid [ns_thread begin {
          proc x {} {
--- 46,50 ----
  } -result {}
  
! test ns_parseargs-2.3 {object type conversion / display} -body {
      set tid [ns_thread begin {
          proc x {} {

[naviserver-commits] naviserver ChangeLog,1.41,1.42

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

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

Modified Files:
	ChangeLog 
Log Message:
Re-enable test for corrupted literal table.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ChangeLog	9 Apr 2005 16:36:12 -0000	1.41
--- ChangeLog	9 Apr 2005 17:44:32 -0000	1.42
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-04-09  Stephen Deasey  <sd...@us...>
+ 
+ 	* tests/ns_parseargs.test: Re-enable test for corrupted literal
+ 	table.
+ 
  2005-04-09  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver ChangeLog,1.40,1.41

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ChangeLog	9 Apr 2005 14:35:30 -0000	1.40
--- ChangeLog	9 Apr 2005 16:36:12 -0000	1.41
***************
*** 10,14 ****
  	  destroyed.
  	* nsd/tclobj.c: fixed broken ptr deref
! 	  
  2005-04-08  Zoran Vasiljevic  <vas...@us...>
  
--- 10,15 ----
  	  destroyed.
  	* nsd/tclobj.c: fixed broken ptr deref
! 	* nsd/nsmain.c: adjusted options parsing for Windows / unix
! 
  2005-04-08  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nsd nsmain.c,1.7,1.8

[Zoran V. <vas...@us...>]

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

Modified Files:
	nsmain.c 
Log Message:
More cleanup in arguments parsing (cosmetic nature)


Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nsmain.c	9 Apr 2005 16:30:02 -0000	1.7
--- nsmain.c	9 Apr 2005 16:35:06 -0000	1.8
***************
*** 218,226 ****
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -h, -V, -c, -f, -I, -R, or -S"
!                            " may be specified");
  #else
!                 UsageError("only one of -h, -V, -c, -f, -i, or -w"
!                            " may be specified");
  #endif
              }
--- 218,226 ----
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -c, -f, -I, -R, or -S"
!                            " options may be specified");
  #else
!                 UsageError("only one of -c, -f, -i, or -w"
!                            " options may be specified");
  #endif
              }

[naviserver-commits] naviserver/nsd nsmain.c,1.6,1.7

[Zoran V. <vas...@us...>]

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

Modified Files:
	nsmain.c 
Log Message:
Cleanup command help text and parsing of args between Win/unix.


Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nsmain.c	4 Apr 2005 02:39:47 -0000	1.6
--- nsmain.c	9 Apr 2005 16:30:02 -0000	1.7
***************
*** 199,203 ****
      for (optind = 1; optind < argc; optind++) {
          if (argv[optind][0] != '-') {
! 	    break;
          }
          switch (argv[optind][1]) {
--- 199,203 ----
      for (optind = 1; optind < argc; optind++) {
          if (argv[optind][0] != '-') {
!             break;
          }
          switch (argv[optind][1]) {
***************
*** 207,212 ****
          case 'c':
          case 'f':
-         case 'i':
-         case 'w':
          case 'V':
  #ifdef _WIN32
--- 207,210 ----
***************
*** 214,223 ****
          case 'R':
          case 'S':
  #endif
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -c, -i, -f, -V, -I, -R, or -S may be specified");
  #else
!                 UsageError("only one of -c, -i, -f, -w, or -V may be specified");
  #endif
              }
--- 212,226 ----
          case 'R':
          case 'S':
+ #else
+         case 'i':
+         case 'w':
  #endif
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -h, -V, -c, -f, -I, -R, or -S"
!                            " may be specified");
  #else
!                 UsageError("only one of -h, -V, -c, -f, -i, or -w"
!                            " may be specified");
  #endif
              }
***************
*** 239,243 ****
              }
              if (optind + 1 < argc) {
!            	nsconf.config = argv[++optind];
              } else {
                  UsageError("no parameter for -%c option", argv[optind][1]);
--- 242,246 ----
              }
              if (optind + 1 < argc) {
!                 nsconf.config = argv[++optind];
              } else {
                  UsageError("no parameter for -%c option", argv[optind][1]);
***************
*** 1038,1045 ****
      }
      fprintf(stderr, "\n"
-         "Usage: %s [-h|V] [-c|-i|f] "
  #ifdef _WIN32
!         "[-I|R] "
  #else
          "[-u <user>] [-g <group>] [-r <path>] [-b <address:port>|-B <file>] "
  #endif
--- 1041,1048 ----
      }
      fprintf(stderr, "\n"
  #ifdef _WIN32
!         "Usage: %s [-h|V] [-c|f|I|R|S] "
  #else
+         "Usage: %s [-h|V] [-c|f|i|w] "
          "[-u <user>] [-g <group>] [-r <path>] [-b <address:port>|-B <file>] "
  #endif
***************
*** 1048,1059 ****
          "  -h  help (this message)\n"
          "  -V  version and release information\n"
!         "  -c  command mode\n"
!         "  -i  inittab mode\n"
          "  -f  foreground mode\n"
-         "  -w  watchdog mode: restart a failed server\n"
  #ifdef _WIN32
!         "  -I  Install win32 service\n"
!         "  -R  Remove win32 service\n"
  #else
          "  -d  debugger-friendly mode (ignore SIGINT)\n"
          "  -u  run as <user>\n"
--- 1051,1063 ----
          "  -h  help (this message)\n"
          "  -V  version and release information\n"
!         "  -c  command (interactive) mode\n"
          "  -f  foreground mode\n"
  #ifdef _WIN32
!         "  -I  install Win32 service\n"
!         "  -R  remove Win32 service\n"
!         "  -S  start Win32 service\n"
  #else
+         "  -i  inittab mode\n"
+         "  -w  watchdog mode (restart a failed server)\n"
          "  -d  debugger-friendly mode (ignore SIGINT)\n"
          "  -u  run as <user>\n"
***************
*** 1103,1106 ****
--- 1107,1111 ----
      return config;
  }
+ #ifndef _WIN32
  
  /*
***************
*** 1285,1286 ****
--- 1290,1292 ----
      return 0;
  }
+ #endif /* _WIN32 */

[naviserver-commits] naviserver/nsd tclobjv.c,1.5,1.6

[Zoran V. <vas...@us...>]

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

Modified Files:
	tclobjv.c 
Log Message:
Ooops, should be more careful when cutting/pasting ...


Index: tclobjv.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tclobjv.c	9 Apr 2005 14:30:22 -0000	1.5
--- tclobjv.c	9 Apr 2005 14:43:09 -0000	1.6
***************
*** 725,730 ****
      FreeSpecs(optSpec);
  
!     objPtr->internalRep.twoPtrValue.ptr1;
!     objPtr->internalRep.twoPtrValue.ptr2;
  }
  
--- 725,730 ----
      FreeSpecs(optSpec);
  
!     objPtr->internalRep.twoPtrValue.ptr1 = NULL;
!     objPtr->internalRep.twoPtrValue.ptr2 = NULL;
  }
  

[naviserver-commits] naviserver ChangeLog,1.39,1.40

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ChangeLog	9 Apr 2005 09:18:18 -0000	1.39
--- ChangeLog	9 Apr 2005 14:35:30 -0000	1.40
***************
*** 4,7 ****
--- 4,14 ----
  	  calls. In some/many cases we ended up in an infinite loop.
  
+ 	* nsd/tclobjv.c: SetSpecFromAny does not invalidate string rep 
+ 	  of the passed object after converting it to the ns:spec
+ 	  object type. This will definitely corrupt the interp literal
+ 	  table and result in process exitus when the interp is being
+ 	  destroyed.
+ 	* nsd/tclobj.c: fixed broken ptr deref
+ 	  
  2005-04-08  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nsd tclobjv.c,1.4,1.5

[Zoran V. <vas...@us...>]

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

Modified Files:
	tclobjv.c 
Log Message:
Do not wholesale invalidate string rep of the object at SetXXFromAny.
Doing this seem to corrupt the interp literal table.


Index: tclobjv.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tclobjv.c	26 Mar 2005 14:25:25 -0000	1.4
--- tclobjv.c	9 Apr 2005 14:30:22 -0000	1.5
***************
*** 656,661 ****
      }
      Ns_TclSetTwoPtrValue(objPtr, &specType, optSpec, argSpec);
-     Tcl_InvalidateStringRep(objPtr);
-     objPtr->length = 0;
  
      return TCL_OK;
--- 656,659 ----
***************
*** 726,729 ****
--- 724,730 ----
      optSpec = objPtr->internalRep.twoPtrValue.ptr1;
      FreeSpecs(optSpec);
+ 
+     objPtr->internalRep.twoPtrValue.ptr1;
+     objPtr->internalRep.twoPtrValue.ptr2;
  }
  

[naviserver-commits] naviserver/nsd tclobj.c,1.2,1.3

[Zoran V. <vas...@us...>]

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

Modified Files:
	tclobj.c 
Log Message:
Fixed broken Ns_TclResetObjType (was doing wrong ptr deref)


Index: tclobj.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobj.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclobj.c	26 Mar 2005 14:25:25 -0000	1.2
--- tclobj.c	9 Apr 2005 14:28:41 -0000	1.3
***************
*** 1,7 ****
  /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.com/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
  /*
!  * The contents of this file are subject to the Mozilla Public License
   * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://mozilla.org/.
   *
   * Software distributed under the License is distributed on an "AS IS"
***************
*** 32,36 ****
   * tcltime.c --
   *
!  *	Implement Tcl_Obj type for AOLserver Ns_Time.
   */
  
--- 32,36 ----
   * tcltime.c --
   *
!  *	Implement Tcl_Obj type for Ns_Time.
   */
  
***************
*** 121,125 ****
  
      if (typePtr != NULL && typePtr->freeIntRepProc != NULL) {
!         (typePtr->freeIntRepProc)(objPtr);
      }
      objPtr->typePtr = newTypePtr;
--- 121,125 ----
  
      if (typePtr != NULL && typePtr->freeIntRepProc != NULL) {
!         (*typePtr->freeIntRepProc)(objPtr);
      }
      objPtr->typePtr = newTypePtr;

[naviserver-commits] naviserver/nsd dns.c,1.2,1.3

[Zoran V. <vas...@us...>]

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

Modified Files:
	dns.c 
Log Message:
Ooops,... forgot a variable declaration in last checkin...


Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dns.c	9 Apr 2005 09:16:15 -0000	1.2
--- dns.c	9 Apr 2005 09:21:21 -0000	1.3
***************
*** 367,370 ****
--- 367,371 ----
      char buf[2048];
      int result;
+     int i = 0;
      int h_errnop;
      int status = NS_FALSE;

[naviserver-commits] naviserver ChangeLog,1.38,1.39

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ChangeLog	8 Apr 2005 19:59:45 -0000	1.38
--- ChangeLog	9 Apr 2005 09:18:18 -0000	1.39
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-04-09  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/dns.c: Fixed GetAddr() when dealing with gethostbyname_r
+ 	  calls. In some/many cases we ended up in an infinite loop.
+ 
  2005-04-08  Zoran Vasiljevic  <vas...@us...>
  

[naviserver-commits] naviserver/nsd dns.c,1.1.1.1,1.2

[Zoran V. <vas...@us...>]

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

Modified Files:
	dns.c 
Log Message:
Fixed GetAddr when dealing with gethostbyname_r calls. In some cases
we ended up in an infinite loop.


Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dns.c	16 Feb 2005 08:39:25 -0000	1.1.1.1
--- dns.c	9 Apr 2005 09:16:15 -0000	1.2
***************
*** 1,7 ****
  /*
!  * The contents of this file are subject to the AOLserver Public License
   * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://aolserver.com/.
   *
   * Software distributed under the License is distributed on an "AS IS"
--- 1,7 ----
  /*
!  * The contents of this file are subject to the Mozilla Public License
   * Version 1.1 (the "License"); you may not use this file except in
   * compliance with the License. You may obtain a copy of the License at
!  * http://mozilla.org/.
   *
   * Software distributed under the License is distributed on an "AS IS"
***************
*** 347,354 ****
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(
                          ((struct sockaddr_in *) ptr->ai_addr)->sin_addr));
              ptr = ptr->ai_next;
          }
          freeaddrinfo(res);
-         status = NS_TRUE;
      }
      return status;
--- 347,354 ----
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(
                          ((struct sockaddr_in *) ptr->ai_addr)->sin_addr));
+             status = NS_TRUE;
              ptr = ptr->ai_next;
          }
          freeaddrinfo(res);
      }
      return status;
***************
*** 367,374 ****
      char buf[2048];
      int result;
-     int i = 0;
      int h_errnop;
      int status = NS_FALSE;
      
  #if defined(HAVE_GETHOSTBYNAME_R_6)
      result = gethostbyname_r(host, &he, buf, sizeof(buf), &res, &h_errnop);
--- 367,375 ----
      char buf[2048];
      int result;
      int h_errnop;
      int status = NS_FALSE;
      
+     memset(buf, 0, sizeof(buf));
+ 
  #if defined(HAVE_GETHOSTBYNAME_R_6)
      result = gethostbyname_r(host, &he, buf, sizeof(buf), &res, &h_errnop);
***************
*** 385,389 ****
  
      if (result != 0) { 
! 	LogError("gethostbyname_r", h_errnop);
      } else {
          ptr = (struct in_addr *) he.h_addr_list[i];
--- 386,390 ----
  
      if (result != 0) { 
!         LogError("gethostbyname_r", h_errnop);
      } else {
          ptr = (struct in_addr *) he.h_addr_list[i];
***************
*** 392,395 ****
--- 393,397 ----
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(ia));
              status = NS_TRUE;
+             ptr = (struct in_addr *) he.h_addr_list[++i];
          }
      }
***************
*** 419,423 ****
      he = gethostbyname(host);
      if (he == NULL) {
! 	LogError("gethostbyname", h_errno);
      } else {
          ptr = (struct in_addr *) he.h_addr_list[i];
--- 421,425 ----
      he = gethostbyname(host);
      if (he == NULL) {
!         LogError("gethostbyname", h_errno);
      } else {
          ptr = (struct in_addr *) he.h_addr_list[i];
***************
*** 426,429 ****
--- 428,432 ----
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(ia));
              status = NS_TRUE;
+             ptr = (struct in_addr *) he.h_addr_list[++i];
          }
      }

[naviserver-commits] naviserver ChangeLog,1.37,1.38

[Zoran V. <vas...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
See file...


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ChangeLog	4 Apr 2005 02:39:47 -0000	1.37
--- ChangeLog	8 Apr 2005 19:59:45 -0000	1.38
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-04-08  Zoran Vasiljevic  <vas...@us...>
+ 
+ 	* nsd/nsd.h: Added non-gnu implementation of poll() for
+ 	* nsd/unix.c: platforms not implementing it (Darwin)
+ 
  2005-04-03  Vlad Seryakov  <ser...@us...>
  

[naviserver-commits] naviserver/nsd nsd.h,1.9,1.10 unix.c,1.3,1.4

[Zoran V. <vas...@us...>]

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

Modified Files:
	nsd.h unix.c 
Log Message:
Added non-gnu implementation of poll() for platforms not implementing it
(Darwin as up to 8.0 aka Mac OS X 10.3)


Index: unix.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/unix.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** unix.c	17 Mar 2005 17:49:12 -0000	1.3
--- unix.c	8 Apr 2005 19:59:17 -0000	1.4
***************
*** 483,564 ****
  #ifndef HAVE_POLL
  
! /* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
!    This file is part of the GNU C Library.
! 
!    The GNU C Library is free software; you can redistribute it and/or
!    modify it under the terms of the GNU Library General Public License as
!    published by the Free Software Foundation; either version 2 of the
!    License, or (at your option) any later version.
! 
!    The GNU C Library is distributed in the hope that it will be useful,
!    but WITHOUT ANY WARRANTY; without even the implied warranty of
!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!    Library General Public License for more details.
! 
!    You should have received a copy of the GNU Library General Public
!    License along with the GNU C Library; see the file COPYING.LIB.  If not,
!    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!    Boston, MA 02111-1307, USA.  */
! 
! /* Poll the file descriptors described by the NFDS structures starting at
!    FDS.  If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
!    an event to occur; if TIMEOUT is -1, block until an event occurs.
!    Returns the number of file descriptors with events, zero if timed out,
!    or -1 for errors.  */
  
  int
! poll (fds, nfds, timeout)
!      struct pollfd *fds;
!      unsigned long int nfds;
!      int timeout;
  {
!  struct timeval tv, *tvp;
!  fd_set rset, wset, xset;
!  struct pollfd *f;
!  int ready;
!  int maxfd = 0;
!  
!  FD_ZERO (&rset);
!  FD_ZERO (&wset);
!  FD_ZERO (&xset);
!  
!  for (f = fds; f < &fds[nfds]; ++f)
!    if (f->fd != -1)
!    {
!     if (f->events & POLLIN)
!       FD_SET (f->fd, &rset);
!     if (f->events & POLLOUT)
!       FD_SET (f->fd, &wset);
!     if (f->events & POLLPRI)
!       FD_SET (f->fd, &xset);
!     if (f->fd > maxfd && (f->events & (POLLIN|POLLOUT|POLLPRI)))
!       maxfd = f->fd;
!    }
!  
!  if (timeout < 0) {
!     tvp = NULL;
!  } else {
!     tv.tv_sec = timeout / 1000;
!     tv.tv_usec = (timeout % 1000) * 1000;
!     tvp = &tv;
!  }
!  
!  ready = select (maxfd + 1, &rset, &wset, &xset, tvp);
!  if (ready > 0)
!    for (f = fds; f < &fds[nfds]; ++f)
!    {
!     f->revents = 0;
!     if (f->fd >= 0)
!     {
!      if (FD_ISSET (f->fd, &rset))
!        f->revents |= POLLIN;
!      if (FD_ISSET (f->fd, &wset))
!        f->revents |= POLLOUT;
!      if (FD_ISSET (f->fd, &xset))
!        f->revents |= POLLPRI;
      }
!    }
!  
!  return ready;
  }
  
--- 483,547 ----
  #ifndef HAVE_POLL
  
! /*
!  *  Copyright 1994 University of Washington
!  *
!  *  Permission is hereby granted to copy this software, and to
!  *  use and redistribute it, except that this notice may not be
!  *  removed.  The University of Washington does not guarantee
!  *  that this software is suitable for any purpose and will not
!  *  be held liable for any damage it may cause.
!  */
  
  int
! poll(fds, nfds, timo)
! 	struct pollfd *fds;
! 	unsigned long nfds;
! 	int timo;
  {
!     struct timeval timeout, *toptr;
!     fd_set ifds, ofds, efds, *ip, *op, *ep;
!     int i, rc, n;
!     FD_ZERO(&ifds);
!     FD_ZERO(&ofds);
!     FD_ZERO(&efds);
!     for (i = 0, n = -1, op = ip = 0; i < nfds; ++i) {
!         fds[i].revents = 0;
!         if (fds[i].fd < 0)
!             continue;
!         if (fds[i].fd > n)
!             n = fds[i].fd;
!         if (fds[i].events & (POLLIN|POLLPRI)) {
!             ip = &ifds;
!             FD_SET(fds[i].fd, ip);
!         }
!         if (fds[i].events & POLLOUT) {
!             op = &ofds;
!             FD_SET(fds[i].fd, op);
!         }
!         FD_SET(fds[i].fd, &efds);
      }
!     if (timo < 0)
!         toptr = 0;
!     else {
!         toptr = &timeout;
!         timeout.tv_sec = timo / 1000;
!         timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000;
!     }
!     
!     rc = select(++n, ip, op, &efds, toptr);
!     if (rc <= 0)
!         return rc;
!     
!     for (i = 0, n = 0; i < nfds; ++i) {
!         if (fds[i].fd < 0) continue;
!         if (fds[i].events & (POLLIN|POLLPRI) && FD_ISSET(i, &ifds))
!             fds[i].revents |= POLLIN;
!         if (fds[i].events & POLLOUT && FD_ISSET(i, &ofds))
!             fds[i].revents |= POLLOUT;
!         if (FD_ISSET(i, &efds))
!             /* Some error was detected ... should be some way to know. */
!             fds[i].revents |= POLLHUP;
!     }
!     return rc;
  }
  

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nsd.h	3 Apr 2005 06:38:01 -0000	1.9
--- nsd.h	8 Apr 2005 19:59:16 -0000	1.10
***************
*** 66,72 ****
    #include <poll.h>
  #else
!   #define POLLIN 1
!   #define POLLOUT 2
!   #define POLLPRI 3
    struct pollfd {
      int fd;
--- 66,76 ----
    #include <poll.h>
  #else
!   #define POLLIN 001
!   #define POLLPRI 002
!   #define POLLOUT 004
!   #define POLLNORM POLLIN
!   #define POLLERR 010
!   #define POLLHUP 020
!   #define POLLNVAL 040
    struct pollfd {
      int fd;

[naviserver-commits] naviserver ChangeLog,1.36,1.37

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

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

Modified Files:
	ChangeLog 
Log Message:
fixed make test, argumens nowe processed until first non dash parameter


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ChangeLog	3 Apr 2005 23:37:05 -0000	1.36
--- ChangeLog	4 Apr 2005 02:39:47 -0000	1.37
***************
*** 1,4 ****
--- 1,9 ----
  2005-04-03  Vlad Seryakov  <ser...@us...>
  
+ 	* nsd.nsmain.c: fixed make test, argumens nowe processed
+ 	  until first non dash parameter.
+ 
+ 2005-04-03  Vlad Seryakov  <ser...@us...>
+ 
  	* nsd/nsmain.c: changed command line parsing from getopt to
  	  simple manual processing thus getopt is not needed anymore.

[naviserver-commits] naviserver/nsd nsmain.c,1.5,1.6

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

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

Modified Files:
	nsmain.c 
Log Message:
fixed make test, argumens nowe processed until first non dash parameter


Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nsmain.c	3 Apr 2005 23:37:06 -0000	1.5
--- nsmain.c	4 Apr 2005 02:39:47 -0000	1.6
***************
*** 109,113 ****
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig;
      char *config;
      Ns_Time timeout;
--- 109,114 ----
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig, optind, cmdargc;
!     char **cmdargv;;
      char *config;
      Ns_Time timeout;
***************
*** 196,205 ****
       */
  
!     for (i = 1; i < argc; i++) {
!         if (argv[i][0] != '-') {
!             UsageError("invalid option: %s", argv[i]);
! 	    exit(1);
          }
!         switch (argv[i][1]) {
          case 'h':
              UsageError(NULL);
--- 197,205 ----
       */
  
!     for (optind = 1; optind < argc; optind++) {
!         if (argv[optind][0] != '-') {
! 	    break;
          }
!         switch (argv[optind][1]) {
          case 'h':
              UsageError(NULL);
***************
*** 222,226 ****
  #endif
              }
!             mode = argv[i][1];
              break;
          case 's':
--- 222,226 ----
  #endif
              }
!             mode = argv[optind][1];
              break;
          case 's':
***************
*** 228,235 ****
                  UsageError("multiple -s <server> options");
              }
!             if (i + 1 < argc) {
!                 server = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
--- 228,235 ----
                  UsageError("multiple -s <server> options");
              }
!             if (optind + 1 < argc) {
!                 server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
***************
*** 238,245 ****
                  UsageError("multiple -t <file> options");
              }
!             if (i + 1 < argc) {
!            	nsconf.config = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
--- 238,245 ----
                  UsageError("multiple -t <file> options");
              }
!             if (optind + 1 < argc) {
!            	nsconf.config = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
***************
*** 250,271 ****
  #ifndef _WIN32
          case 'b':
!             if (i + 1 < argc) {
!             	bindargs = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
          case 'B':
!             if (i + 1 < argc) {
!             	bindfile = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
          case 'r':
!             if (i + 1 < argc) {
!             	root = server = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
--- 250,271 ----
  #ifndef _WIN32
          case 'b':
!             if (optind + 1 < argc) {
!             	bindargs = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
          case 'B':
!             if (optind + 1 < argc) {
!             	bindfile = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
          case 'r':
!             if (optind + 1 < argc) {
!             	root = server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][optind]);
              }
              break;
***************
*** 274,293 ****
              break;
          case 'g':
!             if (i + 1 < argc) {
!                 garg = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
          case 'u':
!             if (i + 1 < argc) {
!                 uarg = argv[++i];
              } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
              }
              break;
  #endif
          default:
!             UsageError("invalid option: -%c", argv[i][1]);
              break;
          }
--- 274,293 ----
              break;
          case 'g':
!             if (optind + 1 < argc) {
!                 garg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
          case 'u':
!             if (optind + 1 < argc) {
!                 uarg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
  #endif
          default:
!             UsageError("invalid option: -%c", argv[optind][1]);
              break;
          }
***************
*** 537,541 ****
      Tcl_FindExecutable(argv[0]);
      nsconf.nsd = (char *) Tcl_GetNameOfExecutable();
!     NsConfigEval(config, argc, argv, argc);
      ns_free(config);
      
--- 537,541 ----
      Tcl_FindExecutable(argv[0]);
      nsconf.nsd = (char *) Tcl_GetNameOfExecutable();
!     NsConfigEval(config, argc, argv, optind);
      ns_free(config);
      
***************
*** 741,745 ****
  
          NsRestoreSignals();
!         Tcl_Main(argc, argv, CommandInit);
      }
  
--- 741,751 ----
  
          NsRestoreSignals();
!         cmdargv = ns_calloc((size_t) argc - optind + 2, sizeof(char *));
!         cmdargc = 0;
!         cmdargv[cmdargc++] = argv[0];
!         for (i = optind; i < argc; i++) {
!             cmdargv[cmdargc++] = argv[i];
!         }
!         Tcl_Main(cmdargc, cmdargv, CommandInit);
      }
  

[naviserver-commits] naviserver/nsd nsmain.c,1.4,1.5 getopt.c,1.1.1.1,NONE

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

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

Modified Files:
	nsmain.c 
Removed Files:
	getopt.c 
Log Message:
changed command line parsing from getopt to simple manual processing thus getopt is not needed anymore


--- getopt.c DELETED ---

Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nsmain.c	3 Apr 2005 06:38:01 -0000	1.4
--- nsmain.c	3 Apr 2005 23:37:06 -0000	1.5
***************
*** 70,74 ****
  static int  WaitForServer();
  
! static void UsageError(char *msg);
  static void StatusMsg(int state);
  static char *FindConfig(char *config);
--- 70,74 ----
  static int  WaitForServer();
  
! static void UsageError(char *msg, ...);
  static void StatusMsg(int state);
  static char *FindConfig(char *config);
***************
*** 109,117 ****
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig, cmdargc;
!     char **cmdargv;
      char *config;
      Ns_Time timeout;
-     char buf[PATH_MAX];
  
  #ifndef _WIN32
--- 109,115 ----
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig;
      char *config;
      Ns_Time timeout;
  
  #ifndef _WIN32
***************
*** 198,204 ****
       */
  
!     opterr = 0;
!     while ((i = getopt(argc, argv, "+chpzifwVs:t:IRSkKdr:u:g:b:B:")) != -1) {
!         switch (i) {
          case 'h':
              UsageError(NULL);
--- 196,205 ----
       */
  
!     for (i = 1; i < argc; i++) {
!         if (argv[i][0] != '-') {
!             UsageError("invalid option: %s", argv[i]);
! 	    exit(1);
!         }
!         switch (argv[i][1]) {
          case 'h':
              UsageError(NULL);
***************
*** 221,225 ****
  #endif
              }
!             mode = i;
              break;
          case 's':
--- 222,226 ----
  #endif
              }
!             mode = argv[i][1];
              break;
          case 's':
***************
*** 227,231 ****
                  UsageError("multiple -s <server> options");
              }
!             server = optarg;
              break;
          case 't':
--- 228,236 ----
                  UsageError("multiple -s <server> options");
              }
!             if (i + 1 < argc) {
!                 server = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 't':
***************
*** 233,237 ****
                  UsageError("multiple -t <file> options");
              }
!             nsconf.config = optarg;
              break;
          case 'p':
--- 238,246 ----
                  UsageError("multiple -t <file> options");
              }
!             if (i + 1 < argc) {
!            	nsconf.config = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 'p':
***************
*** 241,252 ****
  #ifndef _WIN32
          case 'b':
!             bindargs = optarg;
              break;
          case 'B':
!             bindfile = optarg;
              break;
          case 'r':
!             root = optarg;
!             break;
              break;
          case 'd':
--- 250,272 ----
  #ifndef _WIN32
          case 'b':
!             if (i + 1 < argc) {
!             	bindargs = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 'B':
!             if (i + 1 < argc) {
!             	bindfile = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 'r':
!             if (i + 1 < argc) {
!             	root = server = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 'd':
***************
*** 254,270 ****
              break;
          case 'g':
!             garg = optarg;
              break;
          case 'u':
!             uarg = optarg;
              break;
  #endif
-         case ':':
-             sprintf(buf, "option -%c requires a parameter", optopt);
-             UsageError(buf);
-             break;
          default:
!             sprintf(buf, "invalid option: -%c", optopt);
!             UsageError(buf);
              break;
          }
--- 274,293 ----
              break;
          case 'g':
!             if (i + 1 < argc) {
!                 garg = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
          case 'u':
!             if (i + 1 < argc) {
!                 uarg = argv[++i];
!             } else {
!                 UsageError("no parameter for -%c option", argv[i][1]);
!             }
              break;
  #endif
          default:
!             UsageError("invalid option: -%c", argv[i][1]);
              break;
          }
***************
*** 514,518 ****
      Tcl_FindExecutable(argv[0]);
      nsconf.nsd = (char *) Tcl_GetNameOfExecutable();
!     NsConfigEval(config, argc, argv, optind);
      ns_free(config);
      
--- 537,541 ----
      Tcl_FindExecutable(argv[0]);
      nsconf.nsd = (char *) Tcl_GetNameOfExecutable();
!     NsConfigEval(config, argc, argv, argc);
      ns_free(config);
      
***************
*** 718,728 ****
  
          NsRestoreSignals();
!         cmdargv = ns_calloc((size_t) argc - optind + 2, sizeof(char *));
!         cmdargc = 0;
!         cmdargv[cmdargc++] = argv[0];
!         for (i = optind; i < argc; i++) {
!             cmdargv[cmdargc++] = argv[i];
!         }
!         Tcl_Main(cmdargc, cmdargv, CommandInit);
      }
  
--- 741,745 ----
  
          NsRestoreSignals();
!         Tcl_Main(argc, argv, CommandInit);
      }
  
***************
*** 1004,1011 ****
  
  static void
! UsageError(char *msg)
  {
      if (msg != NULL) {
!     fprintf(stderr, "\nError: %s\n", msg);
      }
      fprintf(stderr, "\n"
--- 1021,1033 ----
  
  static void
! UsageError(char *msg, ...)
  {
      if (msg != NULL) {
!     	va_list ap;
!     	va_start(ap, msg);
!     	fprintf(stderr, "\nError: ");
! 	vfprintf(stderr, msg, ap);
! 	fprintf(stderr, "\n");
! 	va_end(ap);
      }
      fprintf(stderr, "\n"

[naviserver-commits] naviserver ChangeLog,1.35,1.36

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

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

Modified Files:
	ChangeLog 
Log Message:
changed command line parsing from getopt to simple manual processing thus getopt is not needed anymore


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ChangeLog	3 Apr 2005 06:38:00 -0000	1.35
--- ChangeLog	3 Apr 2005 23:37:05 -0000	1.36
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-04-03  Vlad Seryakov  <ser...@us...>
+ 
+ 	* nsd/nsmain.c: changed command line parsing from getopt to
+ 	  simple manual processing thus getopt is not needed anymore.
+ 	* nsd/getopt.c: removed because no needed anymore
+ 
  2005-04-02  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/tests test.nscfg,NONE,1.1 all.tcl,1.1.1.1,1.2 http.test,1.1.1.1,1.2 ns_addrbyhost.test,1.1.1.1,1.2 ns_adp_compress.test,1.1.1.1,1.2 ns_hostbyaddr.test,1.1.1.1,1.2 ns_hrefs.test,1.1.1.1,1.2 ns_parseargs.test,1.1,1.2

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

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

Modified Files:
	all.tcl http.test ns_addrbyhost.test ns_adp_compress.test 
	ns_hostbyaddr.test ns_hrefs.test ns_parseargs.test 
Added Files:
	test.nscfg 
Log Message:
* nsd/nsd.h:
* nsd/driver.c:
* nsd/tclinit.c:
* nsd/nsmain.c: Add -c command line option which causes the server
to start in command mode, reading commands from stdin and
executing them like a tclsh.

* Makefile:
* tests/test.nscfg:
* tests/all.tcl: Add new Makefile targets test, runtest and gdb
which start the server in command mode.  Modify the test runner
and add a test server config file.

* tests/http.test:
* tests/ns_addrbyhost.test:
* tests/ns_adp_compress.test:
* tests/ns_hostbyaddr.test:
* tests/ns_hrefs.test:
* tests/ns_parseargs.test: Update tests to use tlctest syntax and
features.


Index: ns_addrbyhost.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_addrbyhost.test,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_addrbyhost.test	16 Feb 2005 08:41:01 -0000	1.1.1.1
--- ns_addrbyhost.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 31,56 ****
  #
  
- source harness.tcl
- load libnsd.so
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
- test ns_addrbyhost {ns_addrbyhost} {
-     assertEquals "127.0.0.1" [ns_addrbyhost "localhost"]
  
-     # ns_log messages confuse tcltest into thinking the test had a failure
-     ns_logctl hold
-     assertEquals 1 [catch {ns_addrbyhost "this_should_not_resolve"} msg]
-     assertEquals "could not lookup this_should_not_resolve" $msg
-     ns_logctl truncate
  
!     # RFE #999452: Add -all switch to ns_addrbyhost
!     #
!     # This test will fail if we don't have connectivity/DNS service
!     # or if the DNS entries change in a significant way.
!     assertEquals 1 [expr {[llength [ns_addrbyhost -all "www.google.com"]] > 1}]
!     assertEquals 1 [llength [ns_addrbyhost "www.google.com"]]
! } {}
  
  cleanupTests
--- 31,49 ----
  #
  
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
  
  
! test ns_addrbyhost-1.1 {good host} -body {
!     ns_addrbyhost localhost
! } -result 127.0.0.1
! 
! test ns_addrbyhost-1.2 {bad host} -body {
!     ns_addrbyhost this_should_not_resolve
! } -returnCodes error -result {could not lookup this_should_not_resolve}
! 
! 
  
  cleanupTests

--- NEW FILE: test.nscfg ---
#
# ...
#

set servername test

ns_section "ns/parameters"
ns_param   home            ./tests

ns_section "ns/servers"
ns_param   $servername     "Test Server"

ns_section "ns/server/${servername}"
ns_param   pageroot        servers/server1/pages
ns_param   enabletclpages  true

ns_section "ns/server/${servername}/tcl"
ns_param   initfile        ../nsd/init.tcl
ns_param   library         ../tcl

Index: http.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/http.test,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** http.test	16 Feb 2005 08:41:01 -0000	1.1.1.1
--- http.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 32,36 ****
  
  source harness.tcl
- load libnsd.so
  
  package require tcltest 2.2
--- 32,35 ----
***************
*** 39,50 ****
  if {[info exists ::env(AOLSERVER_HTTP_TEST)]} {
      testConstraint serverTests true
- } else {
-     puts "
-     To enable HTTP compliance tests, set environment variable
-     AOLSERVER_HTTP_TEST=hostname:port of the server running
-     http-test-config.tcl.
- "
  }
  
  if {[testConstraint serverTests]} {
      foreach {host port} [split $::env(AOLSERVER_HTTP_TEST) :] break
--- 38,44 ----
  if {[info exists ::env(AOLSERVER_HTTP_TEST)]} {
      testConstraint serverTests true
  }
  
+ 
  if {[testConstraint serverTests]} {
      foreach {host port} [split $::env(AOLSERVER_HTTP_TEST) :] break

Index: ns_hrefs.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_hrefs.test,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_hrefs.test	16 Feb 2005 08:41:01 -0000	1.1.1.1
--- ns_hrefs.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 31,59 ****
  #
  
- source harness.tcl
- load libnsd.so
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
- test ns_hrefs-1.1 {ns_hrefs} {
-     assertEquals "" [ns_hrefs {}]
-     assertEquals "" [ns_hrefs {<a>}]
-     assertEquals "{}" [ns_hrefs {<a href="">}]
-     assertEquals "{}" [ns_hrefs {<a href=''>}]
  
-     assertEquals "simple" [ns_hrefs {<a href="simple">}]
-     assertEquals "href=tricky" [ns_hrefs {<a href="href=tricky">}]
-     assertEquals "first" [ns_hrefs {<a href="first" href="second">}]
-     assertEquals "naked" [ns_hrefs {<a href=naked dummy>}]
  
!     assertEquals "" [ns_hrefs {a href="bogus">}]
!     assertEquals "" [ns_hrefs {<a href="bogus"}]
!     assertEquals "" [ns_hrefs {<a href "bogus">}]
!     assertEquals "" [ns_hrefs {<a "href="bogus"">}]
  
-     # [ 995078 ] ns_hrefs only checks first attribute in <a>
-     assertEquals "hard" [ns_hrefs {<a dummy href="hard">}]
- } {}
  
  cleanupTests
--- 31,101 ----
  #
  
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
  
  
! test ns_hrefs-1.1 {syntax} -body {
!     ns_hrefs
! } -returnCodes error -result {wrong # args: should be "ns_hrefs html"}
! 
! test ns_hrefs-1.2 {syntax} -body {
!     ns_hrefs {}
! } -result {}
! 
! 
! 
! test ns_hrefs-2.1 {parse with result} -body {
!     ns_hrefs {<a>}
! } -result {}
! 
! test ns_hrefs-2.2 {parse with result} -body {
!     ns_hrefs {<a href="">}
! } -result {{}}
! 
! test ns_hrefs-2.3 {parse with result} -body {
!     ns_hrefs {<a href=''>}
! } -result {{}}
! 
! test ns_hrefs-2.4 {parse with result} -body {
!     ns_hrefs {<a href="simple">}
! } -result {simple}
! 
! test ns_hrefs-2.5 {parse with result} -body {
!     ns_hrefs {<a href="href=tricky">}
! } -result {href=tricky}
! 
! test ns_hrefs-2.6 {parse with result} -body {
!     ns_hrefs {<a href="first" href="second">}
! } -result {first}
! 
! test ns_hrefs-2.7 {parse with result} -body {
!     ns_hrefs {<a href=naked dummy>}
! } -result {naked}
! 
! test ns_hrefs-2.8 {parse with result} -body {
!     ns_hrefs {<a first href="second">}
! } -result {second}
! 
! 
! 
! test ns_hrefs-3.1 {parse without result} -body {
!     ns_hrefs {a href="bogus">}
! } -result {}
! 
! test ns_hrefs-3.2 {parse without result} -body {
!     ns_hrefs {<a href="bogus"}
! } -result {}
! 
! test ns_hrefs-3.3 {parse without result} -body {
!     ns_hrefs {<a href "bogus">}
! } -result {}
! 
! test ns_hrefs-3.4 {parse without result} -body {
!     ns_hrefs {a "href="bogus"">}
! } -result {}
! 
  
  
  cleanupTests

Index: ns_adp_compress.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_adp_compress.test,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_adp_compress.test	16 Feb 2005 08:41:02 -0000	1.1.1.1
--- ns_adp_compress.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 32,36 ****
  
  source harness.tcl
- load libnsd.so
  
  package require tcltest 2.2
--- 32,35 ----
***************
*** 39,48 ****
  if {[info exists ::env(AOLSERVER_HTTP_TEST)]} {
      testConstraint serverTests true
- } else {
-     puts "
-     To enable HTTP compliance tests, set environment variable
-     AOLSERVER_HTTP_TEST=hostname:port of the server running
-     http-test-config.tcl.
- "
  }
  
--- 38,41 ----

Index: ns_hostbyaddr.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_hostbyaddr.test,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ns_hostbyaddr.test	16 Feb 2005 08:41:01 -0000	1.1.1.1
--- ns_hostbyaddr.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 31,49 ****
  #
  
- source harness.tcl
- load libnsd.so
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
- test ns_hostbyaddr {ns_hostbyaddr} {
-     assertEquals "localhost" [ns_hostbyaddr "127.0.0.1"]
  
!     # ns_log messages confuse tcltest into thinking the test had a failure
!     ns_logctl hold
!     assertEquals 1 [catch {ns_hostbyaddr "0.0.0.0"} msg]
!     assertEquals "could not lookup 0.0.0.0" $msg
!     ns_logctl truncate
! } {}
  
  cleanupTests
--- 31,49 ----
  #
  
  
  package require tcltest 2.2
  namespace import -force ::tcltest::*
  
  
! 
! test ns_hostbyaddr-1.1 {good address} -body {
!     ns_hostbyaddr 127.0.0.1
! } -match glob -result localhost*
! 
! test ns_hostbyaddr-1.2 {bad address} -body {
!     ns_hostbyaddr 0.0.0.0
! } -returnCodes error -result {could not lookup 0.0.0.0}
! 
! 
  
  cleanupTests

Index: ns_parseargs.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_parseargs.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ns_parseargs.test	26 Mar 2005 14:25:26 -0000	1.1
--- ns_parseargs.test	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 4,9 ****
  
  
- load ../nsd/libnsd.so
- 
  package require tcltest 2.2
  namespace import -force ::tcltest::*
--- 4,7 ----
***************
*** 48,51 ****
--- 46,63 ----
  } -result {}
  
+ test ns_parseargs-2.3 {object type conversion / display} -constraints {
+     knownBug
+ } -body {
+     set tid [ns_thread begin {
+         proc x {} {
+             ns_parseargs {-a} {-a A}
+         }
+         x
+     }]
+     ns_thread wait $tid
+ } -cleanup {
+     unset -nocomplain -- tid
+ } -result {}
+ 
  
  

Index: all.tcl
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/all.tcl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** all.tcl	16 Feb 2005 08:41:02 -0000	1.1.1.1
--- all.tcl	3 Apr 2005 06:38:01 -0000	1.2
***************
*** 1,6 ****
- #!/bin/sh
- # the next line restarts using tclsh \
- exec tclsh "$0" "$@"
- 
  #
  # The contents of this file are subject to the AOLserver Public License
--- 1,2 ----
***************
*** 35,55 ****
  #
  
! package require Tcl 8.4
! 
! if {![info exists ::tcl_platform(threaded)] || !$::tcl_platform(threaded)} {
!     error "tests must run from a threaded tclsh"
! }
  
  package require tcltest 2.2
  
! set LD_LIBRARY_PATH [list]
! if {[info exists env(LD_LIBRARY_PATH)]} {
!     lappend LD_LIBRARY_PATH $env(LD_LIBRARY_PATH)
! }
! lappend LD_LIBRARY_PATH ../../nsd ../../nsthread
! set env(LD_LIBRARY_PATH) [join $LD_LIBRARY_PATH :]
! 
! tcltest::configure -testdir [file dirname [info script]]
! eval tcltest::configure $argv
  
! tcltest::runAllTests
--- 31,49 ----
  #
  
! #
! # all.tcl --
! #
! #       This file contains a top-level script to run all of the tests.
! #       Execute it by invoking "source all.tcl" when running nsd in
! #       command mode in this directory.
! #
  
+ package require Tcl 8.4
  package require tcltest 2.2
+ namespace import tcltest::*
+ eval configure $argv -singleproc true -testdir [file dirname [info script]]
  
! # Output on stderr confuses tcltest
! ns_logctl hold
  
! runAllTests

[naviserver-commits] naviserver/nsd driver.c,1.2,1.3 nsd.h,1.8,1.9 nsmain.c,1.3,1.4 tclinit.c,1.2,1.3

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

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

Modified Files:
	driver.c nsd.h nsmain.c tclinit.c 
Log Message:
* nsd/nsd.h:
* nsd/driver.c:
* nsd/tclinit.c:
* nsd/nsmain.c: Add -c command line option which causes the server
to start in command mode, reading commands from stdin and
executing them like a tclsh.

* Makefile:
* tests/test.nscfg:
* tests/all.tcl: Add new Makefile targets test, runtest and gdb
which start the server in command mode.  Modify the test runner
and add a test server config file.

* tests/http.test:
* tests/ns_addrbyhost.test:
* tests/ns_adp_compress.test:
* tests/ns_hostbyaddr.test:
* tests/ns_hrefs.test:
* tests/ns_parseargs.test: Update tests to use tlctest syntax and
features.


Index: tclinit.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tclinit.c	26 Mar 2005 14:25:25 -0000	1.2
--- tclinit.c	3 Apr 2005 06:38:01 -0000	1.3
***************
*** 70,74 ****
  static Tcl_InterpDeleteProc FreeData;
  static Ns_TlsCleanup DeleteInterps;
- static int InitInterp(Tcl_Interp *interp, NsServer *servPtr, NsInterp **itPtrPtr);
  static int UpdateInterp(NsInterp *itPtr);
  static Tcl_HashEntry *GetHashEntry(NsServer *servPtr);
--- 70,73 ----
***************
*** 292,296 ****
  Ns_TclInit(Tcl_Interp *interp)
  {
!     return InitInterp(interp, NULL, NULL);
  }
  
--- 291,295 ----
  Ns_TclInit(Tcl_Interp *interp)
  {
!     return NsInitInterp(interp, NULL, NULL);
  }
  
***************
*** 418,422 ****
  	Tcl_SetHashValue(hPtr, itPtr->nextPtr);
      } else {
! 	(void) InitInterp(Tcl_CreateInterp(), servPtr, &itPtr);
      }
      interp = itPtr->interp;
--- 417,421 ----
  	Tcl_SetHashValue(hPtr, itPtr->nextPtr);
      } else {
! 	(void) NsInitInterp(Tcl_CreateInterp(), servPtr, &itPtr);
      }
      interp = itPtr->interp;
***************
*** 1135,1141 ****
   *----------------------------------------------------------------------
   *
!  * InitInterp --
   *
!  *      Initialize an interp with standard Tcl and AOLserver commands.
   *	If servPtr is not NULL, virtual server commands will be added
   *	as well.
--- 1134,1140 ----
   *----------------------------------------------------------------------
   *
!  * NsInitInterp --
   *
!  *      Initialize an interp with standard Tcl and server commands.
   *	If servPtr is not NULL, virtual server commands will be added
   *	as well.
***************
*** 1150,1155 ****
   */
  
! static int
! InitInterp(Tcl_Interp *interp, NsServer *servPtr, NsInterp **itPtrPtr)
  {
      static volatile int initialized = 0;
--- 1149,1154 ----
   */
  
! int
! NsInitInterp(Tcl_Interp *interp, NsServer *servPtr, NsInterp **itPtrPtr)
  {
      static volatile int initialized = 0;

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nsd.h	28 Mar 2005 17:02:07 -0000	1.8
--- nsd.h	3 Apr 2005 06:38:01 -0000	1.9
***************
*** 808,811 ****
--- 808,813 ----
  extern NsServer *NsGetInitServer(void);
  extern NsInterp *NsGetInterp(Tcl_Interp *interp);
+ extern int NsInitInterp(Tcl_Interp *interp, NsServer *servPtr,
+                         NsInterp **itPtrPtr);
  
  extern Ns_OpProc NsFastGet;

Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** driver.c	22 Mar 2005 20:49:31 -0000	1.2
--- driver.c	3 Apr 2005 06:38:01 -0000	1.3
***************
*** 500,508 ****
       */
  
!     if (ns_sockpair(trigPipe) != 0) {
! 	Ns_Fatal("driver: ns_sockpair() failed: %s",
! 	    ns_sockstrerror(ns_sockerrno));
      }
-     Ns_ThreadCreate(DriverThread, NULL, 0, &driverThread);
  }
  
--- 500,510 ----
       */
  
!     if (firstDrvPtr != NULL) {
!         if (ns_sockpair(trigPipe) != 0) {
!             Ns_Fatal("driver: ns_sockpair() failed: %s",
!                      ns_sockstrerror(ns_sockerrno));
!         }
!         Ns_ThreadCreate(DriverThread, NULL, 0, &driverThread);
      }
  }
  

Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsmain.c	17 Mar 2005 17:49:12 -0000	1.3
--- nsmain.c	3 Apr 2005 06:38:01 -0000	1.4
***************
*** 37,50 ****
  
  #include "nsd.h"
! #ifdef _WIN32
! #define DEVNULL "nul:"
  #else
! #define DEVNULL "/dev/null"
  #endif
  
  /*
   * Local functions defined in this file.
   */
  
  static int  StartWatchedServer(void);
  static void SysLog(int priority, char *fmt, ...);
--- 37,68 ----
  
  #include "nsd.h"
! 
! #ifndef _WIN32
! # ifdef LOG_DEBUG
! #  undef LOG_DEBUG /* Because this is used by the syslog facility as well */
! # endif
! # include <syslog.h>
! # include <signal.h>
! # include <stdarg.h>
! # include <unistd.h>
! # define DEVNULL "/dev/null"
  #else
! # define DEVNULL "nul:"
  #endif
  
  /*
+  * The following values define the restart behaviour for watchdog mode.
+  */
+ 
+ #define MAX_RESTART_SECONDS 64 /* Max time in sec to wait between restarts */
+ #define MIN_WORK_SECONDS   128 /* After being up for # secs, reset timers */
+ #define MAX_NUM_RESTARTS   256 /* Quit after somany unsuccessful restarts */
+ 
+ /*
   * Local functions defined in this file.
   */
  
+ static Tcl_AppInitProc CommandInit;
+ 
  static int  StartWatchedServer(void);
  static void SysLog(int priority, char *fmt, ...);
***************
*** 62,84 ****
  
  /*
!  * Setup timer/counter values for graceously waiting before trying 
!  * to restart crippled server. This should be configurable from the
!  * server config file (ns/watchdog section or alike).
   */
  
! #define MAX_RESTART_SECONDS 64 /* Max time in sec to wait between restarts */
! #define MIN_WORK_SECONDS   128 /* After being up for # secs, reset timers */
! #define MAX_NUM_RESTARTS   256 /* Quit after somany unsuccessful restarts */
! 
! #ifndef _WIN32
! # ifdef LOG_DEBUG
! #  undef LOG_DEBUG /* Because this is used by the syslog facility as well */
! # endif
! # include <syslog.h>
! # include <signal.h>
! # include <stdarg.h>
! # include <unistd.h>
  static int watchdogExit = 0; /* Watchdog loop toggle */
! #endif /* _WIN32 */
  
  
--- 80,89 ----
  
  /*
!  * Local variables defined in this file.
   */
  
! static char *cmdServer;      /* Command mode interp server */
  static int watchdogExit = 0; /* Watchdog loop toggle */
! 
  
  
***************
*** 104,108 ****
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig;
      char *config;
      Ns_Time timeout;
--- 109,114 ----
  Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
  {
!     int  i, fd, sig, cmdargc;
!     char **cmdargv;
      char *config;
      Ns_Time timeout;
***************
*** 171,187 ****
      nsconf.argv0 = argv[0];
  
-     /*
-      * NaviServer requires file descriptor 0 be open on /dev/null to
-      * ensure the server never blocks reading stdin.
-      */
-      
-     fd = open(DEVNULL, O_RDONLY);
-     if (fd > 0) {
-         dup2(fd, 0);
-         close(fd);
-     }
- 
      /*     
!      * Also, file descriptors 1 and 2 may not be open if the server
       * is starting from /etc/init.  If so, open them on /dev/null
       * as well because the server will assume they're open during
--- 177,182 ----
      nsconf.argv0 = argv[0];
  
      /*     
!      * File descriptors 1 and 2 may not be open if the server
       * is starting from /etc/init.  If so, open them on /dev/null
       * as well because the server will assume they're open during
***************
*** 204,212 ****
  
      opterr = 0;
!     while ((i = getopt(argc, argv, "hpzifwVs:t:IRSkKdr:u:g:b:B:")) != -1) {
          switch (i) {
          case 'h':
              UsageError(NULL);
              break;
          case 'f':
          case 'i':
--- 199,208 ----
  
      opterr = 0;
!     while ((i = getopt(argc, argv, "+chpzifwVs:t:IRSkKdr:u:g:b:B:")) != -1) {
          switch (i) {
          case 'h':
              UsageError(NULL);
              break;
+         case 'c':
          case 'f':
          case 'i':
***************
*** 220,226 ****
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -i, -f, -V, -I, -R, or -S may be specified");
  #else
!                 UsageError("only one of -i, -f, -w, or -V may be specified");
  #endif
              }
--- 216,222 ----
              if (mode != 0) {
  #ifdef _WIN32
!                 UsageError("only one of -c, -i, -f, -V, -I, -R, or -S may be specified");
  #else
!                 UsageError("only one of -c, -i, -f, -w, or -V may be specified");
  #endif
              }
***************
*** 284,288 ****
          UsageError("required -t <config> option not specified");
      }
!     
      /*
       * Find the absolute config pathname and read the config data
--- 280,296 ----
          UsageError("required -t <config> option not specified");
      }
!     if (mode != 'c') {
!         /*
!          * The server requires file descriptor 0 be open on /dev/null to
!          * ensure the server never blocks reading stdin.
!          */
! 
!         fd = open(DEVNULL, O_RDONLY);
!         if (fd > 0) {
!             dup2(fd, 0);
!             close(fd);
!         }
!     }
! 
      /*
       * Find the absolute config pathname and read the config data
***************
*** 532,536 ****
          server = Ns_SetKey(servers, i);
      }
!     
      /*
       * Set the procname used for the pid file.
--- 540,544 ----
          server = Ns_SetKey(servers, i);
      }
! 
      /*
       * Set the procname used for the pid file.
***************
*** 544,551 ****
      
      nsconf.home = Ns_ConfigGetValue(NS_CONFIG_PARAMETERS, "home");
!     if (nsconf.home == NULL) {
          Ns_Fatal("nsmain: missing: [%s]home", NS_CONFIG_PARAMETERS);
      }
!     if (chdir(nsconf.home) != 0) {
          Ns_Fatal("nsmain: chdir(%s) failed: '%s'", nsconf.home, strerror(errno));
      }
--- 552,559 ----
      
      nsconf.home = Ns_ConfigGetValue(NS_CONFIG_PARAMETERS, "home");
!     if (mode != 'c' && nsconf.home == NULL) {
          Ns_Fatal("nsmain: missing: [%s]home", NS_CONFIG_PARAMETERS);
      }
!     if (nsconf.home != NULL && chdir(nsconf.home) != 0) {
          Ns_Fatal("nsmain: chdir(%s) failed: '%s'", nsconf.home, strerror(errno));
      }
***************
*** 610,614 ****
       */
       
!     if (mode != 'f') {
          NsLogOpen();
      }
--- 618,622 ----
       */
       
!     if (mode != 'c' && mode != 'f') {
          NsLogOpen();
      }
***************
*** 646,650 ****
       */
  
!     NsCreatePidFile(procname);
  
      /*
--- 654,660 ----
       */
  
!     if (mode != 'c') {
!         NsCreatePidFile(procname);
!     }
  
      /*
***************
*** 660,663 ****
--- 670,674 ----
          }
      }
+     cmdServer = server;
      
      /*
***************
*** 700,703 ****
--- 711,730 ----
  #endif
  
+     if (mode == 'c') {
+         /*
+          * Initialize Tcl and start interpreting commands.
+          * This function never returns, so no clean shutdown.
+          */
+ 
+         NsRestoreSignals();
+         cmdargv = ns_calloc((size_t) argc - optind + 2, sizeof(char *));
+         cmdargc = 0;
+         cmdargv[cmdargc++] = argv[0];
+         for (i = optind; i < argc; i++) {
+             cmdargv[cmdargc++] = argv[i];
+         }
+         Tcl_Main(cmdargc, cmdargv, CommandInit);
+     }
+ 
      /*
       * Once the drivers listen thread is started, this thread will just
***************
*** 888,891 ****
--- 915,943 ----
   *----------------------------------------------------------------------
   *
+  * CommandInit --
+  *
+  *      Initialize the interp with server commands.
+  *
+  * Results:
+  *      TCL_OK or TCL_ERROR.
+  *
+  * Side effects:
+  *      None.
+  *
+  *----------------------------------------------------------------------
+  */
+ 
+ static int
+ CommandInit(Tcl_Interp *interp)
+ {
+     NsServer *servPtr = NsGetServer(cmdServer);
+ 
+     return NsInitInterp(interp, servPtr, NULL);
+ }
+ 
+ 
+ /*
+  *----------------------------------------------------------------------
+  *
   * StatusMsg --
   *
***************
*** 958,962 ****
      }
      fprintf(stderr, "\n"
!         "Usage: %s [-h|V] [-i|f] "
  #ifdef _WIN32
          "[-I|R] "
--- 1010,1014 ----
      }
      fprintf(stderr, "\n"
!         "Usage: %s [-h|V] [-c|-i|f] "
  #ifdef _WIN32
          "[-I|R] "
***************
*** 968,971 ****
--- 1020,1024 ----
          "  -h  help (this message)\n"
          "  -V  version and release information\n"
+         "  -c  command mode\n"
          "  -i  inittab mode\n"
          "  -f  foreground mode\n"

[naviserver-commits] naviserver ChangeLog,1.34,1.35 Makefile,1.3,1.4

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

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

Modified Files:
	ChangeLog Makefile 
Log Message:
* nsd/nsd.h:
* nsd/driver.c:
* nsd/tclinit.c:
* nsd/nsmain.c: Add -c command line option which causes the server
to start in command mode, reading commands from stdin and
executing them like a tclsh.

* Makefile:
* tests/test.nscfg:
* tests/all.tcl: Add new Makefile targets test, runtest and gdb
which start the server in command mode.  Modify the test runner
and add a test server config file.

* tests/http.test:
* tests/ns_addrbyhost.test:
* tests/ns_adp_compress.test:
* tests/ns_hostbyaddr.test:
* tests/ns_hrefs.test:
* tests/ns_parseargs.test: Update tests to use tlctest syntax and
features.


Index: Makefile
===================================================================
RCS file: /cvsroot/naviserver/naviserver/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	13 Mar 2005 02:09:53 -0000	1.3
--- Makefile	3 Apr 2005 06:38:00 -0000	1.4
***************
*** 66,70 ****
  
  test: all
! 	cd tests/new && ./all.tcl
  
  clean:
--- 66,78 ----
  
  test: all
! 	LD_LIBRARY_PATH="./nsd:./nsthread" ./nsd/nsd -c -d -t tests/test.nscfg all.tcl $(TESTFLAGS) $(TCLTESTARGS)
! 
! runtest: all
! 	LD_LIBRARY_PATH="./nsd:./nsthread" ./nsd/nsd -c -t tests/test.nscfg
! 
! gdb: all
! 	@echo "set args -c -d -t tests/test.nscfg all.tcl $(TESTFLAGS) $(TCLTESTARGS)" > gdb.run
! 	LD_LIBRARY_PATH="./nsd:./nsthread" gdb -x gdb.run ./nsd/nsd
! 	rm gdb.run
  
  clean:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ChangeLog	2 Apr 2005 20:31:59 -0000	1.34
--- ChangeLog	3 Apr 2005 06:38:00 -0000	1.35
***************
*** 1,2 ****
--- 1,25 ----
+ 2005-04-02  Stephen Deasey  <sd...@us...>
+ 
+ 	* nsd/nsd.h:
+ 	* nsd/driver.c:
+ 	* nsd/tclinit.c:
+ 	* nsd/nsmain.c: Add -c command line option which causes the server
+ 	to start in command mode, reading commands from stdin and
+ 	executing them like a tclsh.
+ 
+ 	* Makefile:
+ 	* tests/test.nscfg:
+ 	* tests/all.tcl: Add new Makefile targets test, runtest and gdb
+ 	which start the server in command mode.  Modify the test runner
+ 	and add a test server config file.
+ 
+ 	* tests/http.test:
+ 	* tests/ns_addrbyhost.test:
+ 	* tests/ns_adp_compress.test:
+ 	* tests/ns_hostbyaddr.test:
+ 	* tests/ns_hrefs.test:
+ 	* tests/ns_parseargs.test: Update tests to use tlctest syntax and
+ 	features.
+ 
  2005-04-02  Vlad Seryakov  <ser...@us...>
  

[naviserver-commits] naviserver/nsd tclcmds.c,1.7,1.8

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

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

Modified Files:
	tclcmds.c 
Log Message:
added synonyms for ns_uuencode/ns_uudecode procs as ns_base64encode/ns_base64decode, 
because those functions actually do base64 encoding


Index: tclcmds.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tclcmds.c	26 Mar 2005 16:40:40 -0000	1.7
--- tclcmds.c	2 Apr 2005 20:31:59 -0000	1.8
***************
*** 260,263 ****
--- 260,265 ----
      {"ns_uuencode", NULL, NsTclHTUUEncodeObjCmd},
      {"ns_uudecode", NULL, NsTclHTUUDecodeObjCmd},
+     {"ns_base64encode", NULL, NsTclHTUUEncodeObjCmd},
+     {"ns_base64decode", NULL, NsTclHTUUDecodeObjCmd},
      {"ns_gifsize", NULL, NsTclGifSizeObjCmd},
      {"ns_jpegsize", NULL, NsTclJpegSizeObjCmd},

[naviserver-commits] naviserver ChangeLog,1.33,1.34

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

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

Modified Files:
	ChangeLog 
Log Message:
added synonyms for ns_uuencode/ns_uudecode procs as ns_base64encode/ns_base64decode, 
because those functions actually do base64 encoding


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ChangeLog	2 Apr 2005 20:29:46 -0000	1.33
--- ChangeLog	2 Apr 2005 20:31:59 -0000	1.34
***************
*** 1,4 ****
--- 1,7 ----
  2005-04-02  Vlad Seryakov  <ser...@us...>
  
+ 	* nsd/tclcmds.c: added synonyms for ns_uuencode/ns_uudecode procs
+ 	  as ns_base64encode/ns_base64decode, because those functions actually
+ 	  do base64 encoding
  	* nsd/tclmisc.c:
  	* nsd/uuencode.c: modified uuencode/decode to support