naviserver-commits — Commit notices

[naviserver-commits] naviserver/tests http_byteranges.test,1.8,1.9

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

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

Modified Files:
	http_byteranges.test 
Log Message:
Applied TclVFS changes. Use (where possible) Tcl_FS wrappers when
handling files on the filesystem.


Index: http_byteranges.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/http_byteranges.test,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** http_byteranges.test	8 Jul 2005 18:09:39 -0000	1.8
--- http_byteranges.test	8 Oct 2005 12:06:07 -0000	1.9
***************
*** 153,156 ****
--- 153,168 ----
  }]
  
+ test byteranges-2.5 {Multiple overlapping ranges} -constraints serverListen -body {
+     nstest_http -getbody 1 -setheaders {Range bytes=2-8,3-6,4-7} \
+         -getheaders {Content-length Content-range} \
+         GET /10bytes
+ } -result {206 7 {bytes 2-8/10} 2345678}
+ 
+ test byteranges-2.6 {Multiple overlapping ranges} -constraints serverListen -body {
+     nstest_http -getbody 1 -setheaders {Range bytes=2-8,1-6,4-9} \
+         -getheaders {Content-length Content-range} \
+         GET /10bytes
+ } -result {206 9 {bytes 1-9/10} 123456789}
+ 
  
  test byteranges-3.1 {syntactically invalid} -constraints serverListen -body {
***************
*** 161,165 ****
  
  test byteranges-3.2 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=11-10} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 173,177 ----
  
  test byteranges-3.2 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 167,171 ****
  
  test byteranges-3.3 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 179,183 ----
  
  test byteranges-3.3 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes 0-1} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 173,177 ****
  
  test byteranges-3.4 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes 0-1} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 185,189 ----
  
  test byteranges-3.4 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range 0-1} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 179,183 ****
  
  test byteranges-3.5 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range 0-1} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 191,195 ----
  
  test byteranges-3.5 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range =} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 185,189 ****
  
  test byteranges-3.6 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range =} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 197,201 ----
  
  test byteranges-3.6 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range =-} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 191,195 ****
  
  test byteranges-3.7 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range =-} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 203,207 ----
  
  test byteranges-3.7 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=--6-9} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 197,201 ****
  
  test byteranges-3.8 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=--6-9} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 209,213 ----
  
  test byteranges-3.8 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=1--6} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 203,207 ****
  
  test byteranges-3.9 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=1--6} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
--- 215,219 ----
  
  test byteranges-3.9 {syntactically invalid} -constraints serverListen -body {
!     nstest_http -getbody 1 -setheaders {Range bytes=1} \
          -getheaders {Content-length Content-range} \
          GET /10bytes
***************
*** 209,213 ****
  
  
- 
  test byteranges-4.1 {unsatisfiable} -constraints serverListen -body {
      nstest_http -setheaders {Range bytes=10-10} -getheaders {Content-range} \
--- 221,224 ----
***************
*** 220,223 ****
--- 231,238 ----
  } -result {416 {bytes */10}}
  
+ test byteranges-4.3 {unsatisfiable} -constraints serverListen -body {
+     nstest_http -setheaders {Range bytes=11-10} -getheaders {Content-range} \
+         GET /10bytes
+ } -result {416 {bytes */10}}
  
  

[naviserver-commits] naviserver ChangeLog,1.197,1.198

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

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** ChangeLog	8 Oct 2005 09:28:08 -0000	1.197
--- ChangeLog	8 Oct 2005 09:32:48 -0000	1.198
***************
*** 12,15 ****
--- 12,19 ----
  	the Darwin getnameinfo implementation.
  
+ 	* tests/ns_hostbyaddr.test: resolving 0.0.0.0 on Darwin
+ 	always succeeds, hence this test is constrainted on
+ 	"nonDarwin".
+ 
  2005-10-05  Zoran Vasiljevic <vas...@us...>
  

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

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

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

Modified Files:
	ns_hostbyaddr.test 
Log Message:
Resolving 0.0.0.0 on Darwin always succeeds hence this test is 
constrainted on "nonDarwin".


Index: ns_hostbyaddr.test
===================================================================
RCS file: /cvsroot/naviserver/naviserver/tests/ns_hostbyaddr.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ns_hostbyaddr.test	3 Apr 2005 06:38:01 -0000	1.2
--- ns_hostbyaddr.test	8 Oct 2005 09:31:37 -0000	1.3
***************
*** 35,39 ****
  namespace import -force ::tcltest::*
  
! 
  
  test ns_hostbyaddr-1.1 {good address} -body {
--- 35,39 ----
  namespace import -force ::tcltest::*
  
! tcltest::testConstraint notDarwin [expr {$::tcl_platform(os) != "Darwin"}]
  
  test ns_hostbyaddr-1.1 {good address} -body {
***************
*** 41,49 ****
  } -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
--- 41,48 ----
  } -match glob -result localhost*
  
! test ns_hostbyaddr-1.2 {bad address} -constraints {notDarwin} -body {
      ns_hostbyaddr 0.0.0.0
  } -returnCodes error -result {could not lookup 0.0.0.0}
  
  
  cleanupTests

[naviserver-commits] naviserver ChangeLog,1.196,1.197

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

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

Modified Files:
	ChangeLog 
Log Message:
See file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.196
retrieving revision 1.197
diff -C2 -d -r1.196 -r1.197
*** ChangeLog	5 Oct 2005 09:41:00 -0000	1.196
--- ChangeLog	8 Oct 2005 09:28:08 -0000	1.197
***************
*** 1,2 ****
--- 1,15 ----
+ 2005-10-08  Zoran Vasiljevic <vas...@us...>
+ 
+ 	* configure.in: emit warning for Darwin builds about
+ 	MT-unsafeness of DNS calls (getnameinfo, getaddrinfo).
+ 
+ 	* configure: regenerated
+ 	
+ 	* nsd/dns.c: added critical sections in GetHost/GetAddr
+ 	when using getnameinfo/getaddrinfo on Darwin platforms.
+ 	Also, in GetHost(), explicitly initialize the struct
+ 	sockaddr_in sin_len element because this is needed for
+ 	the Darwin getnameinfo implementation.
+ 
  2005-10-05  Zoran Vasiljevic <vas...@us...>
  
***************
*** 6,9 ****
--- 19,27 ----
  	Log structure elements in the LogObjCmd. 
  
+ 	* nsd/dns.c: fixed typo in GetAddr when using the gethostbyname
+ 	path. This is very needed for Apple Mac OSX since the other
+ 	getnameinfo/getaddrinfo calls does not seem to work correctly
+ 	and are also mt-unsafe, so it is a loose-loose situation.
+ 
  2005-10-02  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver configure,1.10,1.11

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

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

Modified Files:
	configure 
Log Message:
Regenerated.


Index: configure
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure	6 Jul 2005 00:37:07 -0000	1.10
--- configure	8 Oct 2005 09:27:47 -0000	1.11
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.8 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59 for NaviServer 4.99.1.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.9 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59 for NaviServer 4.99.1.
***************
*** 12488,12493 ****
  
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!     -a "${ac_cv_func_getnameinfo}" = "yes" ; then
!     has_threadsafe_dns=yes
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
--- 12488,12494 ----
  
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!     -a "${ac_cv_func_getnameinfo}" = "yes"  \
!     -a "`uname -s`" != "Darwin"; then
!         has_threadsafe_dns=yes
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
***************
*** 12986,12991 ****
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
!   { echo "$as_me:$LINENO: WARNING: dns queries will use non-threadsafe calls which could result in server instability" >&5
! echo "$as_me: WARNING: dns queries will use non-threadsafe calls which could result in server instability" >&2;}
  fi
  
--- 12987,12992 ----
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
!   { echo "$as_me:$LINENO: WARNING: DNS queries will use MT-unsafe calls which could result in server instability" >&5
! echo "$as_me: WARNING: DNS queries will use MT-unsafe calls which could result in server instability" >&2;}
  fi
  

[naviserver-commits] naviserver configure.in,1.9,1.10

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

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

Modified Files:
	configure.in 
Log Message:
Emit warning for Darwin builds about MT-unsafeness of
DNS calls (getnameinfo, getaddrinfo).


Index: configure.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure.in	6 Jul 2005 00:37:07 -0000	1.9
--- configure.in	8 Oct 2005 09:27:03 -0000	1.10
***************
*** 198,203 ****
  AC_CHECK_FUNCS(getaddrinfo getnameinfo)
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!     -a "${ac_cv_func_getnameinfo}" = "yes" ; then
!     has_threadsafe_dns=yes
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
--- 198,204 ----
  AC_CHECK_FUNCS(getaddrinfo getnameinfo)
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!     -a "${ac_cv_func_getnameinfo}" = "yes"  \
!     -a "`uname -s`" != "Darwin"; then
!         has_threadsafe_dns=yes
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
***************
*** 210,214 ****
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
!   AC_MSG_WARN([dns queries will use non-threadsafe calls which could result in server instability])
  fi
  
--- 211,215 ----
  fi
  if test "${has_threadsafe_dns}" != "yes" ; then
!   AC_MSG_WARN([DNS queries will use MT-unsafe calls which could result in server instability])
  fi
  

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

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

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

Modified Files:
	dns.c 
Log Message:
Added critical sections in GetHost/GetAddr when using 
getnameinfo/getaddrinfo on Darwin platforms. Also, in 
GetHost(), explicitly initialize the struct sockaddr_in
sin_len element because this is needed for the Darwin 
getnameinfo implementation.



Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dns.c	5 Oct 2005 20:28:28 -0000	1.7
--- dns.c	8 Oct 2005 09:26:19 -0000	1.8
***************
*** 256,261 ****
      int result;
      int status = NS_FALSE;
! 
      sa.sin_family = AF_INET;
      sa.sin_addr.s_addr = inet_addr(addr);
      result = getnameinfo((const struct sockaddr *) &sa,
--- 256,266 ----
      int result;
      int status = NS_FALSE;
! #ifdef __APPLE__
!     static Ns_Cs cs;
!     Ns_CsEnter(&cs);
! #endif
!     memset(&sa, 0, sizeof(struct sockaddr_in));
      sa.sin_family = AF_INET;
+     sa.sin_len = sizeof(struct sockaddr_in);
      sa.sin_addr.s_addr = inet_addr(addr);
      result = getnameinfo((const struct sockaddr *) &sa,
***************
*** 266,271 ****
          status = NS_TRUE;
      } else if (result != EAI_NONAME) {
!         Ns_Log(Error, "dns: getnameinfo failed: %s", gai_strerror(result));        
      }
      return status;
  }
--- 271,279 ----
          status = NS_TRUE;
      } else if (result != EAI_NONAME) {
!         Ns_Log(Error, "dns: getnameinfo failed: %s", gai_strerror(result));
      }
+ #ifdef __APPLE__
+     Ns_CsLeave(&cs);
+ #endif
      return status;
  }
***************
*** 339,343 ****
      int result;
      int status = NS_FALSE;
! 
      memset(&hints, 0, sizeof(hints));
      hints.ai_family = PF_INET;
--- 347,354 ----
      int result;
      int status = NS_FALSE;
! #ifdef __APPLE__
!     static Ns_Cs cs;
!     Ns_CsEnter(&cs);
! #endif
      memset(&hints, 0, sizeof(hints));
      hints.ai_family = PF_INET;
***************
*** 356,359 ****
--- 367,373 ----
                 gai_strerror(result));
      }
+ #ifdef __APPLE__
+     Ns_CsLeave(&cs);
+ #endif
      return status;
  }

[naviserver-commits] website ChangeLog,1.2,1.3

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

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

Modified Files:
	ChangeLog 
Log Message:
        * htdocs/index.php: Add website's main page, which redirects to the
        wiki, to cvs.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/website/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	7 Oct 2005 02:28:28 -0000	1.2
--- ChangeLog	7 Oct 2005 02:37:37 -0000	1.3
***************
*** 1,4 ****
--- 1,7 ----
  2005-10-06  Stephen Deasey  <sd...@us...>
  
+ 	* htdocs/index.php: Add website's main page, which redirects to the
+ 	wiki, to cvs.
+ 
  	* .cvsignore: Ignore the sessions directory which PHP uses to
  	track website users.

[naviserver-commits] website/htdocs index.php,NONE,1.1

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

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

Added Files:
	index.php 
Log Message:
        * htdocs/index.php: Add website's main page, which redirects to the
        wiki, to cvs.


--- NEW FILE: index.php ---
<?php

header( "Location: http://naviserver.sf.net/wiki/index.php/NaviServer" );

?>

[naviserver-commits] website .cvsignore,NONE,1.1 ChangeLog,1.1,1.2

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

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

Modified Files:
	ChangeLog 
Added Files:
	.cvsignore 
Log Message:
        * .cvsignore: Ignore the sessions directory which PHP uses to
        track website users.
        * htdocs/wiki/skins/NaviServer.php: Use correct cvs Header syntax.


--- NEW FILE: .cvsignore ---
sessions

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/website/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	7 Oct 2005 02:19:11 -0000	1.1
--- ChangeLog	7 Oct 2005 02:28:28 -0000	1.2
***************
*** 1,4 ****
--- 1,8 ----
  2005-10-06  Stephen Deasey  <sd...@us...>
  
+ 	* .cvsignore: Ignore the sessions directory which PHP uses to
+ 	track website users.
+ 	* htdocs/wiki/skins/NaviServer.php: Use correct cvs Header syntax.
+ 
  	* README:
  	* ChangeLog: Add README and ChangeLog files for website.

[naviserver-commits] website/htdocs/wiki/skins NaviServer.php,1.2,1.3

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

Update of /cvsroot/naviserver/website/htdocs/wiki/skins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22627/htdocs/wiki/skins

Modified Files:
	NaviServer.php 
Log Message:
        * .cvsignore: Ignore the sessions directory which PHP uses to
        track website users.
        * htdocs/wiki/skins/NaviServer.php: Use correct cvs Header syntax.


Index: NaviServer.php
===================================================================
RCS file: /cvsroot/naviserver/website/htdocs/wiki/skins/NaviServer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NaviServer.php	7 Oct 2005 02:11:01 -0000	1.2
--- NaviServer.php	7 Oct 2005 02:28:28 -0000	1.3
***************
*** 5,9 ****
   * Based on MonoBook (1.4.11).
   *
!  * $cvs-id: $
   */
  
--- 5,9 ----
   * Based on MonoBook (1.4.11).
   *
!  * $Header$
   */
  

[naviserver-commits] website/cgi-bin - New directory

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

Update of /cvsroot/naviserver/website/cgi-bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22095/cgi-bin

Log Message:
Directory /cvsroot/naviserver/website/cgi-bin added to the repository

[naviserver-commits] website ChangeLog,NONE,1.1 README,NONE,1.1

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

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

Added Files:
	ChangeLog README 
Log Message:
        * README:
        * ChangeLog: Add README and ChangeLog files for website.


--- NEW FILE: README ---

Everything below the htdocs directory is publically available
via http://naviserver.sf.net/

--- NEW FILE: ChangeLog ---
2005-10-06  Stephen Deasey  <sd...@us...>

	* README:
	* ChangeLog: Add README and ChangeLog files for website.

	* htdocs/wiki/skins/NaviServer.php: Swap the MediaWiki logo for the
	  SourceForge one.  It's a requirement of SourceForge hosted
	  websites, and enables statistics gathering.

	* htdocs/wiki/skins/: NaviServer.php, naviserver/IE50Fixes.css,
	  naviserver/IE55Fixes.css, naviserver/IE60Fixes.css,
	  naviserver/IEMacFixes.css, naviserver/KHTMLFixes.css,
	  naviserver/Opera6Fixes.css, naviserver/Opera7Fixes.css,
	  naviserver/bullet.gif, naviserver/discussionitem_icon.gif,
	  naviserver/external.png, naviserver/file_icon.gif,
	  naviserver/headbg.jpg, naviserver/link_icon.gif,
	  naviserver/lock_icon.gif, naviserver/magnify-clip.png,
	  naviserver/mail_icon.gif, naviserver/main.css,
	  naviserver/news_icon.png, naviserver/required.gif,
	  naviserver/rtl.css, naviserver/user.gif,
	  naviserver/wiki-indexed.png, naviserver/wiki.png: Create new
	  MediaWiki skin based on the included MonoBook.  Customize this
	  skin in the future to customize the website.

	* htdocs/wiki/: README, index.php, RELEASE-NOTES, config/index.php,
	  includes/Article.php, includes/ChangesList.php,
	  includes/Database.php, includes/DefaultSettings.php,
	  includes/EditPage.php, includes/GlobalFunctions.php,
	  includes/Image.php, includes/ImagePage.php,
	  includes/LoadBalancer.php, includes/OutputPage.php,
	  includes/Parser.php, includes/Profiling.php,
	  includes/RecentChange.php, includes/SkinTemplate.php,
	  includes/SpecialLog.php, includes/SpecialMovepage.php,
	  includes/SpecialUserlogin.php, includes/User.php,
	  languages/LanguageCs.php, languages/LanguageFr.php,
	  languages/LanguageFur.php, languages/LanguageLa.php,
	  languages/LanguageRo.php, languages/LanguageSk.php,
	  languages/Names.php, maintenance/cleanupDupes.php,
	  maintenance/commandLine.inc, maintenance/compressOld.inc,
	  maintenance/dumpRev.php, maintenance/eval.php,
	  maintenance/ourusers.php, maintenance/parserTests.php,
	  maintenance/parserTests.txt, maintenance/rebuildInterwiki.inc,
	  maintenance/redundanttrans.php, maintenance/refreshLinks.inc,
	  maintenance/refreshLinks.php, maintenance/tables.sql,
	  maintenance/updateSpecialPages.php, maintenance/updaters.inc,
	  maintenance/archives/patch-curid-covering.sql,
	  skins/MonoBook.php, skins/disabled/MonoBook.pt: Update to
	  MediaWiki 1.4.11

	* htdocs/wiki/: languages/LanguageFur.php,
	  maintenance/redundanttrans.php,
	  maintenance/archives/patch-curid-covering.sql: Initial revision

2005-06-13 13:14  Stephen Deasey  <sd...@us...>

	* htdocs/wiki/: .cvsignore, COPYING, INSTALL, README,
	  RELEASE-NOTES, Version.php, index.php, install-utils.inc,
	  redirect.phtml, wiki.phtml, AdminSettings.sample, FAQ, HISTORY,
	  UPGRADE, img_auth.php, redirect.php, config/index.php,
	  images/.cvsignore, images/README, maintenance/DiffLanguage.php,
	  maintenance/README, maintenance/apache-ampersand.diff,
	  maintenance/build-intl-wiki.sql, maintenance/changeuser.sql,
	  maintenance/checktrans.php, maintenance/commandLine.inc,
	  maintenance/compressOld.inc, maintenance/compressOld.php,
	  maintenance/convertLinks.inc, maintenance/importLogs.inc,
	  maintenance/importPhase2.php, maintenance/interwiki.sql,
	  maintenance/liveCmdLine.inc, maintenance/parserTests.php,
	  maintenance/rebuildall.php, maintenance/rebuildrecentchanges.inc,
	  maintenance/rebuildtextindex.inc, maintenance/recount.sql,
	  maintenance/refreshLinks.inc, maintenance/remove-brokenlinks.php,
	  maintenance/tables.sql, maintenance/update.php,
	  maintenance/updateSearchIndex.inc,
	  maintenance/updateSearchIndex.php,
	  maintenance/updateSpecialPages.php, maintenance/updaters.inc,
	  maintenance/users.sql, maintenance/wiktionary-interwiki.sql,
	  languages/LanguagePa.php, languages/LanguagePs.php,
	  languages/LanguageSk.php, maintenance/.htaccess,
	  maintenance/InitialiseMessages.inc, maintenance/Makefile,
	  maintenance/attribute.php, maintenance/cleanupDupes.php,
	  maintenance/clear_interwiki_cache.php,
	  maintenance/clear_stats.php, maintenance/convertLinks.php,
	  maintenance/database.sql, maintenance/dumpMessages.php,
	  maintenance/dumpRev.php, maintenance/eval.php,
	  maintenance/fetchInterwiki.pl, maintenance/importLogs.php,
	  maintenance/importUseModWiki.php, maintenance/mcc.php,
	  maintenance/mwdocgen.php, maintenance/ourusers.php,
	  maintenance/parserTests.txt, maintenance/rebuildInterwiki.inc,
	  maintenance/rebuildInterwiki.php,
	  maintenance/rebuildMessages.php,
	  maintenance/rebuildrecentchanges.php,
	  maintenance/rebuildtextindex.php, maintenance/refreshLinks.php,
	  maintenance/stats.php, maintenance/trivialCmdLine.php,
	  maintenance/wikipedia-interwiki.sql,
	  maintenance/archives/.htaccess,
	  maintenance/archives/convertdb.php,
	  maintenance/archives/moveCustomMessages.inc,
	  maintenance/archives/moveCustomMessages.php,
	  maintenance/archives/patch-bot.sql,
	  maintenance/archives/patch-cache.sql,
	  maintenance/archives/patch-categorylinks.sql,
	  maintenance/archives/patch-hitcounter.sql,
	  maintenance/archives/patch-image_name_primary.sql,
	  maintenance/archives/patch-image_name_unique.sql,
	  maintenance/archives/patch-indexes.sql,
	  maintenance/archives/patch-interwiki.sql,
	  maintenance/archives/patch-ipb_expiry.sql,
	  maintenance/archives/patch-ipblocks.sql,
	  maintenance/archives/patch-linkscc-1.3.sql,
	  maintenance/archives/patch-linkscc.sql,
	  maintenance/archives/patch-linktables.sql,
	  maintenance/archives/patch-list.txt,
	  maintenance/archives/patch-log_params.sql,
	  maintenance/archives/patch-logging-title.sql,
	  maintenance/archives/patch-logging.sql,
	  maintenance/archives/patch-math.sql,
	  maintenance/archives/patch-objectcache.sql,
	  maintenance/archives/patch-oldestindex.sql,
	  maintenance/archives/patch-parsercache.sql,
	  maintenance/archives/patch-profiling.sql,
	  maintenance/archives/patch-querycache.sql,
	  maintenance/archives/patch-random-dateindex.sql,
	  maintenance/archives/patch-rc-newindex.sql,
	  maintenance/archives/patch-rc-patrol.sql,
	  maintenance/archives/patch-rc_id.sql,
	  maintenance/archives/patch-rc_ip.sql,
	  maintenance/archives/patch-rc_type.sql,
	  maintenance/archives/patch-rename-user_rights.sql,
	  maintenance/archives/patch-searchindex.sql,
	  maintenance/archives/patch-ss_total_articles.sql,
	  maintenance/archives/patch-user-realname.sql,
	  maintenance/archives/patch-user_rights.sql,
	  maintenance/archives/patch-user_token.sql,
	  maintenance/archives/patch-userindex.sql,
	  maintenance/archives/patch-usernewtalk.sql,
	  maintenance/archives/patch-validate.sql,
	  maintenance/archives/patch-watchlist.sql,
	  maintenance/archives/rebuildRecentchanges.inc,
	  maintenance/archives/upgradeWatchlist.php,
	  maintenance/postgresql/pg_tables.sql,
	  maintenance/postgresql/pg_users.sql, languages/LanguageMl.php,
	  languages/LanguageOr.php, languages/LanguageRu.php,
	  languages/LanguageSv.php, languages/LanguageUtf8.php,
	  languages/LanguageZh_hk.php, languages/LanguageZh_tw.php,
	  languages/LanguageAs.php, languages/LanguageEl.php,
	  languages/LanguageLt.php, languages/LanguageSl.php,
	  languages/LanguageUk.php, languages/LanguageBg.php,
	  languages/LanguageBo.php, languages/LanguageCy.php,
	  languages/LanguageId.php, languages/LanguageKm.php,
	  languages/LanguageAf.php, languages/LanguageHu.php,
	  languages/Language.php, languages/LanguageAr.php,
	  languages/LanguageBe.php, languages/LanguageBm.php,
	  languages/LanguageDz.php, languages/LanguageFo.php,
	  languages/LanguageGem_alsatian.php, languages/LanguageOs.php,
	  languages/LanguageSq.php, languages/LanguageWa.php,
	  languages/LanguageYi.php, languages/LanguageFi.php,
	  languages/LanguageGu.php, languages/LanguageHi.php,
	  languages/LanguageKu.php, languages/LanguageLa.php,
	  languages/LanguageSc.php, languages/LanguageSr.php,
	  languages/LanguageUr.php, languages/LanguageDa.php,
	  languages/LanguageGa.php, languages/LanguageMs.php,
	  languages/.htaccess, languages/LanguageBn.php,
	  languages/LanguageCa.php, languages/LanguageCs.php,
	  languages/LanguageIs.php, languages/LanguageLo.php,
	  languages/LanguageNo.php, languages/LanguageEn.php,
	  languages/LanguageEo.php, languages/LanguageJa.php,
	  languages/LanguageLatin1.php, languages/LanguageNn.php,
	  languages/LanguageFr.php, languages/LanguageOc.php,
	  languages/LanguageZh_cn.php, languages/LanguageKa.php,
	  languages/LanguageNl.php, languages/LanguageRo.php,
	  languages/LanguageTt.php, languages/LanguageEs.php,
	  languages/LanguageHe.php, languages/LanguageIt.php,
	  languages/LanguageKn.php, languages/LanguageNds.php,
	  languages/LanguageZh.php, languages/LanguageZh_sg.php,
	  languages/LanguageFy.php, languages/LanguageIa.php,
	  languages/LanguageKo.php, languages/LanguagePl.php,
	  languages/LanguageTe.php, languages/LanguageCsb.php,
	  languages/LanguageDe.php, languages/LanguageNon.php,
	  languages/LanguageNv.php, languages/LanguageTa.php,
	  languages/LanguageTh.php, languages/LanguageTlh.php,
	  languages/Names.php, languages/LanguageEt.php,
	  languages/LanguageFa.php, languages/LanguageLi.php,
	  extensions/README, includes/LogPage.php,
	  includes/ObjectCache.php, includes/RecentChange.php,
	  includes/SearchTsearch2.php, includes/SiteConfiguration.php,
	  includes/SiteStatsUpdate.php, includes/SkinTemplate.php,
	  includes/SpecialDebug.php, includes/SpecialExport.php,
	  includes/SpecialListusers.php, includes/SpecialPopularpages.php,
	  includes/SpecialPreferences.php,
	  includes/SpecialRecentchangeslinked.php,
	  includes/SpecialStatistics.php, includes/SpecialUnlockdb.php,
	  includes/killthread.php, includes/proxy_check.php, irc/.htaccess,
	  irc/mxircecho.py, irc/rcdumper.php, languages/LanguagePt.php,
	  math/.cvsignore, math/.htaccess, math/Makefile, math/README,
	  math/TODO, math/html.ml, math/lexer.mll, math/mathml.ml,
	  math/parser.mly, math/render.ml, math/texutil.ml, math/texvc.ml,
	  math/texvc_cgi.ml, math/texvc_test.ml, math/texvc_tex.ml,
	  math/util.ml, tests/.cvsignore, tests/.htaccess,
	  tests/ArticleTest.php, tests/DatabaseTest.php,
	  tests/GlobalTest.php, tests/Makefile, tests/README,
	  tests/RunTests.php, tests/SearchEngineTest.php,
	  tests/SearchMySQL3Test.php, tests/SearchMySQL4Test.php,
	  includes/Database.php, includes/DateFormatter.php,
	  includes/FulltextStoplist.php, includes/ImagePage.php,
	  includes/MagicWord.php, includes/OutputPage.php,
	  includes/Profiling.php, includes/QueryPage.php,
	  includes/Setup.php, includes/SpecialAllmessages.php,
	  includes/SpecialAsksql.php, includes/SpecialBlockip.php,
	  includes/SpecialDoubleRedirects.php,
	  includes/SpecialNewimages.php, includes/SpecialValidate.php,
	  includes/SpecialWantedpages.php, includes/Utf8Case.php,
	  includes/Article.php, includes/BlockCache.php,
	  includes/ChangesList.php, includes/DatabasePostgreSQL.php,
	  includes/Defines.php, includes/ExternalStore.php,
	  includes/ExternalStoreHttp.php, includes/HTMLForm.php,
	  includes/LinkCache.php, includes/LoadBalancer.php,
	  includes/MessageCacheHints.php, includes/ParserCache.php,
	  includes/RawPage.php, includes/SearchEngine.php,
	  includes/SkinPHPTal.php, includes/SpecialCategories.php,
	  includes/SpecialContributions.php,
	  includes/SpecialDeadendpages.php, includes/SpecialGeo.php,
	  includes/SpecialImport.php, includes/SpecialLonelypages.php,
	  includes/SpecialMovepage.php, includes/SpecialRandompage.php,
	  includes/SpecialRecentchanges.php, includes/SpecialUndelete.php,
	  includes/SpecialUserlogin.php, includes/SpecialUserlogout.php,
	  includes/AuthPlugin.php, includes/Hooks.php, includes/Skin.php,
	  includes/SpecialIpblocklist.php, includes/SpecialMaintenance.php,
	  includes/SpecialUncategorizedpages.php,
	  includes/SpecialUnusedimages.php, includes/SpecialUserlevels.php,
	  includes/DifferenceEngine.php, includes/GlobalFunctions.php,
	  includes/HistoryBlob.php, includes/SpecialAllpages.php,
	  includes/SpecialNewpages.php, includes/SpecialVersion.php,
	  includes/SpecialWhatlinkshere.php, includes/User.php,
	  includes/ZhConversion.php, includes/.htaccess,
	  includes/DatabaseFunctions.php, includes/DefaultSettings.php,
	  includes/Group.php, includes/Metadata.php, includes/Parser.php,
	  includes/SearchUpdate.php, includes/SpecialAncientpages.php,
	  includes/SpecialDisambiguations.php,
	  includes/SpecialListadmins.php, includes/SpecialLog.php,
	  includes/UpdateClasses.php, includes/ZhClient.php,
	  includes/memcached-client.php, includes/CacheManager.php,
	  includes/CategoryPage.php, includes/EditPage.php,
	  includes/Image.php, includes/ImageGallery.php, includes/Math.php,
	  includes/MemcachedSessions.php, includes/MessageCache.php,
	  includes/Namespace.php, includes/PageHistory.php,
	  includes/ProxyTools.php, includes/SearchMySQL4.php,
	  includes/SpecialImagelist.php, includes/SpecialMakesysop.php,
	  includes/SpecialPage.php,
	  includes/SpecialUncategorizedcategories.php,
	  includes/SpecialWatchlist.php, includes/SquidUpdate.php,
	  includes/Title.php, includes/UserMailer.php,
	  includes/WatchedItem.php, includes/WebRequest.php,
	  includes/Block.php, includes/Credits.php,
	  includes/ExternalStoreDB.php, includes/Feed.php,
	  includes/Interwiki.php, includes/LinksUpdate.php,
	  includes/ParserXML.php, includes/SearchMySQL3.php,
	  includes/SpecialBlockme.php, includes/SpecialBooksources.php,
	  includes/SpecialBrokenRedirects.php,
	  includes/SpecialEmailuser.php, includes/SpecialLockdb.php,
	  includes/SpecialLongpages.php, includes/SpecialSearch.php,
	  includes/SpecialShortpages.php, includes/SpecialSitesettings.php,
	  includes/SpecialSpecialpages.php, includes/SpecialUpload.php,
	  includes/normal/.cvsignore, includes/normal/README,
	  includes/normal/UtfNormal.php,
	  includes/normal/UtfNormalBench.php, includes/zhtable/Makefile,
	  includes/zhtable/README, includes/zhtable/printutf8.c,
	  includes/zhtable/simp2trad.manual, includes/zhtable/toCN.manual,
	  includes/zhtable/toHK.manual, includes/zhtable/toSG.manual,
	  includes/zhtable/toTW.manual, includes/zhtable/trad2simp.manual,
	  includes/zhtable/tradphrases.manual,
	  includes/normal/CleanUpTest.php, includes/normal/Makefile,
	  includes/normal/RandomTest.php, includes/normal/Utf8Test.php,
	  includes/normal/UtfNormalData.inc,
	  includes/normal/UtfNormalDataK.inc,
	  includes/normal/UtfNormalGenerate.php,
	  includes/normal/UtfNormalTest.php,
	  includes/normal/UtfNormalUtil.php,
	  includes/templates/Userlogin.php, skins/CologneBlue.php,
	  skins/MonoBook.php, skins/MySkin.php, skins/Nostalgia.php,
	  skins/Skin.sample, skins/SkinPHPTal.sample, skins/Standard.php,
	  skins/amethyst/IE55Fixes.css, skins/amethyst/IE60Fixes.css,
	  skins/amethyst/KHTMLFixes.css, skins/amethyst/Opera6Fixes.css,
	  skins/amethyst/bullet.gif, skins/amethyst/link_icon.gif,
	  skins/amethyst/news_icon.png, skins/amethyst/required.gif,
	  skins/amethyst/IE50Fixes.css, skins/amethyst/IEFixes.css,
	  skins/amethyst/IEMacFixes.css, skins/amethyst/Opera7Fixes.css,
	  skins/amethyst/discussionitem_icon.gif,
	  skins/amethyst/external.png, skins/amethyst/file_icon.gif,
	  skins/amethyst/headbg.jpg, skins/amethyst/lock_icon.gif,
	  skins/amethyst/magnify-clip.png, skins/amethyst/mail_icon.gif,
	  skins/amethyst/main.css, skins/amethyst/null,
	  skins/amethyst/rtl.css, skins/amethyst/user.gif,
	  skins/amethyst/wiki-indexed.png, skins/amethyst/wiki.png,
	  skins/common/IEFixes.js, skins/common/cologneblue.css,
	  skins/common/common.css, skins/common/commonPrint.css,
	  skins/common/common_rtl.css, skins/common/feed.css,
	  skins/common/nostalgia.css, skins/common/quickbar.css,
	  skins/common/sticky.js, skins/common/wikibits.js,
	  skins/common/wikiprintable.css, skins/common/wikistandard.css,
	  skins/common/images/Arr_l.png, skins/common/images/Arr_r.xcf,
	  skins/common/images/bullet.gif,
	  skins/common/images/button_bold.png,
	  skins/common/images/button_extlink.png,
	  skins/common/images/button_link.png,
	  skins/common/images/button_math.png,
	  skins/common/images/favicon.ico, skins/common/images/gnu-fdl.png,
	  skins/common/images/gnu-fdl.xcf,
	  skins/common/images/link_icon.gif,
	  skins/common/images/redirect.png,
	  skins/common/images/valid-html401.png,
	  skins/common/images/Arr_.png, skins/common/images/Arr_d.png,
	  skins/common/images/button_hr.png,
	  skins/common/images/button_italic.png,
	  skins/common/images/button_sig.png,
	  skins/common/images/fileicon-ogg.png,
	  skins/common/images/fileicon.png,
	  skins/common/images/magnify-clip.png,
	  skins/common/images/mediawiki-small.xcf,
	  skins/common/images/wiki.png, skins/common/images/Arr_r.png,
	  skins/common/images/Zoom_sans.gif,
	  skins/common/images/button_headline.png,
	  skins/common/images/button_image.png,
	  skins/common/images/button_media.png,
	  skins/common/images/button_nowiki.png,
	  skins/common/images/button_template.png,
	  skins/common/images/fileicon-mid.png,
	  skins/common/images/fileicon-ogg.xcf,
	  skins/common/images/fileicon.xcf,
	  skins/common/images/poweredby_mediawiki_88x31.png,
	  skins/monobook/IE55Fixes.css, skins/monobook/IE60Fixes.css,
	  skins/monobook/KHTMLFixes.css, skins/monobook/Opera6Fixes.css,
	  skins/monobook/bullet.gif, skins/monobook/link_icon.gif,
	  skins/monobook/news_icon.png, skins/monobook/required.gif,
	  skins/chick/main.css, skins/disabled/Amethyst.php,
	  skins/disabled/Amethyst.pt, skins/disabled/Chick.php,
	  skins/disabled/Chick.pt, skins/disabled/MonoBook.pt,
	  skins/disabled/MonoBookTal.php, skins/disabled/Wikimania.php,
	  skins/disabled/WikimediaWiki.php,
	  skins/disabled/WikimediaWiki.pt, skins/monobook/IE50Fixes.css,
	  skins/monobook/IEMacFixes.css, skins/monobook/Opera7Fixes.css,
	  skins/monobook/discussionitem_icon.gif,
	  skins/monobook/external.png, skins/monobook/file_icon.gif,
	  skins/monobook/headbg.jpg, skins/monobook/lock_icon.gif,
	  skins/monobook/magnify-clip.png, skins/monobook/mail_icon.gif,
	  skins/monobook/main.css, skins/monobook/rtl.css,
	  skins/monobook/user.gif, skins/monobook/wiki-indexed.png,
	  skins/monobook/wiki.png, skins/myskin/main.css,
	  skins/wikimania/IE55Fixes.css, skins/wikimania/IE60Fixes.css,
	  skins/wikimania/KHTMLFixes.css, skins/wikimania/Opera6Fixes.css,
	  skins/wikimania/bullet.gif, skins/wikimania/link_icon.gif,
	  skins/wikimania/news_icon.png, skins/wikimania/required.gif,
	  docs/deferred.doc, docs/design.doc, docs/globals.doc,
	  docs/hooks.doc, docs/language.doc, docs/linkcache.doc,
	  docs/memcached.doc, docs/schema.doc, docs/skin.doc,
	  docs/title.doc, docs/user.doc, docs/html/.cvsignore,
	  docs/html/README, docs/php-memcached/ChangeLog,
	  docs/php-memcached/Documentation, skins/wikimania/IE50Fixes.css,
	  skins/wikimania/IEMacFixes.css, skins/wikimania/Opera7Fixes.css,
	  skins/wikimania/discussionitem_icon.gif,
	  skins/wikimania/external.png, skins/wikimania/file_icon.gif,
	  skins/wikimania/headbg.jpg, skins/wikimania/lock_icon.gif,
	  skins/wikimania/magnify-clip.png, skins/wikimania/mail_icon.gif,
	  skins/wikimania/main.css, skins/wikimania/rtl.css,
	  skins/wikimania/user.gif, skins/wikimania/wiki-indexed.png,
	  skins/wikimania/wiki.png: Initial import of MediaWiki 1.4.5.

2005-06-13 13:14  Stephen Deasey  <sd...@us...>

	* htdocs/wiki/: .cvsignore, COPYING, INSTALL, README,
	  RELEASE-NOTES, Version.php, index.php, install-utils.inc,
	  redirect.phtml, wiki.phtml, AdminSettings.sample, FAQ, HISTORY,
	  UPGRADE, img_auth.php, redirect.php, config/index.php,
	  images/.cvsignore, images/README, maintenance/DiffLanguage.php,
	  maintenance/README, maintenance/apache-ampersand.diff,
	  maintenance/build-intl-wiki.sql, maintenance/changeuser.sql,
	  maintenance/checktrans.php, maintenance/commandLine.inc,
	  maintenance/compressOld.inc, maintenance/compressOld.php,
	  maintenance/convertLinks.inc, maintenance/importLogs.inc,
	  maintenance/importPhase2.php, maintenance/interwiki.sql,
	  maintenance/liveCmdLine.inc, maintenance/parserTests.php,
	  maintenance/rebuildall.php, maintenance/rebuildrecentchanges.inc,
	  maintenance/rebuildtextindex.inc, maintenance/recount.sql,
	  maintenance/refreshLinks.inc, maintenance/remove-brokenlinks.php,
	  maintenance/tables.sql, maintenance/update.php,
	  maintenance/updateSearchIndex.inc,
	  maintenance/updateSearchIndex.php,
	  maintenance/updateSpecialPages.php, maintenance/updaters.inc,
	  maintenance/users.sql, maintenance/wiktionary-interwiki.sql,
	  languages/LanguagePa.php, languages/LanguagePs.php,
	  languages/LanguageSk.php, maintenance/.htaccess,
	  maintenance/InitialiseMessages.inc, maintenance/Makefile,
	  maintenance/attribute.php, maintenance/cleanupDupes.php,
	  maintenance/clear_interwiki_cache.php,
	  maintenance/clear_stats.php, maintenance/convertLinks.php,
	  maintenance/database.sql, maintenance/dumpMessages.php,
	  maintenance/dumpRev.php, maintenance/eval.php,
	  maintenance/fetchInterwiki.pl, maintenance/importLogs.php,
	  maintenance/importUseModWiki.php, maintenance/mcc.php,
	  maintenance/mwdocgen.php, maintenance/ourusers.php,
	  maintenance/parserTests.txt, maintenance/rebuildInterwiki.inc,
	  maintenance/rebuildInterwiki.php,
	  maintenance/rebuildMessages.php,
	  maintenance/rebuildrecentchanges.php,
	  maintenance/rebuildtextindex.php, maintenance/refreshLinks.php,
	  maintenance/stats.php, maintenance/trivialCmdLine.php,
	  maintenance/wikipedia-interwiki.sql,
	  maintenance/archives/.htaccess,
	  maintenance/archives/convertdb.php,
	  maintenance/archives/moveCustomMessages.inc,
	  maintenance/archives/moveCustomMessages.php,
	  maintenance/archives/patch-bot.sql,
	  maintenance/archives/patch-cache.sql,
	  maintenance/archives/patch-categorylinks.sql,
	  maintenance/archives/patch-hitcounter.sql,
	  maintenance/archives/patch-image_name_primary.sql,
	  maintenance/archives/patch-image_name_unique.sql,
	  maintenance/archives/patch-indexes.sql,
	  maintenance/archives/patch-interwiki.sql,
	  maintenance/archives/patch-ipb_expiry.sql,
	  maintenance/archives/patch-ipblocks.sql,
	  maintenance/archives/patch-linkscc-1.3.sql,
	  maintenance/archives/patch-linkscc.sql,
	  maintenance/archives/patch-linktables.sql,
	  maintenance/archives/patch-list.txt,
	  maintenance/archives/patch-log_params.sql,
	  maintenance/archives/patch-logging-title.sql,
	  maintenance/archives/patch-logging.sql,
	  maintenance/archives/patch-math.sql,
	  maintenance/archives/patch-objectcache.sql,
	  maintenance/archives/patch-oldestindex.sql,
	  maintenance/archives/patch-parsercache.sql,
	  maintenance/archives/patch-profiling.sql,
	  maintenance/archives/patch-querycache.sql,
	  maintenance/archives/patch-random-dateindex.sql,
	  maintenance/archives/patch-rc-newindex.sql,
	  maintenance/archives/patch-rc-patrol.sql,
	  maintenance/archives/patch-rc_id.sql,
	  maintenance/archives/patch-rc_ip.sql,
	  maintenance/archives/patch-rc_type.sql,
	  maintenance/archives/patch-rename-user_rights.sql,
	  maintenance/archives/patch-searchindex.sql,
	  maintenance/archives/patch-ss_total_articles.sql,
	  maintenance/archives/patch-user-realname.sql,
	  maintenance/archives/patch-user_rights.sql,
	  maintenance/archives/patch-user_token.sql,
	  maintenance/archives/patch-userindex.sql,
	  maintenance/archives/patch-usernewtalk.sql,
	  maintenance/archives/patch-validate.sql,
	  maintenance/archives/patch-watchlist.sql,
	  maintenance/archives/rebuildRecentchanges.inc,
	  maintenance/archives/upgradeWatchlist.php,
	  maintenance/postgresql/pg_tables.sql,
	  maintenance/postgresql/pg_users.sql, languages/LanguageMl.php,
	  languages/LanguageOr.php, languages/LanguageRu.php,
	  languages/LanguageSv.php, languages/LanguageUtf8.php,
	  languages/LanguageZh_hk.php, languages/LanguageZh_tw.php,
	  languages/LanguageAs.php, languages/LanguageEl.php,
	  languages/LanguageLt.php, languages/LanguageSl.php,
	  languages/LanguageUk.php, languages/LanguageBg.php,
	  languages/LanguageBo.php, languages/LanguageCy.php,
	  languages/LanguageId.php, languages/LanguageKm.php,
	  languages/LanguageAf.php, languages/LanguageHu.php,
	  languages/Language.php, languages/LanguageAr.php,
	  languages/LanguageBe.php, languages/LanguageBm.php,
	  languages/LanguageDz.php, languages/LanguageFo.php,
	  languages/LanguageGem_alsatian.php, languages/LanguageOs.php,
	  languages/LanguageSq.php, languages/LanguageWa.php,
	  languages/LanguageYi.php, languages/LanguageFi.php,
	  languages/LanguageGu.php, languages/LanguageHi.php,
	  languages/LanguageKu.php, languages/LanguageLa.php,
	  languages/LanguageSc.php, languages/LanguageSr.php,
	  languages/LanguageUr.php, languages/LanguageDa.php,
	  languages/LanguageGa.php, languages/LanguageMs.php,
	  languages/.htaccess, languages/LanguageBn.php,
	  languages/LanguageCa.php, languages/LanguageCs.php,
	  languages/LanguageIs.php, languages/LanguageLo.php,
	  languages/LanguageNo.php, languages/LanguageEn.php,
	  languages/LanguageEo.php, languages/LanguageJa.php,
	  languages/LanguageLatin1.php, languages/LanguageNn.php,
	  languages/LanguageFr.php, languages/LanguageOc.php,
	  languages/LanguageZh_cn.php, languages/LanguageKa.php,
	  languages/LanguageNl.php, languages/LanguageRo.php,
	  languages/LanguageTt.php, languages/LanguageEs.php,
	  languages/LanguageHe.php, languages/LanguageIt.php,
	  languages/LanguageKn.php, languages/LanguageNds.php,
	  languages/LanguageZh.php, languages/LanguageZh_sg.php,
	  languages/LanguageFy.php, languages/LanguageIa.php,
	  languages/LanguageKo.php, languages/LanguagePl.php,
	  languages/LanguageTe.php, languages/LanguageCsb.php,
	  languages/LanguageDe.php, languages/LanguageNon.php,
	  languages/LanguageNv.php, languages/LanguageTa.php,
	  languages/LanguageTh.php, languages/LanguageTlh.php,
	  languages/Names.php, languages/LanguageEt.php,
	  languages/LanguageFa.php, languages/LanguageLi.php,
	  extensions/README, includes/LogPage.php,
	  includes/ObjectCache.php, includes/RecentChange.php,
	  includes/SearchTsearch2.php, includes/SiteConfiguration.php,
	  includes/SiteStatsUpdate.php, includes/SkinTemplate.php,
	  includes/SpecialDebug.php, includes/SpecialExport.php,
	  includes/SpecialListusers.php, includes/SpecialPopularpages.php,
	  includes/SpecialPreferences.php,
	  includes/SpecialRecentchangeslinked.php,
	  includes/SpecialStatistics.php, includes/SpecialUnlockdb.php,
	  includes/killthread.php, includes/proxy_check.php, irc/.htaccess,
	  irc/mxircecho.py, irc/rcdumper.php, languages/LanguagePt.php,
	  math/.cvsignore, math/.htaccess, math/Makefile, math/README,
	  math/TODO, math/html.ml, math/lexer.mll, math/mathml.ml,
	  math/parser.mly, math/render.ml, math/texutil.ml, math/texvc.ml,
	  math/texvc_cgi.ml, math/texvc_test.ml, math/texvc_tex.ml,
	  math/util.ml, tests/.cvsignore, tests/.htaccess,
	  tests/ArticleTest.php, tests/DatabaseTest.php,
	  tests/GlobalTest.php, tests/Makefile, tests/README,
	  tests/RunTests.php, tests/SearchEngineTest.php,
	  tests/SearchMySQL3Test.php, tests/SearchMySQL4Test.php,
	  includes/Database.php, includes/DateFormatter.php,
	  includes/FulltextStoplist.php, includes/ImagePage.php,
	  includes/MagicWord.php, includes/OutputPage.php,
	  includes/Profiling.php, includes/QueryPage.php,
	  includes/Setup.php, includes/SpecialAllmessages.php,
	  includes/SpecialAsksql.php, includes/SpecialBlockip.php,
	  includes/SpecialDoubleRedirects.php,
	  includes/SpecialNewimages.php, includes/SpecialValidate.php,
	  includes/SpecialWantedpages.php, includes/Utf8Case.php,
	  includes/Article.php, includes/BlockCache.php,
	  includes/ChangesList.php, includes/DatabasePostgreSQL.php,
	  includes/Defines.php, includes/ExternalStore.php,
	  includes/ExternalStoreHttp.php, includes/HTMLForm.php,
	  includes/LinkCache.php, includes/LoadBalancer.php,
	  includes/MessageCacheHints.php, includes/ParserCache.php,
	  includes/RawPage.php, includes/SearchEngine.php,
	  includes/SkinPHPTal.php, includes/SpecialCategories.php,
	  includes/SpecialContributions.php,
	  includes/SpecialDeadendpages.php, includes/SpecialGeo.php,
	  includes/SpecialImport.php, includes/SpecialLonelypages.php,
	  includes/SpecialMovepage.php, includes/SpecialRandompage.php,
	  includes/SpecialRecentchanges.php, includes/SpecialUndelete.php,
	  includes/SpecialUserlogin.php, includes/SpecialUserlogout.php,
	  includes/AuthPlugin.php, includes/Hooks.php, includes/Skin.php,
	  includes/SpecialIpblocklist.php, includes/SpecialMaintenance.php,
	  includes/SpecialUncategorizedpages.php,
	  includes/SpecialUnusedimages.php, includes/SpecialUserlevels.php,
	  includes/DifferenceEngine.php, includes/GlobalFunctions.php,
	  includes/HistoryBlob.php, includes/SpecialAllpages.php,
	  includes/SpecialNewpages.php, includes/SpecialVersion.php,
	  includes/SpecialWhatlinkshere.php, includes/User.php,
	  includes/ZhConversion.php, includes/.htaccess,
	  includes/DatabaseFunctions.php, includes/DefaultSettings.php,
	  includes/Group.php, includes/Metadata.php, includes/Parser.php,
	  includes/SearchUpdate.php, includes/SpecialAncientpages.php,
	  includes/SpecialDisambiguations.php,
	  includes/SpecialListadmins.php, includes/SpecialLog.php,
	  includes/UpdateClasses.php, includes/ZhClient.php,
	  includes/memcached-client.php, includes/CacheManager.php,
	  includes/CategoryPage.php, includes/EditPage.php,
	  includes/Image.php, includes/ImageGallery.php, includes/Math.php,
	  includes/MemcachedSessions.php, includes/MessageCache.php,
	  includes/Namespace.php, includes/PageHistory.php,
	  includes/ProxyTools.php, includes/SearchMySQL4.php,
	  includes/SpecialImagelist.php, includes/SpecialMakesysop.php,
	  includes/SpecialPage.php,
	  includes/SpecialUncategorizedcategories.php,
	  includes/SpecialWatchlist.php, includes/SquidUpdate.php,
	  includes/Title.php, includes/UserMailer.php,
	  includes/WatchedItem.php, includes/WebRequest.php,
	  includes/Block.php, includes/Credits.php,
	  includes/ExternalStoreDB.php, includes/Feed.php,
	  includes/Interwiki.php, includes/LinksUpdate.php,
	  includes/ParserXML.php, includes/SearchMySQL3.php,
	  includes/SpecialBlockme.php, includes/SpecialBooksources.php,
	  includes/SpecialBrokenRedirects.php,
	  includes/SpecialEmailuser.php, includes/SpecialLockdb.php,
	  includes/SpecialLongpages.php, includes/SpecialSearch.php,
	  includes/SpecialShortpages.php, includes/SpecialSitesettings.php,
	  includes/SpecialSpecialpages.php, includes/SpecialUpload.php,
	  includes/normal/.cvsignore, includes/normal/README,
	  includes/normal/UtfNormal.php,
	  includes/normal/UtfNormalBench.php, includes/zhtable/Makefile,
	  includes/zhtable/README, includes/zhtable/printutf8.c,
	  includes/zhtable/simp2trad.manual, includes/zhtable/toCN.manual,
	  includes/zhtable/toHK.manual, includes/zhtable/toSG.manual,
	  includes/zhtable/toTW.manual, includes/zhtable/trad2simp.manual,
	  includes/zhtable/tradphrases.manual,
	  includes/normal/CleanUpTest.php, includes/normal/Makefile,
	  includes/normal/RandomTest.php, includes/normal/Utf8Test.php,
	  includes/normal/UtfNormalData.inc,
	  includes/normal/UtfNormalDataK.inc,
	  includes/normal/UtfNormalGenerate.php,
	  includes/normal/UtfNormalTest.php,
	  includes/normal/UtfNormalUtil.php,
	  includes/templates/Userlogin.php, skins/CologneBlue.php,
	  skins/MonoBook.php, skins/MySkin.php, skins/Nostalgia.php,
	  skins/Skin.sample, skins/SkinPHPTal.sample, skins/Standard.php,
	  skins/amethyst/IE55Fixes.css, skins/amethyst/IE60Fixes.css,
	  skins/amethyst/KHTMLFixes.css, skins/amethyst/Opera6Fixes.css,
	  skins/amethyst/bullet.gif, skins/amethyst/link_icon.gif,
	  skins/amethyst/news_icon.png, skins/amethyst/required.gif,
	  skins/amethyst/IE50Fixes.css, skins/amethyst/IEFixes.css,
	  skins/amethyst/IEMacFixes.css, skins/amethyst/Opera7Fixes.css,
	  skins/amethyst/discussionitem_icon.gif,
	  skins/amethyst/external.png, skins/amethyst/file_icon.gif,
	  skins/amethyst/headbg.jpg, skins/amethyst/lock_icon.gif,
	  skins/amethyst/magnify-clip.png, skins/amethyst/mail_icon.gif,
	  skins/amethyst/main.css, skins/amethyst/null,
	  skins/amethyst/rtl.css, skins/amethyst/user.gif,
	  skins/amethyst/wiki-indexed.png, skins/amethyst/wiki.png,
	  skins/common/IEFixes.js, skins/common/cologneblue.css,
	  skins/common/common.css, skins/common/commonPrint.css,
	  skins/common/common_rtl.css, skins/common/feed.css,
	  skins/common/nostalgia.css, skins/common/quickbar.css,
	  skins/common/sticky.js, skins/common/wikibits.js,
	  skins/common/wikiprintable.css, skins/common/wikistandard.css,
	  skins/common/images/Arr_l.png, skins/common/images/Arr_r.xcf,
	  skins/common/images/bullet.gif,
	  skins/common/images/button_bold.png,
	  skins/common/images/button_extlink.png,
	  skins/common/images/button_link.png,
	  skins/common/images/button_math.png,
	  skins/common/images/favicon.ico, skins/common/images/gnu-fdl.png,
	  skins/common/images/gnu-fdl.xcf,
	  skins/common/images/link_icon.gif,
	  skins/common/images/redirect.png,
	  skins/common/images/valid-html401.png,
	  skins/common/images/Arr_.png, skins/common/images/Arr_d.png,
	  skins/common/images/button_hr.png,
	  skins/common/images/button_italic.png,
	  skins/common/images/button_sig.png,
	  skins/common/images/fileicon-ogg.png,
	  skins/common/images/fileicon.png,
	  skins/common/images/magnify-clip.png,
	  skins/common/images/mediawiki-small.xcf,
	  skins/common/images/wiki.png, skins/common/images/Arr_r.png,
	  skins/common/images/Zoom_sans.gif,
	  skins/common/images/button_headline.png,
	  skins/common/images/button_image.png,
	  skins/common/images/button_media.png,
	  skins/common/images/button_nowiki.png,
	  skins/common/images/button_template.png,
	  skins/common/images/fileicon-mid.png,
	  skins/common/images/fileicon-ogg.xcf,
	  skins/common/images/fileicon.xcf,
	  skins/common/images/poweredby_mediawiki_88x31.png,
	  skins/monobook/IE55Fixes.css, skins/monobook/IE60Fixes.css,
	  skins/monobook/KHTMLFixes.css, skins/monobook/Opera6Fixes.css,
	  skins/monobook/bullet.gif, skins/monobook/link_icon.gif,
	  skins/monobook/news_icon.png, skins/monobook/required.gif,
	  skins/chick/main.css, skins/disabled/Amethyst.php,
	  skins/disabled/Amethyst.pt, skins/disabled/Chick.php,
	  skins/disabled/Chick.pt, skins/disabled/MonoBook.pt,
	  skins/disabled/MonoBookTal.php, skins/disabled/Wikimania.php,
	  skins/disabled/WikimediaWiki.php,
	  skins/disabled/WikimediaWiki.pt, skins/monobook/IE50Fixes.css,
	  skins/monobook/IEMacFixes.css, skins/monobook/Opera7Fixes.css,
	  skins/monobook/discussionitem_icon.gif,
	  skins/monobook/external.png, skins/monobook/file_icon.gif,
	  skins/monobook/headbg.jpg, skins/monobook/lock_icon.gif,
	  skins/monobook/magnify-clip.png, skins/monobook/mail_icon.gif,
	  skins/monobook/main.css, skins/monobook/rtl.css,
	  skins/monobook/user.gif, skins/monobook/wiki-indexed.png,
	  skins/monobook/wiki.png, skins/myskin/main.css,
	  skins/wikimania/IE55Fixes.css, skins/wikimania/IE60Fixes.css,
	  skins/wikimania/KHTMLFixes.css, skins/wikimania/Opera6Fixes.css,
	  skins/wikimania/bullet.gif, skins/wikimania/link_icon.gif,
	  skins/wikimania/news_icon.png, skins/wikimania/required.gif,
	  docs/deferred.doc, docs/design.doc, docs/globals.doc,
	  docs/hooks.doc, docs/language.doc, docs/linkcache.doc,
	  docs/memcached.doc, docs/schema.doc, docs/skin.doc,
	  docs/title.doc, docs/user.doc, docs/html/.cvsignore,
	  docs/html/README, docs/php-memcached/ChangeLog,
	  docs/php-memcached/Documentation, skins/wikimania/IE50Fixes.css,
	  skins/wikimania/IEMacFixes.css, skins/wikimania/Opera7Fixes.css,
	  skins/wikimania/discussionitem_icon.gif,
	  skins/wikimania/external.png, skins/wikimania/file_icon.gif,
	  skins/wikimania/headbg.jpg, skins/wikimania/lock_icon.gif,
	  skins/wikimania/magnify-clip.png, skins/wikimania/mail_icon.gif,
	  skins/wikimania/main.css, skins/wikimania/rtl.css,
	  skins/wikimania/user.gif, skins/wikimania/wiki-indexed.png,
	  skins/wikimania/wiki.png: Initial revision

[naviserver-commits] website/htdocs/wiki/skins NaviServer.php,1.1,1.2

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

Update of /cvsroot/naviserver/website/htdocs/wiki/skins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19656

Modified Files:
	NaviServer.php 
Log Message:
Swap the MediaWiki log for the SourceForge one.  It's a requirement of
SourceForge hosted websites, and enables statistics gathering.


Index: NaviServer.php
===================================================================
RCS file: /cvsroot/naviserver/website/htdocs/wiki/skins/NaviServer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NaviServer.php	7 Oct 2005 02:07:55 -0000	1.1
--- NaviServer.php	7 Oct 2005 02:11:01 -0000	1.2
***************
*** 175,179 ****
        <div class="visualClear"></div>
        <div id="footer">
!     <?php if($this->data['poweredbyico']) { ?><div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div><?php } ?>
  	<?php if($this->data['copyrightico']) { ?><div id="f-copyrightico"><?php $this->html('copyrightico') ?></div><?php } ?>
  	<ul id="f-list">
--- 175,179 ----
        <div class="visualClear"></div>
        <div id="footer">
!     <div id="f-poweredbyico"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=130646\&amp;type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" /></a></div>
  	<?php if($this->data['copyrightico']) { ?><div id="f-copyrightico"><?php $this->html('copyrightico') ?></div><?php } ?>
  	<ul id="f-list">

[naviserver-commits] website/htdocs/wiki/skins/naviserver IE50Fixes.css,NONE,1.1 IE55Fixes.css,NONE,1.1 IE60Fixes.css,NONE,1.1 IEMacFixes.css,NONE,1.1 KHTMLFixes.css,NONE,1.1 Opera6Fixes.css,NONE,1.1 Opera7Fixes.css,NONE,1.1 bullet.gif,NONE,1.1 discussionitem_icon.gif,NONE,1.1 external.png,NONE,1.1 file_icon.gif,NONE,1.1 headbg.jpg,NONE,1.1 link_icon.gif,NONE,1.1 lock_icon.gif,NONE,1.1 magnify-clip.png,NONE,1.1 mail_icon.gif,NONE,1.1 main.css,NONE,1.1 news_icon.png,NONE,1.1 required.gif,NONE,1.1 rtl.css,NONE,1.1 user.gif,NONE,1.1 wiki-indexed.png,NONE,1.1 wiki.png,NONE,1.1

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

Update of /cvsroot/naviserver/website/htdocs/wiki/skins/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18512/naviserver

Added Files:
	IE50Fixes.css IE55Fixes.css IE60Fixes.css IEMacFixes.css 
	KHTMLFixes.css Opera6Fixes.css Opera7Fixes.css bullet.gif 
	discussionitem_icon.gif external.png file_icon.gif headbg.jpg 
	link_icon.gif lock_icon.gif magnify-clip.png mail_icon.gif 
	main.css news_icon.png required.gif rtl.css user.gif 
	wiki-indexed.png wiki.png 
Log Message:
Create new MediaWiki skin based on the included MonoBook.  Customize this
skin in the future to customize the website.


--- NEW FILE: user.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bullet.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: required.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: IE55Fixes.css ---
/* IE5.5/win- only fixes */

#column-content { 
    float: none; 
    margin-left: 0;
    height: 1%;
}
#column-content #content {
    position: relative;
    z-index: 5;
    margin-left: 12.2em;
    margin-top: 3em;
    height: 1%;
}
#column-one {
    position: absolute;
    top: 0;
    left: 0;
    z-index: 4;
    width: 100%;
}
#footer {
    margin-left: 13.6em;
    border-left: 1px solid #fabd23;
}

/*#bodyContent div,
#bodyContent pre { overflow: auto; }*/

#p-personal { padding-bottom: 0.1em; }

body { font-size: xx-small; }

#p-cactions {
    width: 76% !important;
    z-index: 3 !important;
    float: none;
}
#p-cactions li {
    padding-bottom: 0 !important;
    border: none;
    background-color: transparent;
    cursor: default;
    float: none !important;
}
#p-cactions li a {
    display: inline-block !important;
    vertical-align: top;
    padding-bottom: 0;
    border: solid #aaa;
    border-width: 1px 1px 0;
}
#p-cactions li.selected a {
    border-color: #fabd23;
    padding-bottom: 0.17em;
}
#p-cactions li a:hover {
    padding-bottom: 0.17em;
}
.portlet {
    overflow:hidden;
}
#bodyContent a.external {
    background: url(external.png) center right no-repeat;
    padding-right: 13px;
}
/* show the hand */
#p-logo a,
#p-logo a:hover {
    cursor: pointer;
}
.visualClear {
    width:90%;
    height: 1px;
    padding:0;
    margin:0;
}

#editform {
    width: 100%;
}

--- NEW FILE: external.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: IE60Fixes.css ---
/* 6.0 - only fixes */
/* content area */ 
/* workaround for various ie float bugs */
#column-content { 
    float: none; 
    margin-left: 0;
    height: 1%;
}
#column-content #content {
    margin-left: 12.2em;
    margin-top: 3em;
    height: 1%;
}
#column-one {
    position: absolute;
    top: 0;
    left: 0;
    z-index: 4;
}
#footer {
    margin-left: 13.6em;
    border-left: 1px solid #fabd23;
}

/* the tabs */

#p-cactions {
    z-index: 3;
}

#p-cactions li {
    padding-bottom: 0 !important;
    border: none;
    background-color: transparent;
    cursor: default;
    float: none !important;
}
#p-cactions li a {
    display: inline-block !important;
    vertical-align: top;
    padding-bottom: 0;
    border: solid #aaa;
    border-width: 1px 1px 0;
}
#p-cactions li.selected a {
    border-color: #fabd23;
    padding-bottom: 0.17em;
}
#p-cactions li a:hover {
    padding-bottom: 0.17em;
}
#portal-personaltools {
    padding-bottom: 0.1em;
}
#bodyContent a.external {
    background: url(external.png) center right no-repeat;
    padding-right: 13px;
}

/* show the hand */
#p-logo a,
#p-logo a:hover {
    cursor: pointer;
}
div.visualClear {
    width:100%;
    line-height: 0;
}
textarea {
    width: 96%;
}

div.editsection,
#catlinks,
div.tright,
div.tleft {
    position: relative;
}
/*{ border:1px solid Red !important;}*/

--- NEW FILE: Opera7Fixes.css ---
/* small tweaks for opera seven */
#p-cactions {
    margin-top: 0.1em;
}
#p-cactions li a {
    top: 2px;
}
#bodyContent a.external {
    background: url(external.png) center right no-repeat;
    padding-right: 13px;
}

--- NEW FILE: KHTMLFixes.css ---
/* KHTML fix stylesheet */
/* work around the horizontal scrollbars */
#column-content { margin-left: 0; }

--- NEW FILE: headbg.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: file_icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: discussionitem_icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mail_icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: IE50Fixes.css ---
/*
** IE5.0 Fix Stylesheet
*/

#column-content {
    margin: 0 !important;
    float: none;
}
#column-content #content { 
    margin-top: 3em; 
    height: 1%;
}
#column-one {
    position: absolute;
    overflow: visible;
    top: 0;
    left: 0;
    z-index: 3;
}
#footer {
    margin: 0 0 0 13.6em;
}

/* IE 5 & 5.5 interpret keyword sizes one off */
body { font-size: xx-small; }
/*
** the edit tabs
*/
#p-cactions li {
    float: left;
    padding-top: 0;
    padding-bottom: 0 !important;
    height: 0.9em;
}
#p-cactions li a {
    display: block;
    padding-bottom: 0.045em;
}
#p-cactions li.selected a {
    padding-bottom: 0.17em;
}
#p-cactions li a:hover {
    padding-bottom: 0.17em;
}
/* 5.0 doesn't like the background icon for external links and user */
.link-external,
.external {
    background: none;
    padding: 0;
}
#p-personal ul { float: right }
#p-personal li { float: left }
li#pt-userpage,
li#pt-anonuserpage,
li#pt-login,
li#pt-logout {
    background: none;
    padding-left: none;
}
.visualClear {
    width:100%;
    height: 0px;
    padding:0;
    margin:0;
}
.firstHeading { margin-bottom: 0.3em; }
/*div{ border:1px solid Red !important;}*/

--- NEW FILE: news_icon.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Opera6Fixes.css ---
/* opera 6 fixes */
#column-one {
    position: relative;
    max-width: 11.7em;
}
#p-personal {
    width: 45em;
    margin-left: 8.6em;
    right: 0;
}
#bodyContent a.external {
    background: url(external.png) center right no-repeat;
    padding-right: 13px;
}

--- NEW FILE: IEMacFixes.css ---
/* IE/Mac only fix stylesheet, imported from main.css */
#portal-column-content {
    margin: 0 0 4.8em 0;
    float: none;
}
#portal-column-content #content {
    z-index: 0;
}
#portal-column-one {
    position: absolute;
    top:0;
    left:0;
    z-index: 3;
}
#portal-footer {
    margin-left: 12em; 
}
/*
#portlet-contentViews {
    top: 0.6em !important;
    left: 14.5em !important;
}
*/
#portlet-contentViews li,
#portlet-contentViews .selected {
    border: none !important;
}
#portlet-contentViews li a   {
    border: 1px solid #aaaaaa;
    border-bottom: none;
}
#portlet-contentViews li.selected a {
    border: 1px solid #fabd23;
    border-bottom: none;
}
/* no background images */
li#personaltools-userpage,
li#personaltools-login/* */ {
    background: none;
    padding-left: none;
}
#mactest {
color: Green;
}

--- NEW FILE: rtl.css ---
/*
Right-to-left fixes for MonoBook.
Places sidebar on right, tweaks various alignment issues.

Works mostly ok nicely on Safari 1.2.1; fine in Mozilla.

Safari bugs (1.2.1):
* Tabs are still appearing in left-to-right order. (Try after localizing)

Opera bugs (7.23 linux):
* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other

IE/mac bugs:
* The thing barfs on Hebrew and Arabic anyway, so no point testing.

Missing features due to lack of support:
* external link icons, icon next to user name

To test:
* Opera6
* IE 5.0
* etc

*/
body {
    direction: rtl;
/*    unicode-bidi: bidi-override;*/
    unicode-bidi: embed;
}
#column-content {
	margin: 0 -12.2em 0 0;
        float: left;
}
#column-content #content{
	margin-left: 0;
	margin-right: 12.2em;
    border-right: 1px solid #aaaaaa;
    border-left: none;
}
html>body .portlet {
    float: right;
    clear: right;
}
/* recover IEMac (might be fine with the float, but usually it's close to IE */
*>body .portlet {
    float: none;
    clear: none;
}
.pBody {
    padding-right: 0.8em;
    padding-left: 0.5em;
}

/* Fix alignment */
.documentByLine,
.portletDetails,
.portletMore,
#p-personal {
	text-align: left;
}

div div.thumbcaption {
	text-align: right;
}

div.magnify,
#div.townBox,
#p-logo {
	left: auto;
	right: 0;
}
#p-personal {
	left: auto;
	right: 0;
}

#p-cactions {
	left: auto;
	right: 11.5em;
        padding-left: 0;
        padding-right: 1em;
}
#p-cactions li {
    margin-left: 0.3em;
    margin-right: 0;
    float: right;
}
* html #p-cactions li a {
    display: block;
    padding-bottom: 0;
}
* html #p-cactions li a:hover {
    padding-bottom: 0.2em;
}
/* offsets to distinguish the tab groups */
li#ca-talk {
    margin-right: auto;
    margin-left: 1.6em;
}
li#ca-watch,li#ca-unwatch {
    margin-right: 1.6em !important;
}

/* Fix margins */
/* top right bottom left */

ul {
	margin-left: 0;
	margin-right: 1.5em;
}
ol {
	margin-left: 0;
	margin-right: 2.4em;
}
dd {
	margin-left: 0;
	margin-right: 1.6em;
}
#contentSub {
	margin-right: 1em;
	margin-left: 0;
}
.tocindent {
	margin-left: 0;
	margin-right: 2em;
}
div.tright {
    clear: none;
}
div.tleft {
    clear: left;
}
div.floatright, table.floatright {
    clear: none;
}
div.floatleft, table.floatleft {
    clear: left;
}
div.townBox {
	margin-left: 0;
	margin-right: 1em;
}
div.townBox dl dd {
	margin-left: 0;
	margin-right: 1.1em;
}
#p-personal li {
	margin-left: 0;
	margin-right: 1em;
}

li#ca-talk,
li#ca-watch {
	margin-right: auto;
	margin-left: 1.6em;
}

#p-personal li {
    float: left;
}
/* Fix link icons */
li#pt-userpage,
li#pt-anonuserpage,
li#pt-login {
	background: none;
	padding-left: 0;
}
.external {
    padding: 0 !important;
    background: none !important;
}
#footer {
    clear: both;
}
* html #footer {
    margin-left: 0;
    margin-right: 13.6em;
    border-left: 0;
    border-right: 1px solid #fabd23;
} 
* html #column-content { 
    float: none;
    margin-left: 0;
    margin-right: 0;
}
* html #column-content #content {
    margin-left: 0;
    margin-top: 3em;
}
* html #column-one { right: 0; }

/* js pref toc */
#preftoc { float: right; }
/* workaround for moz bug, displayed bullets on left side */
#preftoc li { list-style: none; }
#prefcontrol { float: right; }
fieldset.prefsection,
fieldset.operaprefsection { 
    margin-left: 0 !important;
    margin-right: 15em;
}

--- NEW FILE: main.css ---
/*
** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
** Copyright Gabriel Wicke - http://wikidev.net/
** License: GPL (http://www.gnu.org/copyleft/gpl.html)
**
** Loosely based on http://www.positioniseverything.net/ordered-floats.html by Big John
** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi,Joe Geldart & Tom Croucher,
** Michael Zeltner and Geir Bækholt)
** All you guys rock :)
*/

#column-content {
    width: 100%;
    float: right;
    margin: 0 0 0.6em -12.2em;
    padding:0;
}
#content {
    margin: 2.8em 0 0 12.2em;
    padding: 0em 1em 1.5em 1em;
    background: White;
    border: 1px solid #aaaaaa;
    border-right: none;
    line-height: 1.5em;
    position: relative;
    z-index: 2;
}
#column-one { padding-top: 160px; }
/* the left column width is specified in class .portlet */

/* Font size:
** We take advantage of keyword scaling- browsers won't go below 9px
** More at http://www.w3.org/2003/07/30-font-size
** http://style.cleverchimp.com/font_size_intervals/altintervals.html
*/

body {
    font: x-small sans-serif;
    background: #f9f9f9 url("headbg.jpg") 0px 0px no-repeat;
    color: Black;
    margin: 0;
    padding: 0;
}

/* scale back up to a sane default */
#globalWrapper {
    font-size:127%;
    width: 100%;
    margin: 0;
    padding: 0;
}
.visualClear { clear: both; }

/* general styles */

table {
    font-size: 100%;
    background: White;
}
a {
    text-decoration: none;
    color: #002bb8;
    background: none;
}
a:visited { color: #5a3696; }
a:active { color: #ffa500; }
a:hover { text-decoration: underline; }
a.stub { color: #772233; }
a.new,
#p-personal a.new { color:#ba0000; }
a.new:visited,
#p-personal a.new:visited { color:#a55858; }

img {
    border: none;
    vertical-align: middle;
}
p {
    margin: 0.4em 0em 0.5em 0em;
    line-height: 1.5em;
}

p img { margin: 0; }

hr {
    height: 1px;
    color: #aaaaaa;
    background-color: #aaaaaa;
    border: 0;
    margin: 0.2em 0 0.2em 0;
}

h1, h2, h3, h4, h5, h6 {
    color: Black;
    background: none;
    font-weight: normal;
    margin: 0;
    padding-top: 0.5em;
    padding-bottom: 0.17em;
    border-bottom: 1px solid #aaaaaa;
}
h1 { font-size: 188%; }
h2 { font-size: 150%; }
h3, h4, h5, h6 {
    border-bottom: none;
    font-weight: bold;
}
h3 { font-size: 132%; }
h4 { font-size: 116%; }
h5 { font-size: 100%; }
h6 { font-size: 80%;  }

ul {
    line-height: 1.5em;
    list-style-type: square;
    margin: 0.3em 0 0 1.5em;
    padding:0;
    list-style-image: url("bullet.gif");
}
ol {
    line-height: 1.5em;
    margin: 0.3em 0 0 3.2em;
    padding:0;
    list-style-image: none;
}
li { margin-bottom: 0.1em; }
dt {
    font-weight: bold;
    margin-bottom: 0.1em;
}
dl{
    margin-top: 0.2em;
    margin-bottom: 0.5em;
}
dd {
    line-height: 1.5em;
    margin-left: 2em;
    margin-bottom: 0.1em;
}

fieldset {
    border: 1px solid #2f6fab;
    margin: 1em 0em 1em 0em;
    padding: 0em 1em 1em 1em;
    line-height: 1.5em;
}
legend {
    background: White;
    padding: 0.5em;
    font-size: 95%;
}
form {
    border: none;
    margin: 0;
}

textarea {
    width: 100%;
    padding: 0.1em;
}


input.historysubmit {
    padding: 0 0.3em 0.3em 0.3em !important;
    font-size: 94%;
    cursor: pointer;
    height: 1.7em !important;
    margin-left: 1.6em;
}
select {
	vertical-align: top;
}
abbr, acronym, .explain {
    border-bottom: 1px dotted Black;
    color: Black;
    background: none;
    cursor: help;
}
q {
    font-family: Times, "Times New Roman", serif;
    font-style: italic;
}
/* disabled for now
blockquote {
    font-family: Times, "Times New Roman", serif;
    font-style: italic;
}*/
code { background-color: #f9f9f9; }
pre {
    padding: 1em;
    border: 1px dashed #2f6fab;
    color: Black;
    background-color: #f9f9f9;
    line-height: 1.1em;
}


/*
** the main content area
*/

#siteSub { display: none; }
#contentSub {
    font-size: 84%;
    line-height: 1.2em;
    margin: 0 0 1.4em 1em;
    color: #7d7d7d;
    width: auto;
}
span.subpages { display: block; }

/* Some space under the headers in the content area */
#bodyContent h1, #bodyContent h2 { margin-bottom:0.6em; }
#bodyContent h3,
#bodyContent h4,
#bodyContent h5 {
    margin-bottom: 0.3em;
}
.firstHeading { margin-bottom:0.1em; }

/* user notification thing */
.usermessage {
    background-color: #ffce7b;
    border: 1px solid #ffa500;
    color: Black;
    font-weight: bold;
    margin: 2em 0em 1em 0em;
    padding: 0.5em 1em;
    vertical-align: middle;
}
#siteNotice {
    text-align: center;
    font-size: 95%;
    padding: 0 0.9em 0 0.9em;
}
#siteNotice p {
    margin: 0;
    padding: 0;
}
.error {
    color: red;
    font-size: larger;
}
#catlinks {
    border:1px solid #aaaaaa;
    background-color:#f9f9f9;
    padding:5px;
    margin-top: 1em;
    clear: both;
}
/* currently unused, intended to be used by a metadata box
in the bottom-right corner of the content area */
.documentDescription {
    /* The summary text describing the document */
    font-weight: bold;
    display: block;
    margin: 1em 0em;
    line-height: 1.5em;
}
.documentByLine {
    text-align: right;
    font-size: 90%;
    clear: both;
    font-weight: normal;
    color: #76797c;
}

/* emulate center */
.center {
    width: 100%;
    text-align: center;
}
*.center * {
    margin-left: auto;
    margin-right: auto;
}
/* small for tables and similar */
.small, .small * { font-size: 94%; }
table.small { font-size: 100% }

/*
** content styles
*/

#toc {
    /*border:1px solid #2f6fab;*/
    border:1px solid #aaaaaa;
    background-color:#f9f9f9;
    padding:5px;
    font-size: 95%;
}
#toc .tocindent { margin-left: 2em; }
#toc .tocline { margin-bottom: 0px; }
#toc p { margin: 0 }
#toc .toctoggle { font-size: 94%; }
#toc .editsection {
    margin-top: 0.7em;
    font-size: 94%;
}

/* images */
div.floatright, table.floatright {
    clear: right;
    float: right;
    position: relative;
    margin: 0 0 0.5em 0.5em;
    border: 0
/*
    border: 0.5em solid White;
    border-width: 0.5em 0 0.8em 1.4em;
*/
}
div.floatright p { font-style: italic; }
div.floatleft, table.floatleft {
    float: left;
    position: relative;
    margin: 0 0.5em 0.5em 0;
    border: 0
/*
    margin: 0.3em 0.5em 0.5em 0;
    border: 0.5em solid White;
    border-width: 0.5em 1.4em 0.8em 0;
*/
}
div.floatleft p { font-style: italic; }
/* thumbnails */
div.thumb {
    margin-bottom: 0.5em;
    border-style: solid; border-color: White;
    width: auto;
}
div.thumb div {
    border:1px solid #cccccc;
    padding: 3px !important;
    background-color:#f9f9f9;
    font-size: 94%;
    text-align: center;
    overflow: hidden;
}
div.thumb div a img {
    border:1px solid #cccccc;
}
div.thumb div div.thumbcaption {
    border: none;
    text-align: left;
    line-height: 1.4em;
    padding: 0.3em 0 0.1em 0;
}
div.magnify {
    float: right;
    border: none !important;
    background: none !important;
}
div.magnify a, div.magnify img {
    display: block;
    border: none !important;
    background: none !important;
}
div.tright {
    clear: right;
    float: right;
    border-width: 0.5em 0 0.8em 1.4em;
}
div.tleft {
    float: left;
    margin-right:0.5em;
    border-width: 0.5em 1.4em 0.8em 0;
}
.urlexpansion,
.hiddenStructure {
    display: none;
}
img.tex { vertical-align: middle; }
span.texhtml { font-family: serif; }

/*
** classes for special content elements like town boxes
** intended to be referenced directly from the wiki src
*/

/*
** User styles
*/
/* table standards */
table.rimage {
    float:right;
    position:relative;
    margin-left:1em;
    margin-bottom:1em;
    text-align:center;
}
.toccolours {
    border:1px solid #aaaaaa;
    background-color:#f9f9f9;
    padding:5px;
    font-size: 95%;
}
div.townBox {
    position:relative;
    float:right;
    background:White;
    margin-left:1em;
    border: 1px solid gray;
    padding:0.3em;
    width: 200px;
    overflow: hidden;
    clear: right;
}
div.townBox dl {
    padding: 0;
    margin: 0 0 0.3em 0;
    font-size: 96%;
}
div.townBox dl dt {
    background: none;
    margin: 0.4em 0 0 0;
}
div.townBox dl dd {
    margin: 0.1em 0 0 1.1em;
    background-color: #f3f3f3;
}

/*
** edit views etc
*/
.special li {
    line-height: 1.4em;
    margin: 0;
    padding: 0;
}

/* Page history styling */
/* the auto-generated edit comments */
.autocomment { color: gray; }
#pagehistory span.user {
    margin-left: 1.4em;
    margin-right: 0.4em;
}
#pagehistory span.minor { font-weight: bold; }
#pagehistory li { border: 1px solid White; }
#pagehistory li.selected {
    background-color:#f9f9f9;
    border:1px dashed #aaaaaa;
}
/*
** Diff rendering
*/
table.diff { background:white; }
td.diff-otitle { background:#ffffff; }
td.diff-ntitle { background:#ffffff; }
td.diff-addedline {
    background:#ccffcc;
    font-size: smaller;
}
td.diff-deletedline {
    background:#ffffaa;
    font-size: smaller;
}
td.diff-context {
    background:#eeeeee;
    font-size: smaller;
}
span.diffchange { color: red; font-weight: bold; }

/*
** keep the whitespace in front of the ^=, hides rule from konqueror
** this is css3, the validator doesn't like it when validating as css2
*/
#bodyContent a[href ^="http://"],
#bodyContent a[href ^="gopher://"] {
    background: url(external.png) center right no-repeat;
    padding-right: 13px;
}
#bodyContent a[href ^="https://"],
.link-https {
    background: url("lock_icon.gif") center right no-repeat;
    padding-right: 16px;
}
#bodyContent a[href ^="mailto:"],
.link-mailto {
    background: url("mail_icon.gif") center right no-repeat;
    padding-right: 18px;
}
#bodyContent a[href ^="news://"] {
    background: url("news_icon.png") center right no-repeat;
    padding-right: 18px;
}
#bodyContent a[href ^="ftp://"],
.link-ftp {
    background: url("file_icon.gif") center right no-repeat;
    padding-right: 18px;
}
#bodyContent a[href ^="irc://"],
.link-irc {
    background: url("discussionitem_icon.gif")  center right no-repeat;
    padding-right: 18px;
}
/* disable interwiki styling */
#bodyContent a.extiw,
#bodyContent a.extiw:active {
    color: #3366bb;
    background: none;
    padding: 0;
}
#bodyContent a.external { color: #3366bb; }
/* this can be used in the content area to switch off
special external link styling */
#bodyContent .plainlinks a {
    background: none !important;
    padding: 0;
}
/*
** Structural Elements
*/

/*
** general portlet styles (elements in the quickbar)
*/
.portlet {
    border: none;
    margin: 0 0 0.5em 0em;
    float: none;
    padding: 0;
    width: 11.6em;
    overflow: hidden;
}
.portlet h4 {
    font-size: 95%;
    font-weight: normal;
    white-space: nowrap;
}
.portlet h5 {
    background: transparent;
    padding: 0em 1em 0em 0.5em;
    text-transform: lowercase;
    display: inline;
    font-size: 91%;
    height: 1em;
    font-weight: normal;
    white-space: nowrap;
}
.portlet h6 {
    background: #ffae2e;
    border: 1px solid #2f6fab;
    border-style: solid solid none solid;
    padding: 0em 1em 0em 1em;
    text-transform: lowercase;
    display: block;
    font-size: 1em;
    height: 1.2em;
    font-weight: normal;
    white-space: nowrap;
}
.pBody {
    font-size: 95%;
    background: White;
    border-collapse: collapse;
    border: 1px solid #aaaaaa;
    padding: 0 0.8em 0.3em 0.5em;
}
.portlet h1,
.portlet h2,
.portlet h3,
.portlet h4 {
    margin: 0;
    padding: 0;
}
.portlet ul {
    line-height: 1.5em;
    list-style-type: square;
    list-style-image: url("bullet.gif");
    font-size:95%;
}
.portlet li {
    padding: 0;
    margin: 0;
}

/*
** Logo properties
*/

#p-logo {
    z-index: 3;
    position:absolute; /*needed to use z-index */
    top: 0;
    left: 0;
    height: 155px;
    width: 12em;
    overflow: visible;
}
#p-logo h5 { display: none; }
#p-logo a,
#p-logo a:hover {
    display: block;
    height: 155px;
    width: 12.2em;
    background-repeat: no-repeat;
    background-position: 35% 50% !important;
    text-decoration: none;
}

/*
** the navigation portlet
*/

#p-nav {
    position:relative;
    z-index:3;
}

/*
** Search portlet
*/
#p-search {
    position:relative;
    z-index:3;
}
#p-search .pBody {
    text-align: center;
}
input.searchButton {
    margin-top:1px;
    font-size: 95%;
}
#searchGoButton {
    padding-left: .5em;
    padding-right: .5em;
    font-weight: bold;
}
#searchInput {
    width:10.9em;
    margin: 0;
    font-size: 95%;
}
#p-search .pBody {
    padding: 0.5em 0.4em 0.4em 0.4em;
}

/*
** the personal toolbar
*/

#p-personal {
    width:100%;
    white-space:nowrap;
    padding: 0;
    margin: 0;
    position:absolute;
    left:0px;
    top:0px;
    z-index: 0;
    border: none;
    background: none;
    overflow: visible;
    line-height: 1.2em;
}

#p-personal h5 {
    display:none;
}
#p-personal .portlet,
#p-personal .pBody {
    padding:0;
    margin:0;
    border: none;
    z-index:0;
    overflow: visible;
    background: none;
}
/* this is the ul contained in the portlet */
#p-personal ul {
    border: none;
    line-height: 1.4em;
    color: #2f6fab;
    padding: 0em 2em 0 3em;
    margin: 0;
    text-align: right;
    text-transform: lowercase;
    list-style: none;
    z-index:0;
    background: none;
}
#p-personal li {
    z-index:0;
    border:none;
    padding:0;
    display: inline;
    color: #2f6fab;
    margin-left: 1em;
    line-height: 1.2em;
    background: none;
}
#p-personal li a {
    text-decoration: none;
    color: #005896;
    padding-bottom: 0.2em;
    background: none;
}
#p-personal li a:hover {
    background-color: White;
    padding-bottom: 0.2em;
    text-decoration: none;
}

/* the icon in front of the user name, single quotes
in bg url to hide it from iemac */
li#pt-userpage,
li#pt-anonuserpage,
li#pt-login {
    background: url('user.gif') top left no-repeat;
    padding-left: 20px;
    text-transform: none;
}

/*
** the page-related actions- page/talk, edit etc
*/
#p-cactions {
    position:absolute;
    top: 1.3em;
    left: 11.5em;
    margin: 0;
    white-space:nowrap;
    width: 76%;
    line-height: 1.1em;
    overflow: visible;
    background: none;
    border-collapse: collapse;
    padding-left: 1em;
    list-style: none;
    font-size: 95%;
}
#p-cactions .hiddenStructure { display: none; }
#p-cactions ul {
    list-style: none;
}
#p-cactions li {
    display: inline;
    border: 1px solid #aaaaaa;
    border-bottom: none;
    padding: 0 0 0.1em 0;
    margin: 0 0.3em 0 0;
    overflow: visible;
    background: White;
}
#p-cactions li.selected {
    border-color: #fabd23;
    padding: 0 0 0.2em 0;
}
#p-cactions li a {
    background-color: White;
    color: #002bb8;
    border: none;
    padding: 0 0.8em 0.3em 0.8em;
    text-decoration: none;
    text-transform: lowercase;
    position: relative;
    z-index: 0;
    margin: 0;
}
#p-cactions .selected a { z-index: 3; }
#p-cactions .new a { color:#ba0000; }
#p-cactions li a:hover {
    z-index: 3;
    text-decoration: none;
}
#p-cactions h5 { display: none; }
#p-cactions li.istalk { margin-right: 0; }
#p-cactions li.istalk a { padding-right: 0.5em; }
#p-cactions #ca-addsection a {
    padding-left: 0.4em;
    padding-right: 0.4em;
}
/* offsets to distinguish the tab groups */
li#ca-talk { margin-right: 1.6em; }
li#ca-watch, li#ca-unwatch, li#ca-varlang-0 { margin-left: 1.6em; }


/*
** the remaining portlets
*/
#p-tbx,
#p-lang {
    position:relative;
    z-index:3;
}

/*
** footer
*/
#footer {
    background-color: White;
    border-top: 1px solid #fabd23;
    border-bottom: 1px solid #fabd23;
    margin: 0.6em 0em 1em 0em;
    padding: 0.4em 0em 1.2em 0em;
    text-align: center;
    font-size: 90%;
}
#footer li {
    display: inline;
    margin: 0 1.3em;
}
/* hide from incapable browsers */
head:first-child+body #footer li { white-space: nowrap; }
#f-poweredbyico, #f-copyrightico {
    margin: 0 8px;
    position: relative;
    top: -2px; /* Bump it up just a tad */
}
#f-poweredbyico {
    float: right;
    height: 1%;
}
#f-copyrightico {
    float: left;
    height: 1%;
}

/* js pref toc */
#preftoc {
    float: left;
    margin: 1em 1em 1em 1em;
    width: 13em;
}
#preftoc li { border: 1px solid White; }
#preftoc li.selected {
    background-color:#f9f9f9;
    border:1px dashed #aaaaaa;
}
#preftoc a,
#preftoc a:active {
    display: block;
    color: #0014a6;
}
#prefcontrol {
    clear: both;
    float: left;
    margin-top: 1em;
}
div.prefsectiontip {
    font-size: 95%;
    margin-top: 1em;
}
fieldset.operaprefsection { margin-left: 15em }

/*
** IE/Mac fixes, hope to find a validating way to move this
** to a separate stylesheet. This would work but doesn't validate:
** @import("IEMacFixes.css");
*/
/* tabs: border on the a, not the div */
* > html #p-cactions li { border:none; }
* > html #p-cactions li a {
    border: 1px solid #aaaaaa;
    border-bottom: none;
}
* > html #p-cactions li.selected a { border-color: #fabd23; }
/* footer icons need a fixed width */
* > html #f-poweredbyico,
* > html #f-copyrightico { width: 88px; }
* > html #bodyContent,
* > html #bodyContent pre {
    overflow-x: auto;
    width: 100%;
    padding-bottom: 25px;
}

/* more IE fixes */
/* float/negative margin brokenness */
* html #footer {margin-top: 0;}
* html #column-content {
    display: inline;
    margin-bottom: 0;
}
* html div.editsection { font-size: smaller; }
#pagehistory li.selected { position: relative; }

/* Mac IE 5.0 fix; floated content turns invisible */
* > html #column-content {
    float: none;
}
* > html #column-one {
    position: absolute;
    left: 0;
    top: 0;
}
* > html #footer {
    margin-left: 13.2em;
}
.redirectText {
	font-size:150%;
	margin:5px;
}

.printfooter {
        display: none;
}

.not_patrolled {
	background-color: #ffa;
}
div.patrollink {
	font-size: 75%;
	text-align: right;
}
span.newpage, span.minor, span.searchmatch {
	font-weight: bold;
}
span.unpatrolled {
	font-weight:bold;
	color:red;
}

span.searchmatch {
	color: red;
}
.sharedUploadNotice {
        font-style: italic;
}

span.updatedmarker {
	color:black;
	background-color:#00FF00;
}
span.newpageletter {
	font-weight:bold;
	color:black;
	background-color:yellow;
}
span.minoreditletter {
	color:black;
	background-color:#C5FFE6;
}

table.gallery {
	border:  1px solid #cccccc;
	margin:  2px;
	padding: 2px;
	background-color:#ffffff;
}

table.gallery tr {
	vertical-align:top;
}

table.gallery td {
	vertical-align:top;
	background-color:#f9f9f9;
	border: solid 2px white;
}

div.gallerybox {
	margin: 2px;
	width:  150px;
}

div.gallerybox div.thumb {
	text-align: center;
	border: 1px solid #cccccc;
	margin: 2px;
}

div.gallerytext {
	font-size: 94%;
	padding: 2px 4px;
}

#fundraising {
 text-align: center;
 border: 1px solid gray;
 padding: 5px;
 margin-top: 5px;
}
--- NEW FILE: link_icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: magnify-clip.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wiki-indexed.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wiki.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lock_icon.gif ---
(This appears to be a binary file; contents omitted.)

[naviserver-commits] website/htdocs/wiki/skins NaviServer.php,NONE,1.1

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

Update of /cvsroot/naviserver/website/htdocs/wiki/skins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18512

Added Files:
	NaviServer.php 
Log Message:
Create new MediaWiki skin based on the included MonoBook.  Customize this
skin in the future to customize the website.


--- NEW FILE: NaviServer.php ---
<?php
/**
 * NAviServer template.
 *
 * Based on MonoBook (1.4.11).
 *
 * $cvs-id: $
 */

if( !defined( 'MEDIAWIKI' ) )
	die();

/** */
require_once('includes/SkinTemplate.php');

/**
 * Inherit main code from SkinTemplate, set the CSS and template filter.
 */
class SkinNaviServer extends SkinTemplate {
	/** Using naviserver. */
	function initPage( &$out ) {
		SkinTemplate::initPage( $out );
		$this->skinname  = 'naviserver';
		$this->stylename = 'naviserver';
		$this->template  = 'NaviServerTemplate';
	}
}
	
class NaviServerTemplate extends QuickTemplate {
	/**
	 * Template filter callback for NaviServer skin.
	 * Takes an associative array of data set from a SkinTemplate-based
	 * class, and a wrapper for MediaWiki's localization database, and
	 * outputs a formatted page.
	 *
	 * @access private
	 */
	function execute() {
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
  <head>
    <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
    <?php $this->html('headlinks') ?>
    <title><?php $this->text('pagetitle') ?></title>
    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css"; /*]]>*/</style>
    <link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
    <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
    <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
    <!--[if gte IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
    <!--[if IE]><script type="text/javascript" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
    <?php if($this->data['jsvarurl'  ]) { ?><script type="text/javascript" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
    <script type="text/javascript" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>
    <?php if($this->data['usercss'   ]) { ?><style type="text/css"><?php              $this->html('usercss'   ) ?></style><?php    } ?>
    <?php if($this->data['userjs'    ]) { ?><script type="text/javascript" src="<?php $this->text('userjs'    ) ?>"></script><?php } ?>
    <?php if($this->data['userjsprev']) { ?><script type="text/javascript"><?php      $this->html('userjsprev') ?></script><?php   } ?>
  </head>
  <body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
        <?php if($this->data['nsclass'        ]) { ?>class="<?php      $this->text('nsclass')         ?>"<?php } ?>>
    <div id="globalWrapper">
      <div id="column-content">
	<div id="content">
	  <a name="top" id="contentTop"></a>
	  <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
	  <h1 class="firstHeading"><?php $this->text('title') ?></h1>
	  <div id="bodyContent">
	    <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
	    <div id="contentSub"><?php $this->html('subtitle') ?></div>
	    <?php if($this->data['undelete']) { ?><div id="contentSub"><?php     $this->html('undelete') ?></div><?php } ?>
	    <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
	    <!-- start content -->
	    <?php $this->html('bodytext') ?>
	    <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
	    <!-- end content -->
	    <div class="visualClear"></div>
	  </div>
	</div>
      </div>
      <div id="column-one">
	<div id="p-cactions" class="portlet">
	  <h5>Views</h5>
	  <ul>
	    <?php foreach($this->data['content_actions'] as $key => $action) {
	       ?><li id="ca-<?php echo htmlspecialchars($key) ?>"
	       <?php if($action['class']) { ?>class="<?php echo htmlspecialchars($action['class']) ?>"<?php } ?>
	       ><a href="<?php echo htmlspecialchars($action['href']) ?>"><?php
	       echo htmlspecialchars($action['text']) ?></a></li><?php
	     } ?>
	  </ul>
	</div>
	<div class="portlet" id="p-personal">
	  <h5><?php $this->msg('personaltools') ?></h5>
	  <div class="pBody">
	    <ul>
	    <?php foreach($this->data['personal_urls'] as $key => $item) {
	       ?><li id="pt-<?php echo htmlspecialchars($key) ?>"><a href="<?php
	       echo htmlspecialchars($item['href']) ?>"<?php
	       if(!empty($item['class'])) { ?> class="<?php
	       echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
	       echo htmlspecialchars($item['text']) ?></a></li><?php
	    } ?>
	    </ul>
	  </div>
	</div>
	<div class="portlet" id="p-logo">
	  <a style="background-image: url(<?php $this->text('logopath') ?>);"
	    href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"
	    title="<?php $this->msg('mainpage') ?>"></a>
	</div>
	<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
	<div class="portlet" id="p-nav">
	  <h5><?php $this->msg('navigation') ?></h5>
	  <div class="pBody">
	    <ul>
	      <?php foreach($this->data['navigation_urls'] as $navlink) { ?>
	      <li id="<?php echo htmlspecialchars($navlink['id'])
	        ?>"><a href="<?php echo htmlspecialchars($navlink['href']) ?>"><?php 
	        echo htmlspecialchars($navlink['text']) ?></a></li><?php } ?>
	    </ul>
	  </div>
	</div>
	<div id="p-search" class="portlet">
	  <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
	  <div class="pBody">
	    <form name="searchform" action="<?php $this->text('searchaction') ?>" id="searchform">
	      <input id="searchInput" name="search" type="text"
	        <?php if($this->haveMsg('accesskey-search')) {
	          ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php }
	        if( isset( $this->data['search'] ) ) {
	          ?> value="<?php $this->text('search') ?>"<?php } ?> />
	      <input type='submit' name="go" class="searchButton" id="searchGoButton"
	        value="<?php $this->msg('go') ?>"
	        />&nbsp;<input type='submit' name="fulltext"
	        class="searchButton"
	        value="<?php $this->msg('search') ?>" />
	    </form>
	  </div>
	</div>
	<div class="portlet" id="p-tb">
	  <h5><?php $this->msg('toolbox') ?></h5>
	  <div class="pBody">
	    <ul>
		  <?php if($this->data['notspecialpage']) { foreach( array( 'whatlinkshere', 'recentchangeslinked' ) as $special ) { ?>
		  <li id="t-<?php echo $special?>"><a href="<?php
		    echo htmlspecialchars($this->data['nav_urls'][$special]['href']) 
		    ?>"><?php echo $this->msg($special) ?></a></li>
		  <?php } } ?>
	      <?php if($this->data['feeds']) { ?><li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
	        ?><span id="feed-<?php echo htmlspecialchars($key) ?>"><a href="<?php
	        echo htmlspecialchars($feed['href']) ?>"><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
	        <?php } ?></li><?php } ?>
	      <?php foreach( array('contributions', 'emailuser', 'upload', 'specialpages') as $special ) { ?>
	      <?php if($this->data['nav_urls'][$special]) {?><li id="t-<?php echo $special ?>"><a href="<?php
	        echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
	        ?>"><?php $this->msg($special) ?></a></li><?php } ?>
	      <?php } ?>
	    </ul>
	  </div>
	</div>
	<?php if( $this->data['language_urls'] ) { ?><div id="p-lang" class="portlet">
	  <h5><?php $this->msg('otherlanguages') ?></h5>
	  <div class="pBody">
	    <ul>
	      <?php foreach($this->data['language_urls'] as $langlink) { ?>
	      <li>
	      <a href="<?php echo htmlspecialchars($langlink['href'])
	        ?>"><?php echo $langlink['text'] ?></a>
	      </li>
	      <?php } ?>
	    </ul>
	  </div>
	</div>
	<?php } ?>
      </div><!-- end of the left (by default at least) column -->
      <div class="visualClear"></div>
      <div id="footer">
    <?php if($this->data['poweredbyico']) { ?><div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div><?php } ?>
	<?php if($this->data['copyrightico']) { ?><div id="f-copyrightico"><?php $this->html('copyrightico') ?></div><?php } ?>
	<ul id="f-list">
	  <?php if($this->data['lastmod'   ]) { ?><li id="f-lastmod"><?php    $this->html('lastmod')    ?></li><?php } ?>
	  <?php if($this->data['viewcount' ]) { ?><li id="f-viewcount"><?php  $this->html('viewcount')  ?></li><?php } ?>
	  <?php if($this->data['credits'   ]) { ?><li id="f-credits"><?php    $this->html('credits')    ?></li><?php } ?>
	  <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
	  <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
	  <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
	</ul>
      </div>
    </div>
    <?php $this->html('reporttime') ?>
  </body>
</html>
<?php
	}
}

?>

[naviserver-commits] website/htdocs/wiki/skins/naviserver - New directory

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

Update of /cvsroot/naviserver/website/htdocs/wiki/skins/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18446/naviserver

Log Message:
Directory /cvsroot/naviserver/website/htdocs/wiki/skins/naviserver added to the repository

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

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

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

Modified Files:
	dns.c 
Log Message:
Fixed typo in GetAddr using non-mt-safe gethostnbyname


Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dns.c	19 Aug 2005 09:01:13 -0000	1.6
--- dns.c	5 Oct 2005 20:28:28 -0000	1.7
***************
*** 339,343 ****
      int result;
      int status = NS_FALSE;
!     
      memset(&hints, 0, sizeof(hints));
      hints.ai_family = PF_INET;
--- 339,343 ----
      int result;
      int status = NS_FALSE;
! 
      memset(&hints, 0, sizeof(hints));
      hints.ai_family = PF_INET;
***************
*** 428,437 ****
          LogError("gethostbyname", h_errno);
      } else {
!         ptr = (struct in_addr *) he.h_addr_list[i];
          while (ptr != NULL) {
              ia.s_addr = ptr->s_addr;
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(ia));
              status = NS_TRUE;
!             ptr = (struct in_addr *) he.h_addr_list[++i];
          }
      }
--- 428,437 ----
          LogError("gethostbyname", h_errno);
      } else {
!         ptr = (struct in_addr *) he->h_addr_list[i];
          while (ptr != NULL) {
              ia.s_addr = ptr->s_addr;
              Tcl_DStringAppendElement(dsPtr, ns_inet_ntoa(ia));
              status = NS_TRUE;
!             ptr = (struct in_addr *) he->h_addr_list[++i];
          }
      }

[naviserver-commits] naviserver ChangeLog,1.195,1.196

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

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

Modified Files:
	ChangeLog 
Log Message:
See file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -d -r1.195 -r1.196
*** ChangeLog	2 Oct 2005 22:39:06 -0000	1.195
--- ChangeLog	5 Oct 2005 09:41:00 -0000	1.196
***************
*** 1,2 ****
--- 1,9 ----
+ 2005-10-05  Zoran Vasiljevic <vas...@us...>
+ 
+ 	* nslog/nslog.c: untabified, reformatted, improved comments.
+ 	LogObjCmd: rewritten with Tcl_Obj interface and using TclVFS
+ 	wrappers for handling files. Proper locking when accessing the 
+ 	Log structure elements in the LogObjCmd. 
+ 
  2005-10-02  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/nslog nslog.c,1.10,1.11

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

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

Modified Files:
	nslog.c 
Log Message:
Untabified, reformatted, improved comments.
LogObjCmd: rewritten with Tcl_Obj interface and using TclVFS wrappers
for handling files.
Proper locking when accessing the Log structure elements in the LogObjCmd.


Index: nslog.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nslog/nslog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** nslog.c	30 Jul 2005 04:27:41 -0000	1.10
--- nslog.c	5 Oct 2005 09:40:33 -0000	1.11
***************
*** 32,94 ****
   * nslog.c --
   *
!  *	This file implements the access log using NCSA Common Log format.
   *
   *
-  *  The nslog module implements Common Log Format access logging.  This
-  *  format can be used by any web analyzer tool.  It optionally supports
-  *  NCSA Combined Log Format and supports log file rolling.  The log files
-  *  are stored in the server/server1/modules/nslog directory or can be
-  *  specified in the config file.
[...1581 lines suppressed...]
*** 809,812 ****
  LogRollCallback(void *arg)
  {
!     LogCallback(LogRoll,arg,"roll");
  }
--- 951,964 ----
  LogRollCallback(void *arg)
  {
!     LogCallback(LogRoll, arg, "roll");
! }
! 
! static int
! AddCmds(Tcl_Interp *interp, void *arg)
! {
!     Tcl_Command cmd;
! 
!     cmd = Tcl_CreateObjCommand(interp, "ns_accesslog", LogObjCmd, arg, NULL);
! 
!     return (cmd != NULL) ? TCL_OK : TCL_ERROR;
  }

[naviserver-commits] naviserver .cvsignore,NONE,1.1 ChangeLog,1.191,1.192

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

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

Modified Files:
	ChangeLog 
Added Files:
	.cvsignore 
Log Message:
Tell cvs about files which it should ignore.


--- NEW FILE: .cvsignore ---
config.cache
config.log
config.status

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -C2 -d -r1.191 -r1.192
*** ChangeLog	19 Aug 2005 09:01:12 -0000	1.191
--- ChangeLog	1 Oct 2005 19:50:43 -0000	1.192
***************
*** 1,2 ****
--- 1,9 ----
+ 2005-10-01  Stephen Deasey  <sd...@us...>
+ 
+ 	* .cvsignore:
+ 	* include/.cvsignore:
+ 	* nsd/.cvsignore:
+ 	* nsthread/.cvsignore: Tell cvs about files which it should ignore.
+ 
  2005-08-18  Stephen Deasey  <sd...@us...>
  

[naviserver-commits] naviserver/include .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
Tell cvs about files which it should ignore.


--- NEW FILE: .cvsignore ---
Makefile.global
Makefile.module

[naviserver-commits] naviserver/nsthread .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
Tell cvs about files which it should ignore.


--- NEW FILE: .cvsignore ---
nsthreadtest

[naviserver-commits] naviserver/nsd driver.c,1.20,1.21 log.c,1.7,1.8 nsconf.c,1.5,1.6 nsd.h,1.33,1.34 queue.c,1.6,1.7 server.c,1.11,1.12 nsconf.h,1.3,NONE

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

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

Modified Files:
	driver.c log.c nsconf.c nsd.h queue.c server.c 
Removed Files:
	nsconf.h 
Log Message:
        * nsd/log.c:
        * nsd/nsd.h: Remove NsParam* wrapper macros. Directly using
        Ns_Config* is clearer (and grep-able).
        * nsd/server.c:
        * nsd/nsconf.c:
        * nsd/queue.c: Use new Ns_Config* routines which handle defaults
        and range checking.  Note: config file values which are less than
        the lower bound of a range are rounded up and not converted to the
        default value, as before.
        * nsd/driver.c: Some config defaults have changed.
        * nsd/nsconf.h: Removed.  Incroporated default values directly
        into code.


Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** nsd.h	2 Oct 2005 22:23:09 -0000	1.33
--- nsd.h	2 Oct 2005 22:39:06 -0000	1.34
***************
*** 360,364 ****
      int maxline;                /* Maximum request line size. */
      int maxheaders;             /* Maximum number of request headers. */
!     int maxsize;                /* Maximum request size in memory. */
      unsigned int loggingFlags;  /* Logging control flags */
  
--- 360,364 ----
      int maxline;                /* Maximum request line size. */
      int maxheaders;             /* Maximum number of request headers. */
!     int readahead;              /* Maximum request size in memory. */
      unsigned int loggingFlags;  /* Logging control flags */
  
***************
*** 840,851 ****
  extern void NsInitRequests(void);
  
- /*
-  * Configuration routines.
-  */
- 
  extern void NsConfigLog(void);
- #define NsParamString(key, def) Ns_ConfigString(NS_CONFIG_PARAMETERS, (key), (def))
- #define NsParamBool(key, def) Ns_ConfigBool(NS_CONFIG_PARAMETERS, (key), (def))
- #define NsParamInt(key, def) Ns_ConfigInt(NS_CONFIG_PARAMETERS, (key), (def))
  
  extern int  NsQueueConn(Sock *sockPtr, Ns_Time *nowPtr);
--- 840,844 ----

--- nsconf.h DELETED ---

Index: log.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/log.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** log.c	4 Aug 2005 22:17:41 -0000	1.7
--- log.c	2 Oct 2005 22:39:06 -0000	1.8
***************
*** 155,179 ****
  NsConfigLog(void)
  {
!     Ns_DString ds;
  
!     logConfig[Notice].enabled = NsParamBool("lognotice", LOG_NOTICE_BOOL);
!     logConfig[Debug].enabled  = NsParamBool("logdebug", LOG_DEBUG_BOOL);
!     logConfig[Dev].enabled    = NsParamBool("logdev", LOG_DEV_BOOL);
  
!     if (NsParamBool( "logroll", LOG_ROLL_BOOL)) {
          flags |= LOG_ROLL;
      }
!     if (NsParamBool("logusec", LOG_USEC_BOOL)) {
          flags |= LOG_USEC;
      }
!     if (NsParamBool("logexpanded", LOG_EXPANDED_BOOL)) {
          flags |= LOG_EXPAND;
      }
  
!     maxback = NsParamInt("logmaxbackup", LOG_MAXBACK_INT);
!     maxlevel = NsParamInt("logmaxlevel", LOG_MAXLEVEL_INT);
!     maxbuffer = NsParamInt("logmaxbuffer", LOG_MAXBUFFER_INT);
  
!     file = NsParamString("serverlog", LOG_FILE_STRING);
      if (!Ns_PathIsAbsolute(file)) {
          Ns_DStringInit(&ds);
--- 155,180 ----
  NsConfigLog(void)
  {
!     Ns_DString  ds;
!     CONST char *path = NS_CONFIG_PARAMETERS;
  
!     logConfig[Notice].enabled = Ns_ConfigBool(path, "lognotice", NS_TRUE);
!     logConfig[Debug].enabled  = Ns_ConfigBool(path, "logdebug", NS_FALSE);
!     logConfig[Dev].enabled    = Ns_ConfigBool(path, "logdev", NS_FALSE);
  
!     if (Ns_ConfigBool(path, "logroll", NS_TRUE)) {
          flags |= LOG_ROLL;
      }
!     if (Ns_ConfigBool(path, "logusec", NS_FALSE)) {
          flags |= LOG_USEC;
      }
!     if (Ns_ConfigBool(path, "logexpanded", NS_FALSE)) {
          flags |= LOG_EXPAND;
      }
  
!     maxback = Ns_ConfigIntRange(path, "logmaxbackup", 10, 0, 999);
!     maxlevel = Ns_ConfigInt(path, "logmaxlevel", INT_MAX);
!     maxbuffer = Ns_ConfigInt(path, "logmaxbuffer", 10);
  
!     file = Ns_ConfigString(path, "serverlog", "server.log");
      if (!Ns_PathIsAbsolute(file)) {
          Ns_DStringInit(&ds);
***************
*** 203,207 ****
  Ns_InfoErrorLog(void)
  {
!     return (char*)file;
  }
  
--- 204,208 ----
  Ns_InfoErrorLog(void)
  {
!     return (char*) file;
  }
  

Index: server.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** server.c	30 Jul 2005 03:17:50 -0000	1.11
--- server.c	2 Oct 2005 22:39:06 -0000	1.12
***************
*** 198,202 ****
      Ns_DString     ds;
      NsServer      *servPtr;
!     char          *path, *spath, *map, *key, *dirf, *p;
      Ns_Set        *set;
      int            i, n, status;
--- 198,202 ----
      Ns_DString     ds;
      NsServer      *servPtr;
!     CONST char    *path, *spath, *map, *key, *p;
      Ns_Set        *set;
      int            i, n, status;
***************
*** 223,254 ****
       * Set some server options.
       */
!      
!     servPtr->opts.realm = Ns_ConfigGetValue(path, "realm");
!     if (servPtr->opts.realm == NULL) {
!         servPtr->opts.realm = server;
!     }
!     if (!Ns_ConfigGetBool(path, "checkmodifiedsince", 
!                           &servPtr->opts.modsince)) {
!         servPtr->opts.modsince = SERV_MODSINCE_BOOL;
!     }
!     if (!Ns_ConfigGetBool(path, "flushcontent", 
!                           &servPtr->opts.flushcontent)) {
!         servPtr->opts.flushcontent = SERV_FLUSHCONTENT_BOOL;
!     }
!     if (!Ns_ConfigGetBool(path, "noticedetail", 
!                           &servPtr->opts.noticedetail)) {
!         servPtr->opts.noticedetail = SERV_NOTICEDETAIL_BOOL;
!     }
!     if (!Ns_ConfigGetInt(path, "errorminsize", 
!                          &servPtr->opts.errorminsize)) {
!         servPtr->opts.errorminsize = SERV_ERRORMINSIZE_INT;
!     }
!     p = Ns_ConfigGetValue(path, "headercase");
!     if (p != NULL && STRIEQ(p, "tolower")) {
          servPtr->opts.hdrcase = ToLower;
!     } else if (p != NULL && STRIEQ(p, "toupper")) {
          servPtr->opts.hdrcase = ToUpper;
-     } else {
-         servPtr->opts.hdrcase = Preserve;
      }
      
--- 223,238 ----
       * Set some server options.
       */
! 
!     servPtr->opts.realm = Ns_ConfigString(path, "realm", server);
!     servPtr->opts.modsince = Ns_ConfigBool(path, "checkmodifiedsince", NS_TRUE);
!     servPtr->opts.flushcontent = Ns_ConfigBool(path, "flushcontent", NS_FALSE);
!     servPtr->opts.noticedetail = Ns_ConfigBool(path, "noticedetail", NS_TRUE);
!     servPtr->opts.errorminsize = Ns_ConfigInt(path, "errorminsize", 514);
!     servPtr->opts.hdrcase = Preserve;
!     p = Ns_ConfigString(path, "headercase", "preserve");
!     if (STRIEQ(p, "tolower")) {
          servPtr->opts.hdrcase = ToLower;
!     } else if (STRIEQ(p, "toupper")) {
          servPtr->opts.hdrcase = ToUpper;
      }
      
***************
*** 256,259 ****
--- 240,244 ----
       * Encoding defaults for the server
       */
+ 
      servPtr->encoding.outputCharset = Ns_ConfigGetValue(path, "outputCharset");
      if (servPtr->encoding.outputCharset != NULL) {
***************
*** 307,315 ****
      Tcl_IncrRefCount(servPtr->tcl.modules);
      Ns_RWLockInit(&servPtr->tcl.lock);
!     if (!Ns_ConfigGetInt(path, "nsvbuckets", &n) || n < 1) {
!         n = TCL_NSVBUCKETS_INT;
!     }
!     servPtr->nsv.nbuckets = n;
!     servPtr->nsv.buckets = NsTclCreateBuckets(server, n);
      Tcl_InitHashTable(&servPtr->share.inits, TCL_STRING_KEYS);
      Tcl_InitHashTable(&servPtr->share.vars, TCL_STRING_KEYS);
--- 292,297 ----
      Tcl_IncrRefCount(servPtr->tcl.modules);
      Ns_RWLockInit(&servPtr->tcl.lock);
!     servPtr->nsv.nbuckets = Ns_ConfigIntRange(path, "nsvbuckets", 8, 1, INT_MAX);
!     servPtr->nsv.buckets = NsTclCreateBuckets(server, servPtr->nsv.nbuckets);
      Tcl_InitHashTable(&servPtr->share.inits, TCL_STRING_KEYS);
      Tcl_InitHashTable(&servPtr->share.vars, TCL_STRING_KEYS);
***************
*** 326,330 ****
      if (p != NULL && Tcl_SplitList(NULL, p, &n, &servPtr->tcl.errorLogHeaders)
          != TCL_OK) {
!         Ns_Log(Error, "invalid error log headers: %s", p);
      }
  
--- 308,312 ----
      if (p != NULL && Tcl_SplitList(NULL, p, &n, &servPtr->tcl.errorLogHeaders)
          != TCL_OK) {
!         Ns_Log(Error, "config: errorlogheaders is not a list: %s", p);
      }
  
***************
*** 341,380 ****
       
      path = Ns_ConfigGetPath(server, NULL, "fastpath", NULL);
!     if (!Ns_ConfigGetBool(path, "cache", &i) || i) {
!         if (!Ns_ConfigGetInt(path, "cachemaxsize", &n)) {
!             n = FASTPATH_CACHESIZE_INT;
!         }
!         if (!Ns_ConfigGetInt(path, "cachemaxentry", &i) || i < 0) {
!             i = FASTPATH_CACHEMAXENTRY_INT;
!         }
!         servPtr->fastpath.cachemaxentry = i;
!         servPtr->fastpath.cache =  NsFastpathCache(server, n);
!     }
!     if (!Ns_ConfigGetBool(path, "mmap", &servPtr->fastpath.mmap)) {
!         servPtr->fastpath.mmap = FASTPATH_MMAP_BOOL;
!     }
!     dirf = Ns_ConfigGetValue(path, "directoryfile");
!     if (dirf == NULL) {
!         dirf = Ns_ConfigGetValue(spath, "directoryfile");
      }
!     if (dirf != NULL) {
!         dirf = ns_strdup(dirf);
!         p = dirf;
!         n = 1;
!         while ((p = (strchr(p, ','))) != NULL) {
!             ++n;
!             ++p;
!         }
!         servPtr->fastpath.dirc = n;
!         servPtr->fastpath.dirv = ns_malloc(sizeof(char *) * n);
!         for (i = 0; i < n; ++i) {
!             p = strchr(dirf, ',');
!             if (p != NULL) {
!                 *p++ = '\0';
!             }
!             servPtr->fastpath.dirv[i] = dirf;
!             dirf = p;
!         }
      }
      servPtr->fastpath.serverdir = Ns_ConfigGetValue(path, "serverdir");
      if (servPtr->fastpath.serverdir == NULL) {
--- 323,340 ----
       
      path = Ns_ConfigGetPath(server, NULL, "fastpath", NULL);
!     if (Ns_ConfigBool(path, "cache", NS_FALSE)) {
!         servPtr->fastpath.cachemaxentry =
!             Ns_ConfigIntRange(path, "cachemaxentry", 8192, 1, INT_MAX);
!         n = Ns_ConfigIntRange(path, "cachemaxsize", 5000*1024, 1, INT_MAX);
!         servPtr->fastpath.cache = NsFastpathCache(server, n);
      }
!     servPtr->fastpath.mmap = Ns_ConfigBool(path, "mmap", NS_FALSE);
! 
!     p = Ns_ConfigGetValue(path, "directoryfile");
!     if (p != NULL && Tcl_SplitList(NULL, p, &servPtr->fastpath.dirc,
!                                    &servPtr->fastpath.dirv) != TCL_OK) {
!         Ns_Log(Error, "config: directoryfile is not a list: %s", p);
      }
+ 
      servPtr->fastpath.serverdir = Ns_ConfigGetValue(path, "serverdir");
      if (servPtr->fastpath.serverdir == NULL) {
***************
*** 385,392 ****
          servPtr->fastpath.serverdir = Ns_DStringExport(&ds);
      }
!     servPtr->fastpath.pagedir = Ns_ConfigGetValue(path, "pagedir");
!     if (servPtr->fastpath.pagedir == NULL) {
!         servPtr->fastpath.pagedir = "pages";
!     }
      if (Ns_PathIsAbsolute(servPtr->fastpath.pagedir)) {
          servPtr->fastpath.pageroot = servPtr->fastpath.pagedir;
--- 345,350 ----
          servPtr->fastpath.serverdir = Ns_DStringExport(&ds);
      }
! 
!     servPtr->fastpath.pagedir = Ns_ConfigString(path, "pagedir", "pages");
      if (Ns_PathIsAbsolute(servPtr->fastpath.pagedir)) {
          servPtr->fastpath.pageroot = servPtr->fastpath.pagedir;
***************
*** 396,407 ****
          servPtr->fastpath.pageroot = Ns_DStringExport(&ds);
      }
      p = Ns_ConfigGetValue(path, "directorylisting");
      if (p != NULL && (STREQ(p, "simple") || STREQ(p, "fancy"))) {
          p = "_ns_dirlist";
      }
!     servPtr->fastpath.dirproc = Ns_ConfigGetValue(path, "directoryproc");
!     if (servPtr->fastpath.dirproc == NULL) {
!         servPtr->fastpath.dirproc = p;
!     }
      servPtr->fastpath.diradp = Ns_ConfigGetValue(path, "directoryadp");
      
--- 354,363 ----
          servPtr->fastpath.pageroot = Ns_DStringExport(&ds);
      }
+ 
      p = Ns_ConfigGetValue(path, "directorylisting");
      if (p != NULL && (STREQ(p, "simple") || STREQ(p, "fancy"))) {
          p = "_ns_dirlist";
      }
!     servPtr->fastpath.dirproc = Ns_ConfigString(path, "directoryproc", p);
      servPtr->fastpath.diradp = Ns_ConfigGetValue(path, "directoryadp");
      
***************
*** 411,417 ****
  
      path = Ns_ConfigGetPath(server, NULL, "vhost", NULL);
!     if (!Ns_ConfigGetBool(path, "enabled", &servPtr->vhost.enabled)) {
!         servPtr->vhost.enabled = VHOST_ENABLED_BOOL;
!     }
      if (servPtr->vhost.enabled
          && Ns_PathIsAbsolute(servPtr->fastpath.pagedir)) {
--- 367,371 ----
  
      path = Ns_ConfigGetPath(server, NULL, "vhost", NULL);
!     servPtr->vhost.enabled = Ns_ConfigBool(path, "enabled", NS_FALSE);
      if (servPtr->vhost.enabled
          && Ns_PathIsAbsolute(servPtr->fastpath.pagedir)) {
***************
*** 420,437 ****
          servPtr->vhost.enabled = NS_FALSE;
      }
!     if (!Ns_ConfigGetBool(path, "stripwww", &i) || i) {
          servPtr->vhost.opts |= NSD_STRIP_WWW;
      }
!     if (!Ns_ConfigGetBool(path, "stripport", &i) || i) {
          servPtr->vhost.opts |= NSD_STRIP_PORT;
      }
      servPtr->vhost.hostprefix = Ns_ConfigGetValue(path, "hostprefix");
!     Ns_ConfigGetInt(path, "hosthashlevel", &servPtr->vhost.hosthashlevel);
!     if (servPtr->vhost.hosthashlevel < 0) {
!         servPtr->vhost.hosthashlevel = 0;
!     }
!     if (servPtr->vhost.hosthashlevel > 5) {
!         servPtr->vhost.hosthashlevel = 5;
!     }
      if (servPtr->vhost.enabled) {
          NsPageRoot(&ds, servPtr, "www.example.com:80");
--- 374,386 ----
          servPtr->vhost.enabled = NS_FALSE;
      }
!     if (Ns_ConfigBool(path, "stripwww", NS_TRUE)) {
          servPtr->vhost.opts |= NSD_STRIP_WWW;
      }
!     if (Ns_ConfigBool(path, "stripport", NS_TRUE)) {
          servPtr->vhost.opts |= NSD_STRIP_PORT;
      }
      servPtr->vhost.hostprefix = Ns_ConfigGetValue(path, "hostprefix");
!     servPtr->vhost.hosthashlevel =
!         Ns_ConfigIntRange(path, "hosthashlevel", 0, 0, 5);
      if (servPtr->vhost.enabled) {
          NsPageRoot(&ds, servPtr, "www.example.com:80");
***************
*** 474,499 ****
      
      path = Ns_ConfigGetPath(server, NULL, "adp", NULL);
!     servPtr->adp.errorpage = Ns_ConfigGetValue(path, "errorpage");
!     servPtr->adp.startpage = Ns_ConfigGetValue(path, "startpage");
!     if (!Ns_ConfigGetBool(path, "enableexpire", 
!                           &servPtr->adp.enableexpire)) {
!         servPtr->adp.enableexpire = ADP_ENABLEEXPIRE_BOOL;
!     }
!     if (!Ns_ConfigGetBool(path, "enabledebug", 
!                           &servPtr->adp.enabledebug)) {
!         servPtr->adp.enabledebug = ADP_ENABLEDEBUG_BOOL;
!     }
!     servPtr->adp.debuginit = Ns_ConfigGetValue(path, "debuginit");
!     if (servPtr->adp.debuginit == NULL) {
!         servPtr->adp.debuginit = ADP_DEBUGINIT_STRING;
!     }
!     servPtr->adp.defaultparser = Ns_ConfigGetValue(path, "defaultparser");
!     if (servPtr->adp.defaultparser == NULL) {
!         servPtr->adp.defaultparser = ADP_DEFPARSER_STRING;
!     }
!     if (!Ns_ConfigGetInt(path, "cachesize", &n)) {
!         n = ADP_CACHESIZE_INT;
!     }
!     servPtr->adp.cachesize = n;
      
      /*
--- 423,433 ----
      
      path = Ns_ConfigGetPath(server, NULL, "adp", NULL);
!     servPtr->adp.errorpage = Ns_ConfigString(path, "errorpage", NULL);
!     servPtr->adp.startpage = Ns_ConfigString(path, "startpage", NULL);
!     servPtr->adp.enableexpire = Ns_ConfigBool(path, "enableexpire", NS_FALSE);
!     servPtr->adp.enabledebug = Ns_ConfigBool(path, "enabledebug", NS_FALSE);
!     servPtr->adp.debuginit = Ns_ConfigString(path, "debuginit", "ns_adp_debuginit");
!     servPtr->adp.defaultparser = Ns_ConfigString(path, "defaultparser", "adp");
!     servPtr->adp.cachesize = Ns_ConfigInt(path, "cachesize", 5000*1024);
      
      /*
***************
*** 502,516 ****
      
      path = Ns_ConfigGetPath(server, NULL, "adp", "compress", NULL);
!     if (!Ns_ConfigGetBool(path, "enable", &servPtr->adp.compress.enable)) {
!         servPtr->adp.compress.enable = ADP_ENABLECOMPRESS_BOOL;
!     }
!     if (!Ns_ConfigGetInt(path, "level", &n) || n < 1 || n > 9) {
!         n = ADP_COMPRESSLEVEL_INT;
!     }
!     servPtr->adp.compress.level = n;
!     if (!Ns_ConfigGetInt(path, "minsize", &n) || n < 0) {
!         n = 0;
!     }
!     servPtr->adp.compress.minsize = n;
      
      /*
--- 436,442 ----
      
      path = Ns_ConfigGetPath(server, NULL, "adp", "compress", NULL);
!     servPtr->adp.compress.enable = Ns_ConfigBool(path, "enable", NS_FALSE);
!     servPtr->adp.compress.level = Ns_ConfigIntRange(path, "level", 4, 1, 9);
!     servPtr->adp.compress.minsize = Ns_ConfigInt(path, "minsize", 0);
      
      /*
***************
*** 624,631 ****
       * before NsQueueConn begins to return NS_ERROR.
       */
!     
!     if (!Ns_ConfigGetInt(path, "maxconnections", &maxconns)) {
!         maxconns = SERV_MAXCONNS_INT;
!     }
      connBufPtr = ns_calloc((size_t) maxconns, sizeof(Conn));
      for (n = 0; n < maxconns - 1; ++n) {
--- 550,555 ----
       * before NsQueueConn begins to return NS_ERROR.
       */
! 
!     maxconns = Ns_ConfigIntRange(path, "maxconnections", 100, 1, INT_MAX);
      connBufPtr = ns_calloc((size_t) maxconns, sizeof(Conn));
      for (n = 0; n < maxconns - 1; ++n) {
***************
*** 635,670 ****
      connBufPtr[n].nextPtr = NULL;
      poolPtr->queue.freePtr = &connBufPtr[0];
!     
!     if (!Ns_ConfigGetInt(path, "minthreads", 
!                          &poolPtr->threads.min)) {
!         poolPtr->threads.min = SERV_MINTHREADS_INT;
!     }
!     if (!Ns_ConfigGetInt(path, "maxthreads", 
!                          &poolPtr->threads.max)) {
!         poolPtr->threads.max = SERV_MAXTHREADS_INT;
!     }
!     if (!Ns_ConfigGetInt(path, "threadtimeout", 
!                          &poolPtr->threads.timeout)) {
!         poolPtr->threads.timeout = SERV_THREADTIMEOUT_INT;
!     }
!     
!     /*
!      * Determine the minimum and maximum number of threads, adjusting the
!      * values as needed.  The threadtimeout value is the maximum number of
!      * seconds a thread will wait for a connection before exiting if the
!      * current number of threads is above the minimum.
!      */
!     
!     if (poolPtr->threads.max > maxconns) {
!         Ns_Log(Warning, "serv: cannot have more maxthreads than maxconns: "
!                "%d max threads adjusted down to %d max connections",
!                poolPtr->threads.max, maxconns);
!         poolPtr->threads.max = maxconns;
!     }
!     if (poolPtr->threads.min > poolPtr->threads.max) {
!         Ns_Log(Warning, "serv: cannot have more minthreads than maxthreads: "
!                "%d min threads adjusted down to %d max threads",
!                poolPtr->threads.min, poolPtr->threads.max);
!         poolPtr->threads.min = poolPtr->threads.max;
!     }
  }
--- 559,568 ----
      connBufPtr[n].nextPtr = NULL;
      poolPtr->queue.freePtr = &connBufPtr[0];
!  
!     poolPtr->threads.max =
!         Ns_ConfigIntRange(path, "maxthreads", 10, 0, maxconns);
!     poolPtr->threads.min =
!         Ns_ConfigIntRange(path, "minthreads", 0, 0, poolPtr->threads.max);
!     poolPtr->threads.timeout =
!         Ns_ConfigIntRange(path, "threadtimeout", 120, 0, INT_MAX);
  }

Index: queue.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/queue.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** queue.c	1 Aug 2005 16:22:25 -0000	1.6
--- queue.c	2 Oct 2005 22:39:06 -0000	1.7
***************
*** 553,560 ****
  
      path = Ns_ConfigGetPath(servPtr->server, NULL, NULL);
!     if (!Ns_ConfigGetInt(path, "connsperthread", &cpt)) {
!         cpt = SERV_MAXCONNSPERTHREAD_INT;
!     }
! 
      ncons = cpt;
  
--- 553,557 ----
  
      path = Ns_ConfigGetPath(servPtr->server, NULL, NULL);
!     cpt = Ns_ConfigIntRange(path, "connsperthread", 0, 0, INT_MAX);
      ncons = cpt;
  

Index: nsconf.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsconf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nsconf.c	4 Aug 2005 05:29:40 -0000	1.5
--- nsconf.c	2 Oct 2005 22:39:06 -0000	1.6
***************
*** 38,49 ****
  NS_RCSID("@(#) $Header$");
  
- /*
-  * Local functions defined in this file.
-  */
  
- static int GetInt(char *key, int def);
- static int GetBool(char *key, int def);
  struct _nsconf nsconf;
  
  
  /*
--- 38,45 ----
  NS_RCSID("@(#) $Header$");
  
  
  struct _nsconf nsconf;
  
+ 
  
  /*
***************
*** 152,155 ****
--- 148,152 ----
      int i;
      Ns_DString ds;
+     char *path = NS_CONFIG_PARAMETERS;
      
      NsUpdateEncodings();
***************
*** 164,168 ****
  
      if (!Ns_ConfigGetInt(NS_CONFIG_THREADS, "stacksize", &i)) {
!     	i = GetInt("stacksize", THREAD_STACKSIZE_INT);
      }
      Ns_ThreadStackSize(i);
--- 161,165 ----
  
      if (!Ns_ConfigGetInt(NS_CONFIG_THREADS, "stacksize", &i)) {
!     	i = Ns_ConfigIntRange(path, "stacksize", 64*1024, 0, INT_MAX);
      }
      Ns_ThreadStackSize(i);
***************
*** 177,182 ****
       * nsmain.c
       */
!          
!     nsconf.shutdowntimeout = GetInt("shutdowntimeout", SHUTDOWNTIMEOUT_INT);
  
      /*
--- 174,180 ----
       * nsmain.c
       */
! 
!     nsconf.shutdowntimeout =
!         Ns_ConfigIntRange(path, "shutdowntimeout", 20, 0, INT_MAX);
  
      /*
***************
*** 184,188 ****
       */
  
!     nsconf.sched.maxelapsed = GetInt("schedmaxelapsed", SCHED_MAXELAPSED_INT);
  
      /*
--- 182,187 ----
       */
  
!     nsconf.sched.maxelapsed =
!         Ns_ConfigIntRange(path, "schedmaxelapsed", 2, 0, INT_MAX);
  
      /*
***************
*** 190,206 ****
       */
  
!     nsconf.backlog = GetInt("listenbacklog", SOCKLISTENBACKLOG_INT);
      
      /*
       * dns.c
       */
!      
!     if (GetBool("dnscache", DNS_CACHE_BOOL)) {
! 	int max = GetInt("dnscachemaxentries", 100);
! 	i = GetInt("dnscachetimeout", DNS_TIMEOUT_INT);
! 	if (max > 0 && i > 0) {
! 	    i *= 60; /* NB: Config minutes, seconds internally. */
! 	    NsEnableDNSCache(i, max);
! 	}
      }
  
--- 189,205 ----
       */
  
!     nsconf.backlog = Ns_ConfigIntRange(path, "listenbacklog", 32, 0, INT_MAX);
      
      /*
       * dns.c
       */
! 
!     if (Ns_ConfigBool(path, "dnscache", NS_TRUE)) {
!         int max = Ns_ConfigInt(path, "dnscachemaxentries", 100);
!         i = Ns_ConfigInt(path, "dnscachetimeout", 60);
!         if (max > 0 && i > 0) {
!             i *= 60; /* NB: Config minutes, seconds internally. */
!             NsEnableDNSCache(i, max);
!         }
      }
  
***************
*** 209,259 ****
       */
  
!     nsconf.tcl.sharedlibrary = Ns_ConfigGetValue(NS_CONFIG_PARAMETERS, "tcllibrary");
      if (nsconf.tcl.sharedlibrary == NULL) {
          Ns_HomePath(&ds, "modules", "tcl", NULL);
          nsconf.tcl.sharedlibrary = Ns_DStringExport(&ds);
      }
!     nsconf.tcl.lockoninit = GetBool("tclinitlock", TCL_INITLCK_BOOL);
  
      Ns_DStringFree(&ds);
  }
- 
- 
- /*
-  *----------------------------------------------------------------------
-  *
-  * GetInt, GetBool --
-  *
-  *	Helper routines for getting int or bool config values, using
-  *	default values if necessary.
-  *
-  * Results:
-  *	Int value of 1/0 bool.
-  *
-  * Side effects:
-  *	None.
-  *
-  *----------------------------------------------------------------------
-  */
- 
- static int
- GetInt(char *key, int def)
- {
-     int i;
- 
-     if (!Ns_ConfigGetInt(NS_CONFIG_PARAMETERS, key, &i) || i < 0) {
- 	i = def;
-     }
-     return i;
- }
- 
- static bool
- GetBool(char *key, int def)
- {
-     int i;
- 
-     if (!Ns_ConfigGetBool(NS_CONFIG_PARAMETERS, key, &i)) {
- 	i = def;
-     }
-     return i;
- }
--- 208,218 ----
       */
  
!     nsconf.tcl.sharedlibrary = Ns_ConfigGetValue(path, "tcllibrary");
      if (nsconf.tcl.sharedlibrary == NULL) {
          Ns_HomePath(&ds, "modules", "tcl", NULL);
          nsconf.tcl.sharedlibrary = Ns_DStringExport(&ds);
      }
!     nsconf.tcl.lockoninit = Ns_ConfigBool(path, "tclinitlock", NS_FALSE);
  
      Ns_DStringFree(&ds);
  }

Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** driver.c	2 Aug 2005 04:59:54 -0000	1.20
--- driver.c	2 Oct 2005 22:39:06 -0000	1.21
***************
*** 159,163 ****
  {
      char           *path,*address, *host, *bindaddr, *defproto, *defserver;
!     int             i, n, defport, controlFlag;
      ServerMap      *mapPtr;
      Tcl_HashEntry  *hPtr;
--- 159,163 ----
  {
      char           *path,*address, *host, *bindaddr, *defproto, *defserver;
!     int             i, n, defport;
      ServerMap      *mapPtr;
      Tcl_HashEntry  *hPtr;
***************
*** 271,322 ****
      drvPtr->opts = init->opts;
      drvPtr->servPtr = servPtr;
!     if (!Ns_ConfigGetInt(path, "bufsize", &n) || n < 1) { 
!         n = DRV_BUFSIZE_INT;
!     }
!     drvPtr->bufsize = n;
!     if (!Ns_ConfigGetInt(path, "rcvbuf", &n)) {
!         n = DRV_RCVBUF_INT;
!     }
!     drvPtr->rcvbuf = n;
!     if (!Ns_ConfigGetInt(path, "sndbuf", &n)) {
!         n = DRV_SNDBUF_INT;
!     }
!     drvPtr->sndbuf = n;
!     if (!Ns_ConfigGetInt(path, "sendwait", &n) || n < 1) {
!         n = DRV_SNDWAIT_INT;
!     }
!     drvPtr->sendwait = n;
!     if (!Ns_ConfigGetInt(path, "recvwait", &n) || n < 1) {
!         n = DRV_RCVWAIT_INT;
!     }
!     drvPtr->recvwait = n;
!     if (!Ns_ConfigGetInt(path, "closewait", &n) || n < 0) {
!         n = DRV_CLOSEWAIT_INT;
!     }
!     drvPtr->closewait = n;
!     if (!Ns_ConfigGetInt(path, "keepwait", &n) || n < 0) {
!         n = DRV_KEEPWAIT_INT;
!     }
!     drvPtr->keepwait = n;
!     if (!Ns_ConfigGetBool(path, "keepallmethods", &n)) {
!         n = DRV_KEEPALLMETHODS_BOOL;
!     }
!     drvPtr->keepallmethods = n;
!     if (!Ns_ConfigGetInt(path, "backlog", &n) || n < 1) {
!         n = nsconf.backlog;
!     }
!     drvPtr->backlog = n;
!     if (!Ns_ConfigGetInt(path, "maxinput", &n) || n < 1) {
!         n = DRV_MAXINPUT_INT;
!     }
!     drvPtr->maxinput = _MAX(n, DRV_MININPUT_INT);
!     if (!Ns_ConfigGetInt(path, "maxline", &n) || n < 1) {
!         n = DRV_MAXLINE_INT;
!     }
!     drvPtr->maxline = _MAX(n, DRV_MINLINE_INT);
!     if (!Ns_ConfigGetInt(path, "maxsize", &n) || n < 1) {
!         n = drvPtr->maxinput;
!     }
!     drvPtr->maxsize = n;
  
      /*
--- 271,289 ----
      drvPtr->opts = init->opts;
      drvPtr->servPtr = servPtr;
! 
!     drvPtr->maxinput = Ns_ConfigIntRange(path, "maxinput", 1024*1024, 1024, INT_MAX);
!     drvPtr->maxline = Ns_ConfigIntRange(path, "maxline", 4096, 256, INT_MAX);
!     drvPtr->maxheaders = Ns_ConfigIntRange(path, "maxheaders", 128, 8, INT_MAX);
!     drvPtr->bufsize = Ns_ConfigIntRange(path, "bufsize", 16384, 1024, INT_MAX);
!     drvPtr->readahead = Ns_ConfigIntRange(path, "readahead", drvPtr->bufsize,
!                                           drvPtr->bufsize, drvPtr->maxinput);
!     drvPtr->sndbuf = Ns_ConfigIntRange(path, "sndbuf", 0, 0, INT_MAX);
!     drvPtr->rcvbuf = Ns_ConfigIntRange(path, "rcvbuf", 0, 0, INT_MAX);
!     drvPtr->sendwait = Ns_ConfigIntRange(path, "sendwait", 30, 1, INT_MAX);
!     drvPtr->recvwait = Ns_ConfigIntRange(path, "recvwait", 30, 1, INT_MAX);
!     drvPtr->closewait = Ns_ConfigIntRange(path, "closewait", 2, 0, INT_MAX);
!     drvPtr->keepwait = Ns_ConfigIntRange(path, "keepwait", 30, 0, INT_MAX);
!     drvPtr->keepallmethods = Ns_ConfigBool(path, "keepallmethods", NS_FALSE);
!     drvPtr->backlog = Ns_ConfigIntRange(path, "backlog", 64, 1, INT_MAX);
  
      /*
***************
*** 324,342 ****
       * socket handling errors.  These all default to Off.
       */
      drvPtr->loggingFlags = 0;
!     if (Ns_ConfigGetBool(path, "readtimeoutlogging", &controlFlag)
!         && controlFlag) {
          drvPtr->loggingFlags |= LOGGING_READTIMEOUT;
      }
!     if (Ns_ConfigGetBool(path, "serverrejectlogging", &controlFlag)
!         && controlFlag) {
          drvPtr->loggingFlags |= LOGGING_SERVERREJECT;
      }
!     if (Ns_ConfigGetBool(path, "sockerrorlogging", &controlFlag)
!         && controlFlag) {
          drvPtr->loggingFlags |= LOGGING_SOCKERROR;
      }
!     if (Ns_ConfigGetBool(path, "sockshuterrorlogging", &controlFlag)
!         && controlFlag) {
          drvPtr->loggingFlags |= LOGGING_SOCKSHUTERROR;
      }
--- 291,306 ----
       * socket handling errors.  These all default to Off.
       */
+ 
      drvPtr->loggingFlags = 0;
!     if (Ns_ConfigBool(path, "readtimeoutlogging", NS_FALSE)) {
          drvPtr->loggingFlags |= LOGGING_READTIMEOUT;
      }
!     if (Ns_ConfigBool(path, "serverrejectlogging", NS_FALSE)) {
          drvPtr->loggingFlags |= LOGGING_SERVERREJECT;
      }
!     if (Ns_ConfigBool(path, "sockerrorlogging", NS_FALSE)) {
          drvPtr->loggingFlags |= LOGGING_SOCKERROR;
      }
!     if (Ns_ConfigBool(path, "sockshuterrorlogging", NS_FALSE)) {
          drvPtr->loggingFlags |= LOGGING_SOCKSHUTERROR;
      }
***************
*** 359,365 ****
      drvPtr->protocol = ns_strdup(defproto);
      drvPtr->address = ns_strdup(address);
!     if (!Ns_ConfigGetInt(path, "port", &drvPtr->port)) {
!         drvPtr->port = defport;
!     }
      drvPtr->location = Ns_ConfigGetValue(path, "location");
      if (drvPtr->location != NULL && strstr(drvPtr->location, "://")) {
--- 323,327 ----
      drvPtr->protocol = ns_strdup(defproto);
      drvPtr->address = ns_strdup(address);
!     drvPtr->port = Ns_ConfigInt(path, "port", defport);
      drvPtr->location = Ns_ConfigGetValue(path, "location");
      if (drvPtr->location != NULL && strstr(drvPtr->location, "://")) {
***************
*** 1455,1464 ****
  
      /*
!      * Use temp file for large content if exceeds configured maxsize
       */
  
  #ifndef _WIN32
      if (reqPtr->coff > 0 && 
!         reqPtr->length > sockPtr->drvPtr->maxsize &&
          sockPtr->tfd <= 0) {
          sockPtr->tfd = Ns_GetTemp();
--- 1417,1426 ----
  
      /*
!      * Use temp file for content larger than readahead bytes.
       */
  
  #ifndef _WIN32
      if (reqPtr->coff > 0 && 
!         reqPtr->length > sockPtr->drvPtr->readahead &&
          sockPtr->tfd <= 0) {
          sockPtr->tfd = Ns_GetTemp();
***************
*** 1619,1623 ****
              }
              reqPtr->content = sockPtr->taddr;
!             Ns_Log(Debug, "spooling content into temp file, maxsize=%d, filesize=%i", sockPtr->drvPtr->maxsize, sockPtr->tsize);
  #endif
          } else {
--- 1581,1586 ----
              }
              reqPtr->content = sockPtr->taddr;
!             Ns_Log(Debug, "spooling content to file: readahead=%d, filesize=%i",
!                    sockPtr->drvPtr->readahead, sockPtr->tsize);
  #endif
          } else {

[naviserver-commits] naviserver ChangeLog,1.194,1.195

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

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

Modified Files:
	ChangeLog 
Log Message:
        * nsd/log.c:
        * nsd/nsd.h: Remove NsParam* wrapper macros. Directly using
        Ns_Config* is clearer (and grep-able).
        * nsd/server.c:
        * nsd/nsconf.c:
        * nsd/queue.c: Use new Ns_Config* routines which handle defaults
        and range checking.  Note: config file values which are less than
        the lower bound of a range are rounded up and not converted to the
        default value, as before.
        * nsd/driver.c: Some config defaults have changed.
        * nsd/nsconf.h: Removed.  Incroporated default values directly
        into code.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -C2 -d -r1.194 -r1.195
*** ChangeLog	2 Oct 2005 22:23:10 -0000	1.194
--- ChangeLog	2 Oct 2005 22:39:06 -0000	1.195
***************
*** 1,4 ****
--- 1,17 ----
  2005-10-02  Stephen Deasey  <sd...@us...>
  
+ 	* nsd/log.c:
+ 	* nsd/nsd.h: Remove NsParam* wrapper macros. Directly using
+ 	Ns_Config* is clearer (and grep-able).
+ 	* nsd/server.c:
+ 	* nsd/nsconf.c:
+ 	* nsd/queue.c: Use new Ns_Config* routines which handle defaults
+ 	and range checking.  Note: config file values which are less than
+ 	the lower bound of a range are rounded up and not converted to the
+ 	default value, as before.
+ 	* nsd/driver.c: Some config defaults have changed.
+ 	* nsd/nsconf.h: Removed.  Incroporated default values directly
+ 	into code.
+ 
  	* nsd/adpeval.c:
  	* nsd/adprequest.c: