Index: aclocal.m4
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/aclocal.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -w -c -r1.20 -r1.21
*** aclocal.m4	1998/03/20 17:52:40	1.20
--- aclocal.m4	1998/03/25 15:09:46	1.21
***************
*** 1,4 ****
! dnl aclocal.m4 generated automatically by aclocal 1.2f
  
  dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  dnl This Makefile.in is free software; the Free Software Foundation
--- 1,4 ----
! dnl aclocal.m4 generated automatically by aclocal 1.2h
  
  dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  dnl This Makefile.in is free software; the Free Software Foundation
Index: config.h.in
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/config.h.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -w -c -r1.28 -r1.29
*** config.h.in	1998/03/20 17:52:42	1.28
--- config.h.in	1998/03/25 15:09:48	1.29
***************
*** 71,76 ****
--- 71,79 ----
     byte first (like Motorola and SPARC, unlike Intel and VAX).  */
  #undef WORDS_BIGENDIAN
  
+ /* Define to enable direct WAIS access. */
+ #undef HT_DIRECT_WAIS
+ 
  /* Define to enable Zlib compression / decompression support. */
  #undef HT_ZLIB
  
Index: configure.in
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -w -c -r1.51 -r1.52
*** configure.in	1998/03/22 21:39:29	1.51
--- configure.in	1998/03/25 15:09:50	1.52
***************
*** 1,9 ****
  dnl Process this file with Autoconf to create configure
  dnl (c) COPYRIGHT MIT 1995.
  dnl Please first read the full copyright statement in the file COPYRIGH.
! dnl @(#) $Id: configure.in,v 1.51 1998/03/22 21:39:29 frystyk Exp $
  
! AC_REVISION([$Id: configure.in,v 1.51 1998/03/22 21:39:29 frystyk Exp $])
  AC_PREREQ(2.2)
  AC_INIT(Library)
  
--- 1,9 ----
  dnl Process this file with Autoconf to create configure
  dnl (c) COPYRIGHT MIT 1995.
  dnl Please first read the full copyright statement in the file COPYRIGH.
! dnl @(#) $Id: configure.in,v 1.52 1998/03/25 15:09:50 frystyk Exp $
  
! AC_REVISION([$Id: configure.in,v 1.52 1998/03/25 15:09:50 frystyk Exp $])
  AC_PREREQ(2.2)
  AC_INIT(Library)
  
***************
*** 17,28 ****
  AC_SUBST(PACKAGE)
  AC_DEFINE_UNQUOTED(W3C_PACKAGE, "$PACKAGE")
   
! VERSION=5.1k
  AC_SUBST(VERSION)
  AC_DEFINE_UNQUOTED(W3C_VERSION, "$VERSION")
  
  #dnl for CVS to be able to make a release diff
! PREVIOUS_VERSION=5.1j
  AC_SUBST(PREVIOUS_VERSION)
  
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION) 
--- 17,28 ----
  AC_SUBST(PACKAGE)
  AC_DEFINE_UNQUOTED(W3C_PACKAGE, "$PACKAGE")
   
! VERSION=5.1l
  AC_SUBST(VERSION)
  AC_DEFINE_UNQUOTED(W3C_VERSION, "$VERSION")
  
  #dnl for CVS to be able to make a release diff
! PREVIOUS_VERSION=5.1k
  AC_SUBST(PREVIOUS_VERSION)
  
  AM_INIT_AUTOMAKE($PACKAGE, $VERSION) 
***************
*** 84,89 ****
--- 84,90 ----
        withval="/usr/local/lib/wais/wais.a /usr/local/lib/wais/client.a"
      fi
      LIBS="$withval -lm $LIBS"
+     AC_DEFINE(HT_DIRECT_WAIS)
      AC_TRY_LINK([],
                  [ makeDocID(); ],
  		[],
***************
*** 434,440 ****
  AC_CHECK_HEADERS(ctype.h)
  AC_CHECK_HEADERS(cursesX.h curses.h)
  AC_CHECK_HEADERS(rxposix.h regex.h)
! AC_CHECK_HEADERS(wais.h wais/wais.h)
  AC_HEADER_DIRENT
  AC_CHECK_HEADERS(dir.h direct.h) dnl AC_HEADER_DIRENT only checks for some..
  AC_HEADER_STDC
--- 435,441 ----
  AC_CHECK_HEADERS(ctype.h)
  AC_CHECK_HEADERS(cursesX.h curses.h)
  AC_CHECK_HEADERS(rxposix.h regex.h)
! AC_CHECK_HEADERS(wais/wais.h wais.h)
  AC_HEADER_DIRENT
  AC_CHECK_HEADERS(dir.h direct.h) dnl AC_HEADER_DIRENT only checks for some..
  AC_HEADER_STDC
Index: Library/Overview.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/Overview.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -w -c -r1.90 -r1.91
*** Overview.html	1998/03/10 17:35:18	1.90
--- Overview.html	1998/03/23 16:39:01	1.91
***************
*** 24,33 ****
        <A HREF="#News">looking for a new home</A>!</STRONG></EM>
      <LI>
        <A HREF="#Getting">Getting the Source Code</A> - <EM><STRONG>latest version
!       is 5.1j - <A HREF="#News">updated March 9, 1998</A>!</STRONG></EM>
      <LI>
        <A HREF="#Installation">Installation Guide and new Features</A>
      <LI>
        <A HREF="#User">User Documentation and Design Overview</A>
      <LI>
        <A HREF="#Forums">Libwww Forums</A>
--- 24,36 ----
        <A HREF="#News">looking for a new home</A>!</STRONG></EM>
      <LI>
        <A HREF="#Getting">Getting the Source Code</A> - <EM><STRONG>latest version
!       is 5.1k - <A HREF="#News">updated March 23, 1998</A>!</STRONG></EM>
      <LI>
        <A HREF="#Installation">Installation Guide and new Features</A>
      <LI>
+       <A HREF="User/Guide/">Tons of WWW interfaces</A> with a
+       <A HREF="User/Extrnals.html">large index of public functions</A>
+     <LI>
        <A HREF="#User">User Documentation and Design Overview</A>
      <LI>
        <A HREF="#Forums">Libwww Forums</A>
***************
*** 49,58 ****
        Web work
    </UL>
    <P>
    Also have a look at the <A HREF="Activity.html">W3C Libwww activity</A> statement
    on support, usability etc.
    <P>
!   @(#) $Id: Overview.html,v 1.90 1998/03/10 17:35:18 frystyk Exp $
  </DIV>
  <P>
    <HR>
--- 52,65 ----
        Web work
    </UL>
    <P>
+   Some other applications that use libwww are
+   <A HREF="http://www.yggdrasil.com/Products/Arena/">Arena</A> and
+   <A HREF="../Amaya/">Amaya</A> - two GUI clients and Amaya is also an editor.
+   <P>
    Also have a look at the <A HREF="Activity.html">W3C Libwww activity</A> statement
    on support, usability etc.
    <P>
!   @(#) $Id: Overview.html,v 1.91 1998/03/23 16:39:01 frystyk Exp $
  </DIV>
  <P>
    <HR>
***************
*** 63,70 ****
  </H2>
  <DL>
    <DT>
!     <STRONG>March 9, 1998</STRONG>: <A HREF="Distribution.html" NAME="5.1d">Libwww
!     Version 5.1j</A> available for <A HREF="../Protocols/HTTP/Forum/">HTTP/1.1
      testing</A>! <A HREF="../Protocols/HTTP/Performance/LAN/">Check out the
      performance!</A>
    <DD>
--- 70,77 ----
  </H2>
  <DL>
    <DT>
!     <STRONG>March 23, 1998</STRONG>: <A HREF="Distribution.html" NAME="5.1d">Libwww
!     Version 5.1k</A> available for <A HREF="../Protocols/HTTP/Forum/">HTTP/1.1
      testing</A>! <A HREF="../Protocols/HTTP/Performance/LAN/">Check out the
      performance!</A>
    <DD>
***************
*** 85,93 ****
        <LI>
  	Support for zlib based decompression and regular expressions - can do really
  	cool things in the <A HREF="../Robot/">Robot</A>
-       <LI>
- 	Check out the new <A HREF="User/Extrnals.html">complete index of public
- 	function</A>
      </UL>
    <DT>
      <STRONG>Dec 24, 1997</STRONG>: <A NAME="Home">Libwww is looking for a new
--- 92,97 ----
***************
*** 272,278 ****
    <BR>
    Henrik Frystyk Nielsen,
    <A HREF="mailto:libwww@w3.org">libwww@w3.org</A>,<BR>
!   @(#) $Id: Overview.html,v 1.90 1998/03/10 17:35:18 frystyk Exp $
  </ADDRESS>
  <P class=policyfooter>
  <SMALL><A href="../Consortium/Legal/ipr-notice.html#Copyright">Copyright</A>
--- 276,282 ----
    <BR>
    Henrik Frystyk Nielsen,
    <A HREF="mailto:libwww@w3.org">libwww@w3.org</A>,<BR>
!   @(#) $Id: Overview.html,v 1.91 1998/03/23 16:39:01 frystyk Exp $
  </ADDRESS>
  <P class=policyfooter>
  <SMALL><A href="../Consortium/Legal/ipr-notice.html#Copyright">Copyright</A>
Index: Library/User/ReleaseNotes.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/User/ReleaseNotes.html,v
retrieving revision 1.55
retrieving revision 1.58
diff -w -c -r1.55 -r1.58
*** ReleaseNotes.html	1998/03/20 17:52:45	1.55
--- ReleaseNotes.html	1998/03/23 17:52:57	1.58
***************
*** 34,44 ****
  code so please take it as that and nothing more!
  <P>
  <IMG BORDER="0" SRC="../../Icons/32x32/caution" ALT="NOTE"> <B>Check out
! the latest &nbsp;<A HREF="Extrnals.html">list of public functions</A></B>
  <P>
    <HR>
  <H2>
!   Release 5.1k (To be released)
  </H2>
  <P>
  This is the set of things that have been done for the next release.
--- 34,45 ----
  code so please take it as that and nothing more!
  <P>
  <IMG BORDER="0" SRC="../../Icons/32x32/caution" ALT="NOTE"> <B>Check out
! the latest &nbsp;<A HREF="Guide/">WWW APIs</A> and &nbsp;a complete
! <A HREF="Extrnals.html">list of public functions</A></B>
  <P>
    <HR>
  <H2>
!   Release 5.1k March 23, 1998
  </H2>
  <P>
  This is the set of things that have been done for the next release.
***************
*** 47,71 ****
  </H3>
  <UL>
  <LI>
- Improved support in the configure script for determining whether the WAIS libraries are available for direct WAIS access.
-   <LI>
      Added a simple "single user lock" on the persistent cache as it gets confused
      if multiple users are using it.
  </UL>
  <H3>
    Bug Fixes
  </H3>
  <UL>
  <LI>
- Fixed a problem where libwww may loop if several requests are coming on a connection that is not yet established.
-   <LI>
- Fixed the mapping rules for internal icons used when presenting local file directory listings. The icons are installed as part of the libwww distibution package
-   <LI>
      <A HREF="Patch/5.1j/">These are the patches</A> that I have recieved for
!     the current release. They have all (with minor modifications) been applied to this upcoming release.
  </UL>
  <H2>
!   Release 5.1j March 9 1998
  </H2>
  <H3>
    New Features
--- 48,78 ----
  </H3>
  <UL>
    <LI>
      Added a simple "single user lock" on the persistent cache as it gets confused
      if multiple users are using it.
+   <LI>
+     On Unic, the header files are now installed when running "<TT>make
+     install</TT>". The default location is
+     <TT>"/usr/local/include/w3c-libwww</TT>".
+   <LI>
+     On Unix, aset of icons that can be used when browsing local file directories
+     are also installed - the default location is
+     "<TT>/usr/local/share/w3c-libwww</TT>"
  </UL>
  <H3>
    Bug Fixes
  </H3>
  <UL>
    <LI>
      <A HREF="Patch/5.1j/">These are the patches</A> that I have recieved for
!     the current release. They will be applied to this upcoming release.
!   <LI>
!     Fixed a few bugs that make
!     <A HREF="http://www.yggdrasil.com/Products/Arena/">Arena</A> run on top of
!     the latest version
  </UL>
  <H2>
!   Release 5.1j March 9, 1998
  </H2>
  <H3>
    New Features
***************
*** 279,284 ****
  <ADDRESS>
    Henrik Frystyk Nielsen,
    <A HREF="mailto:libwww@w3.org">libwww@w3.org</A>,<BR>
!   @(#) $Id: ReleaseNotes.html,v 1.55 1998/03/20 17:52:45 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
--- 286,291 ----
  <ADDRESS>
    Henrik Frystyk Nielsen,
    <A HREF="mailto:libwww@w3.org">libwww@w3.org</A>,<BR>
!   @(#) $Id: ReleaseNotes.html,v 1.58 1998/03/23 17:52:57 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
Index: Library/src/HTAccess.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTAccess.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -w -c -r1.140 -r1.141
*** HTAccess.c	1998/02/27 23:41:52	1.140
--- HTAccess.c	1998/03/25 15:09:54	1.141
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTAccess.c,v 1.140 1998/02/27 23:41:52 frystyk Exp $
  **
  ** Authors
  **	TBL	Tim Berners-Lee timbl@w3.org
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTAccess.c,v 1.141 1998/03/25 15:09:54 frystyk Exp $
  **
  ** Authors
  **	TBL	Tim Berners-Lee timbl@w3.org
***************
*** 713,722 ****
--- 713,729 ----
  	char * addr = HTAnchor_address((HTAnchor *) source);
  	char * hostname = HTParse(addr, "", PARSE_HOST);
  	HTHost * host = HTHost_find(hostname);
+ #if 0
  	HTMethod public_methods = HTHost_publicMethods(host);
  	HTMethod private_methods = HTAnchor_allow(dest);
+ #endif
  	HT_FREE(hostname);
  	HT_FREE(addr);
+ 
+ #if 0
+ 	/*
+ 	**  Again, this may be too cautios for normal operations
+ 	*/
  	if (!(method & (private_methods | public_methods))) {
  	    HTAlertCallback * prompt = HTAlert_find(HT_A_CONFIRM);
  	    if (prompt) {
***************
*** 725,730 ****
--- 732,738 ----
  		    return NO;
  	    }
  	}
+ #endif
      }
  
      /*
***************
*** 1019,1024 ****
--- 1027,1037 ----
  		    me->state = HT_ABORT_SAVE;
  		}
  	    } else {
+ #if 0
+ 		/*
+ 		** If you are very precautios then you can ask here whether
+ 		** we should continue or not in case of a redirection
+ 		*/
  		if ((*prompt)(request, HT_A_CONFIRM, HT_MSG_DESTINATION_MOVED,
  			      NULL, NULL, NULL) == YES) {
  		    me->destination = redirection;
***************
*** 1028,1033 ****
--- 1041,1050 ----
  		    */
  		    me->state = HT_ABORT_SAVE;
  		}
+ #else
+ 		if (APP_TRACE) HTTrace("Save Filter. Destination hae moved!\n");
+ 		me->destination = redirection;
+ #endif
  	    }
  	}
  	return HT_OK;
Index: Library/src/HTAnchor.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTAnchor.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -w -c -r1.74 -r1.75
*** HTAnchor.c	1998/03/22 21:39:32	1.74
--- HTAnchor.c	1998/03/23 16:39:06	1.75
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTAnchor.c,v 1.74 1998/03/22 21:39:32 frystyk Exp $
  **
  **	An anchor represents a region of a hypertext document which is
  **	linked to another anchor in the same or a different document.
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTAnchor.c,v 1.75 1998/03/23 16:39:06 frystyk Exp $
  **
  **	An anchor represents a region of a hypertext document which is
  **	linked to another anchor in the same or a different document.
***************
*** 139,145 ****
  */
  PUBLIC HTAnchor * HTAnchor_findAddress (const char * address)
  {
!     char *tag = HTParse (address, "", PARSE_ANCHOR);	        /* Any tags? */
      
      /* If the address represents a sub-anchor, we recursively load its parent,
         then we create a child anchor within that document. */
--- 139,145 ----
  */
  PUBLIC HTAnchor * HTAnchor_findAddress (const char * address)
  {
!     char *tag = HTParse (address, "", PARSE_VIEW);	        /* Any tags? */
      
      /* If the address represents a sub-anchor, we recursively load its parent,
         then we create a child anchor within that document. */
Index: Library/src/HTDialog.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTDialog.c,v
retrieving revision 2.26
retrieving revision 2.27
diff -w -c -r2.26 -r2.27
*** HTDialog.c	1996/11/30 23:31:09	2.26
--- HTDialog.c	1998/03/25 15:09:56	2.27
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTDialog.c,v 2.26 1996/11/30 23:31:09 frystyk Exp $
  **
  **	This module provides a default implementation of the application part
  **	of the Message and Dialog part or the Library. You do not have to do
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTDialog.c,v 2.27 1998/03/25 15:09:56 frystyk Exp $
  **
  **	This module provides a default implementation of the application part
  **	of the Message and Dialog part or the Library. You do not have to do
***************
*** 166,172 ****
  	if (pw) HTAlert_setReplySecret(reply, pw);
  	return YES;
  #else
! 	return NO;	/* needed for WWW_MSWINDOWS */
  #endif /* HAVE_GETPASS */
      }
      return NO;
--- 166,185 ----
  	if (pw) HTAlert_setReplySecret(reply, pw);
  	return YES;
  #else
! 	/*
! 	**  This is just to be able to get it wo work when getpass() 
! 	**  isn't available.
! 	*/
!         char buffer[100];
! 	memset(buffer, '\0', 100);
!         HTTrace("%s ", HTDialogs[msgnum]);
! 	if (!fgets(buffer, 99, stdin)) return NO;
! 	buffer[strlen(buffer)-1] = '\0';	        /* Overwrite newline */
!         if (*buffer) {
!             HTAlert_setReplySecret(reply, buffer);
!             return YES;
!         }
!         return NO;
  #endif /* HAVE_GETPASS */
      }
      return NO;
Index: Library/src/HTFile.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTFile.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -w -c -r1.141 -r1.142
*** HTFile.c	1998/03/22 21:39:38	1.141
--- HTFile.c	1998/03/25 15:09:57	1.142
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTFile.c,v 1.141 1998/03/22 21:39:38 frystyk Exp $
  **
  **	This is unix-specific code in general, with some VMS bits.
  **	These are routines for file access used by browsers.
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTFile.c,v 1.142 1998/03/25 15:09:57 frystyk Exp $
  **
  **	This is unix-specific code in general, with some VMS bits.
  **	These are routines for file access used by browsers.
***************
*** 439,445 ****
  		} else {
  		    if (PROT_TRACE)
  			HTTrace("Load File... Not found - even tried content negotiation\n");
! 		    HTRequest_addError(request, ERR_INFO, NO, HTERR_NOT_FOUND,
  				       NULL, 0, "HTLoadFile");
  		    file->state = FS_ERROR;
  		    break;
--- 439,445 ----
  		} else {
  		    if (PROT_TRACE)
  			HTTrace("Load File... Not found - even tried content negotiation\n");
! 		    HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND,
  				       NULL, 0, "HTLoadFile");
  		    file->state = FS_ERROR;
  		    break;
***************
*** 447,453 ****
  	    } else {
  		if (HT_STAT(file->local, &file->stat_info) == -1) {
  		    if (PROT_TRACE)
! 			HTTrace("Load.File... Not found `%s\'\n", file->local);
  		    HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND,
  				       NULL, 0, "HTLoadFile");
  		    file->state = FS_ERROR;
--- 447,453 ----
  	    } else {
  		if (HT_STAT(file->local, &file->stat_info) == -1) {
  		    if (PROT_TRACE)
! 			HTTrace("Load File... Not found `%s\'\n", file->local);
  		    HTRequest_addError(request, ERR_FATAL, NO, HTERR_NOT_FOUND,
  				       NULL, 0, "HTLoadFile");
  		    file->state = FS_ERROR;
Index: Library/src/HTFilter.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTFilter.c,v
retrieving revision 2.26
retrieving revision 2.27
diff -w -c -r2.26 -r2.27
*** HTFilter.c	1998/03/20 17:52:54	2.26
--- HTFilter.c	1998/03/25 15:09:58	2.27
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTFilter.c,v 2.26 1998/03/20 17:52:54 frystyk Exp $
  **
  **	This module implrments a set of default filters that can be registerd
  **	as BEFORE and AFTER filters to the Net manager
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTFilter.c,v 2.27 1998/03/25 15:09:58 frystyk Exp $
  **
  **	This module implrments a set of default filters that can be registerd
  **	as BEFORE and AFTER filters to the Net manager
***************
*** 427,433 ****
  
      /*
      ** Only do automatic redirect on GET and HEAD. Ask for all
!     ** other methods
      */
      if (!HTMethod_isSafe(method)) {
  
--- 427,433 ----
  
      /*
      ** Only do automatic redirect on GET and HEAD. Ask for all
!     ** other methods.
      */
      if (!HTMethod_isSafe(method)) {
  
***************
*** 445,451 ****
  	    if (prompt) {
  		if ((*prompt)(request, HT_A_CONFIRM, HT_MSG_REDIRECTION,
  			      NULL, NULL, NULL) != YES)
! 		    return HT_ERROR;
  	    }
  	}
      } 
--- 445,451 ----
  	    if (prompt) {
  		if ((*prompt)(request, HT_A_CONFIRM, HT_MSG_REDIRECTION,
  			      NULL, NULL, NULL) != YES)
! 		    return HT_OK;
  	    }
  	}
      } 
Index: Library/src/HTInit.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTInit.c,v
retrieving revision 2.87
retrieving revision 2.88
diff -w -c -r2.87 -r2.88
*** HTInit.c	1998/03/20 17:52:57	2.87
--- HTInit.c	1998/03/23 16:39:08	2.88
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTInit.c,v 2.87 1998/03/20 17:52:57 frystyk Exp $
  **
  **	Define a basic set of suffixes and presentations
  */
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTInit.c,v 2.88 1998/03/23 16:39:08 frystyk Exp $
  **
  **	Define a basic set of suffixes and presentations
  */
***************
*** 259,265 ****
      HTProtocol_add("news",	"tcp",	NEWS_PORT,	NO, 	HTLoadNews,	NULL);
      HTProtocol_add("gopher",	"tcp",	GOPHER_PORT,	NO, 	HTLoadGopher,	NULL);
  #ifdef HT_DIRECT_WAIS
!     HTProtocol_add("wais",	"",	WAIS_PORT,	YES, 	HTLoadWAIS,	NULL);
  #endif
  #endif /* DECNET */
  #ifdef HT_MUX
--- 259,265 ----
      HTProtocol_add("news",	"tcp",	NEWS_PORT,	NO, 	HTLoadNews,	NULL);
      HTProtocol_add("gopher",	"tcp",	GOPHER_PORT,	NO, 	HTLoadGopher,	NULL);
  #ifdef HT_DIRECT_WAIS
!     HTProtocol_add("wais",	"tcp",	WAIS_PORT,	YES, 	HTLoadWAIS,	NULL);
  #endif
  #endif /* DECNET */
  #ifdef HT_MUX
Index: Library/src/HTInit.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTInit.html,v
retrieving revision 2.49
retrieving revision 2.50
diff -w -c -r2.49 -r2.50
*** HTInit.html	1997/02/16 18:42:27	2.49
--- HTInit.html	1998/03/25 15:09:59	2.50
***************
*** 55,69 ****
  in the Library. The preemptive version registers all protocol modules to
  use blocking sockets.
  <PRE>
! #include "WWWHTTP.h"
! #include "WWWFile.h"
! #include "WWWFTP.h"
! #include "WWWGophe.h"
! #include "WWWTelnt.h"
! #include "WWWNews.h"
  
  #ifdef HT_DIRECT_WAIS
! #include "WWWWAIS.h"
  #endif
  
  #ifndef FTP_PORT
--- 55,69 ----
  in the Library. The preemptive version registers all protocol modules to
  use blocking sockets.
  <PRE>
! #include "<A HREF="WWWHTTP.html">WWWHTTP.h</A>"
! #include "<A HREF="WWWFile.html">WWWFile.h</A>"
! #include "<A HREF="WWWFTP.html">WWWFTP.h</A>"
! #include "<A HREF="WWWGophe.html">WWWGophe.h</A>"
! #include "<A HREF="WWWTelnt.html">WWWTelnt.h</A>"
! #include "<A HREF="WWWNews.html">WWWNews.h</A>"
  
  #ifdef HT_DIRECT_WAIS
! #include "<A HREF="WWWWAIS.html">WWWWAIS.h</A>"
  #endif
  
  #ifndef FTP_PORT
***************
*** 245,250 ****
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTInit.html,v 2.49 1997/02/16 18:42:27 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
--- 245,250 ----
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTInit.html,v 2.50 1998/03/25 15:09:59 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
Index: Library/src/HTMIMERq.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTMIMERq.c,v
retrieving revision 2.34
retrieving revision 2.35
diff -w -c -r2.34 -r2.35
*** HTMIMERq.c	1998/03/05 21:56:19	2.34
--- HTMIMERq.c	1998/03/25 15:10:00	2.35
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTMIMERq.c,v 2.34 1998/03/05 21:56:19 frystyk Exp $
  **
  **	This module implements the output stream for MIME used for sending
  **	requests with a entity body to HTTP, NEWS, etc. or for generating
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTMIMERq.c,v 2.35 1998/03/25 15:10:00 frystyk Exp $
  **
  **	This module implements the output stream for MIME used for sending
  **	requests with a entity body to HTTP, NEWS, etc. or for generating
***************
*** 76,82 ****
  	BOOL first = YES;
  	HTList * cur = entity->content_encoding;
  	HTEncoding pres;
! 	while ((pres = (HTEncoding) HTList_nextObject(cur))) {
  	    if (first) {
  		PUTS("Content-Encoding: ");
  		first = NO;
--- 76,83 ----
  	BOOL first = YES;
  	HTList * cur = entity->content_encoding;
  	HTEncoding pres;
! 	while ((pres = (HTEncoding) HTList_nextObject(cur)) &&
! 	       !HTFormat_isUnityContent(pres)) {
  	    if (first) {
  		PUTS("Content-Encoding: ");
  		first = NO;
Index: Library/src/HTParse.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTParse.c,v
retrieving revision 2.74
retrieving revision 2.75
diff -w -c -r2.74 -r2.75
*** HTParse.c	1998/03/22 21:39:42	2.74
--- HTParse.c	1998/03/23 16:39:09	2.75
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTParse.c,v 2.74 1998/03/22 21:39:42 frystyk Exp $
  **
  ** history:
  **	May 12 94	TAB added as legal char in HTCleanTelnetString
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTParse.c,v 2.75 1998/03/23 16:39:09 frystyk Exp $
  **
  ** history:
  **	May 12 94	TAB added as legal char in HTCleanTelnetString
***************
*** 193,199 ****
  	}
      }
  		
!     if (wanted & PARSE_ANCHOR)
  	if(given.fragment || related.fragment) {
  	    if(given.absolute && given.fragment) {   /*Fixes for relURLs...*/
  		if(wanted & PARSE_PUNCTUATION) strcat(result, "#");
--- 193,199 ----
  	}
      }
  		
!     if (wanted & PARSE_VIEW)
  	if(given.fragment || related.fragment) {
  	    if(given.absolute && given.fragment) {   /*Fixes for relURLs...*/
  		if(wanted & PARSE_PUNCTUATION) strcat(result, "#");
Index: Library/src/HTParse.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTParse.html,v
retrieving revision 2.35
retrieving revision 2.36
diff -w -c -r2.35 -r2.36
*** HTParse.html	1997/02/16 18:42:49	2.35
--- HTParse.html	1998/03/23 16:39:10	2.36
***************
*** 55,61 ****
  #define PARSE_ACCESS		16		/* Access scheme, e.g. "HTTP" */
  #define PARSE_HOST		 8		/* Host name, e.g. "www.w3.org" */
  #define PARSE_PATH		 4		/* URL Path, e.g. "pub/WWW/TheProject.html" */
! #define PARSE_ANCHOR		 2		/* Fragment identifier, e.g. "news" */
  #define PARSE_PUNCTUATION	 1		/* Include delimiters, e.g, "/" and ":" */
  #define PARSE_ALL		31
  </PRE>
--- 55,65 ----
  #define PARSE_ACCESS		16	/* Access scheme, e.g. "HTTP" */
  #define PARSE_HOST		 8	/* Host name, e.g. "www.w3.org" */
  #define PARSE_PATH		 4	/* URL Path, e.g. "pub/WWW/TheProject.html" */
! 
! #define PARSE_VIEW               2      /* Fragment identifier, e.g. "news" */
! #define PARSE_FRAGMENT           PARSE_VIEW
! #define PARSE_ANCHOR		 PARSE_VIEW
! 
  #define PARSE_PUNCTUATION	 1	/* Include delimiters, e.g, "/" and ":" */
  #define PARSE_ALL		31
  </PRE>
***************
*** 178,183 ****
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTParse.html,v 2.35 1997/02/16 18:42:49 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
--- 182,187 ----
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTParse.html,v 2.36 1998/03/23 16:39:10 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
Index: Library/src/HTProfil.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTProfil.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -w -c -r2.16 -r2.17
*** HTProfil.c	1998/03/20 17:53:02	2.16
--- HTProfil.c	1998/03/25 15:10:00	2.17
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTProfil.c,v 2.16 1998/03/20 17:53:02 frystyk Exp $
  **
  **	Defines a set of application profiles
  */
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTProfil.c,v 2.17 1998/03/25 15:10:00 frystyk Exp $
  **
  **	Defines a set of application profiles
  */
***************
*** 39,45 ****
  }
  
  PRIVATE void client_profile (const char * AppName, const char * AppVersion,
! 			     BOOL preemptive)
  {
      /* If the Library is not already initialized then do it */
      if (!HTLib_isInitialized()) HTLibInit(AppName, AppVersion);
--- 39,45 ----
  }
  
  PRIVATE void client_profile (const char * AppName, const char * AppVersion,
! 			     BOOL preemptive, BOOL cache)
  {
      /* If the Library is not already initialized then do it */
      if (!HTLib_isInitialized()) HTLibInit(AppName, AppVersion);
***************
*** 62,68 ****
  	HTProtocolInit();
  
      /* The persistent cache does not work in preemptive mode */
!     if (!preemptive) HTCacheInit(NULL, 20);
  
      /* Register the default set of BEFORE and AFTER filters */
      HTNetInit();
--- 62,68 ----
  	HTProtocolInit();
  
      /* The persistent cache does not work in preemptive mode */
!     if (cache) HTCacheInit(NULL, 20);
  
      /* Register the default set of BEFORE and AFTER filters */
      HTNetInit();
***************
*** 103,109 ****
  PUBLIC void HTProfile_newClient (const char * AppName, const char * AppVersion)
  {
      /* Do the default setup */
!     client_profile(AppName, AppVersion, NO);
  
      /* Set up default event loop */
      HTEventInit();
--- 103,109 ----
  PUBLIC void HTProfile_newClient (const char * AppName, const char * AppVersion)
  {
      /* Do the default setup */
!     client_profile(AppName, AppVersion, NO, YES);
  
      /* Set up default event loop */
      HTEventInit();
***************
*** 113,122 ****
  					   const char * AppVersion)
  {
      /* Do the default setup */
!     client_profile(AppName, AppVersion, YES);
  
      /* Remember that we are loading preemptively */
      preemptive = YES;
  }
  
  PRIVATE void robot_profile (const char * AppName, const char * AppVersion)
--- 113,132 ----
  					   const char * AppVersion)
  {
      /* Do the default setup */
!     client_profile(AppName, AppVersion, YES, NO);
  
      /* Remember that we are loading preemptively */
      preemptive = YES;
+ }
+ 
+ PUBLIC void HTProfile_newNoCacheClient (const char * AppName,
+ 					const char * AppVersion)
+ {
+     /* Do the default setup */
+     client_profile(AppName, AppVersion, NO, NO);
+ 
+     /* Set up default event loop */
+     HTEventInit();
  }
  
  PRIVATE void robot_profile (const char * AppName, const char * AppVersion)
Index: Library/src/HTProfil.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTProfil.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -w -c -r2.2 -r2.3
*** HTProfil.html	1997/02/16 18:42:50	2.2
--- HTProfil.html	1998/03/25 15:10:01	2.3
***************
*** 53,69 ****
  </H2>
  <P>
  We have a couple of different client application profiles suited to different
! types of clients. The first uses a non-blocking socket interface which enables
! the application to perform multiple requests simultanously - in everyday
! words called pseudo-threads. Besides that this profile contains typical filters
! for handling redirection, authentication, logging, and proxy servers.
! <PRE>extern void HTProfile_newClient (const char * AppName, const char * AppVersion);
  </PRE>
  <P>
  We also have a blocking (preemptive) version of the same client interface.
  The difference is that this version uses traditional blocking sockets and
  hence only one reques can be performed at the same time.
! <PRE>extern void HTProfile_newPreemptiveClient (const char * AppName,
  					   const char * AppVersion);
  </PRE>
  <H2>
--- 53,88 ----
  </H2>
  <P>
  We have a couple of different client application profiles suited to different
! types of clients.
! <H3>
!   Traditional Client Application
! </H3>
! <P>
! The first uses a non-blocking socket interface which enables the application
! to perform multiple requests simultanously - in everyday words called
! pseudo-threads. Besides that this profile contains typical filters for handling
! redirection, authentication, logging, and proxy servers.
! <PRE>
! extern void HTProfile_newClient (const char * AppName, const char * AppVersion);
! </PRE>
! <H3>
!   Client without a Persistent Cache
! </H3>
! <P>
! This is the same as above except that it doesn't start the persistent cache.
! <PRE>
! extern void HTProfile_newNoCacheClient (const char * AppName,
! 					const char * AppVersion);
  </PRE>
+ <H3>
+   Preemptive (Blocking) Client
+ </H3>
  <P>
  We also have a blocking (preemptive) version of the same client interface.
  The difference is that this version uses traditional blocking sockets and
  hence only one reques can be performed at the same time.
! <PRE>
! extern void HTProfile_newPreemptiveClient (const char * AppName,
  					   const char * AppVersion);
  </PRE>
  <H2>
***************
*** 74,92 ****
  but it does contain less filters. For example, robots are normally not interested
  in performing automatic redirections or access authentication, and hence
  this is not part of the robot profile.
! <PRE>extern void HTProfile_newRobot (const char * AppName, const char * AppVersion);
  </PRE>
! 
! As for the client interfacem we also have a blocking (preemptive)
! version of the same interface. The difference is that this version
! uses traditional blocking sockets and hence only one reques can be
! performed at the same time.
! 
  <PRE>
  extern void HTProfile_newPreemptiveRobot (const char * AppName,
  					  const char * AppVersion);
  </PRE>
- 
  <H2>
    <A NAME="Proxy">Proxy Server Profile</A>
  </H2>
--- 93,109 ----
  but it does contain less filters. For example, robots are normally not interested
  in performing automatic redirections or access authentication, and hence
  this is not part of the robot profile.
! <PRE>
! extern void HTProfile_newRobot (const char * AppName, const char * AppVersion);
  </PRE>
! <P>
! As for the client interfacem we also have a blocking (preemptive) version
! of the same interface. The difference is that this version uses traditional
! blocking sockets and hence only one reques can be performed at the same time.
  <PRE>
  extern void HTProfile_newPreemptiveRobot (const char * AppName,
  					  const char * AppVersion);
  </PRE>
  <H2>
    <A NAME="Proxy">Proxy Server Profile</A>
  </H2>
***************
*** 115,120 ****
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTProfil.html,v 2.2 1997/02/16 18:42:50 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
--- 132,137 ----
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTProfil.html,v 2.3 1998/03/25 15:10:01 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
Index: Library/src/HTWAIS.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTWAIS.c,v
retrieving revision 2.54
retrieving revision 2.55
diff -w -c -r2.54 -r2.55
*** HTWAIS.c	1998/03/20 17:53:10	2.54
--- HTWAIS.c	1998/03/25 15:10:02	2.55
***************
*** 3,9 ****
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTWAIS.c,v 2.54 1998/03/20 17:53:10 frystyk Exp $
  **
  **	This module allows a WWW server or client to read data from a
  **	remote  WAIS server, and provide that data to a WWW client in
--- 3,9 ----
  **
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
! **	@(#) $Id: HTWAIS.c,v 2.55 1998/03/25 15:10:02 frystyk Exp $
  **
  **	This module allows a WWW server or client to read data from a
  **	remote  WAIS server, and provide that data to a WWW client in
***************
*** 67,80 ****
  #include "WWWHTML.h"
  #include "HTReqMan.h"
   
- #ifdef HAVE_WAIS_H
- #include "wais.h"
- #else
  #ifdef HAVE_WAIS_WAIS_H
  #include "wais/wais.h"
  #else
  #ifdef WAIS_INCLUDE
  #include WAIS_INCLUDE
  #endif
  #endif
  #endif
--- 67,82 ----
  #include "WWWHTML.h"
  #include "HTReqMan.h"
   
  #ifdef HAVE_WAIS_WAIS_H
  #include "wais/wais.h"
  #else
+ #ifdef HAVE_WAIS_H
+ #include "wais.h"
+ #else
  #ifdef WAIS_INCLUDE
  #include WAIS_INCLUDE
+ #else
+ #include "wais/wais.h"
  #endif
  #endif
  #endif
Index: Library/src/HTWAIS.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/HTWAIS.html,v
retrieving revision 2.25
retrieving revision 2.26
diff -w -c -r2.25 -r2.26
*** HTWAIS.html	1997/02/16 18:43:14	2.25
--- HTWAIS.html	1998/03/25 15:10:02	2.26
***************
*** 33,39 ****
  read source files, and access WAIS indexes through a gateway.
  <P>
  A <A HREF="../User/WAIS.html" NAME="z2">WAIS-WWW gateway</A> is just a normal
! W3 server with a libwww compiled with this module.
  <P>
  This module is implemented by <A HREF="HTWAIS.c">HTWAIS.c</A>, and it is
  a part of the <A HREF="http://www.w3.org/pub/WWW/Library/"> W3C Sample Code
--- 33,39 ----
  read source files, and access WAIS indexes through a gateway.
  <P>
  A <A HREF="../User/WAIS.html" NAME="z2">WAIS-WWW gateway</A> is just a normal
! Web server with a libwww compiled with this module.
  <P>
  This module is implemented by <A HREF="HTWAIS.c">HTWAIS.c</A>, and it is
  a part of the <A HREF="http://www.w3.org/pub/WWW/Library/"> W3C Sample Code
***************
*** 42,48 ****
  #ifndef HTWAIS_H
  #define HTWAIS_H
  
! #include "HTEvent.h"
  </PRE>
  <H2>
    Control Flags
--- 42,48 ----
  #ifndef HTWAIS_H
  #define HTWAIS_H
  
! #include "<A HREF="HTEvent.html">HTEvent.h</A>"
  </PRE>
  <H2>
    Control Flags
***************
*** 53,59 ****
  <PRE>
  extern int HTMaxWAISLines;
  
! extern HTEventCallback HTLoadWAIS;
  </PRE>
  <PRE>
  #endif
--- 53,59 ----
  <PRE>
  extern int HTMaxWAISLines;
  
! extern HTProtCallback HTLoadWAIS;
  </PRE>
  <PRE>
  #endif
***************
*** 61,66 ****
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTWAIS.html,v 2.25 1997/02/16 18:43:14 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
--- 61,66 ----
  <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: HTWAIS.html,v 2.26 1998/03/25 15:10:02 frystyk Exp $
  </ADDRESS>
  </BODY></HTML>
Index: Library/src/WWWFTP.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/WWWFTP.html,v
retrieving revision 2.5
retrieving revision 2.6
diff -w -c -r2.5 -r2.6
*** WWWFTP.html	1997/02/16 18:43:22	2.5
--- WWWFTP.html	1998/03/25 15:10:03	2.6
***************
*** 1,56 ****
  <HTML>
  <HEAD>
  <TITLE>W3C Sample Code Library libwww FTP CLIENT</TITLE>
- <!-- Changed by: Henrik Frystyk Nielsen, 16-Apr-1996 -->
- <NEXTID N="z11">
  </HEAD>
  <BODY>
! 
! <H1>Declaration of W3C Sample Code FTP MODULE</H1>
! 
  <PRE>
  /*
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
  */
  </PRE>
! 
! This is the include file for the basic FTP module that can be used
! together with the core of the W3C Sample Code Library. It contains all
! FTP specific modules which are required to compile and build the FTP
! DLL.<P>
! 
  <PRE>
  #ifndef WWWFTP_H
  #define WWWFTP_H
  </PRE>
- 
  <PRE>
  #ifdef __cplusplus
  extern "C" { 
  #endif
  </PRE>
! 
! <H2>System dependencies</H2>
! 
  The <A HREF="sysdep.html">sysdep.h</A> file includes system-specific include
! files and flags for I/O to network and disk. The only reason for this
! file is that the Internet world is more complicated than Posix and
! ANSI.
! 
  <PRE>
  #include "sysdep.h"
  </PRE>
! 
! <H2>Library Includes</H2>
! 
  <PRE>
! #include "HTFTP.h"			/* FTP client state machine */
! #include "HTFTPDir.h"			/* Streams for parsing FTP output */
  </PRE>
! 
  End of FTP module
- 
  <PRE>
  #ifdef __cplusplus
  } /* end extern C definitions */
--- 1,58 ----
  <HTML>
  <HEAD>
    <TITLE>W3C Sample Code Library libwww FTP CLIENT</TITLE>
  </HEAD>
  <BODY>
! <H1>
!   Declaration of W3C Sample Code FTP MODULE
! </H1>
  <PRE>
  /*
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
  */
  </PRE>
! <P>
! This is the include file for the basic FTP module that can be used together
! with the <A HREF="WWWCore.html">core of the W3C Sample Code Library</A>.
! It contains all FTP specific modules which are required to compile and build
! the FTP DLL.
  <PRE>
  #ifndef WWWFTP_H
  #define WWWFTP_H
  </PRE>
  <PRE>
  #ifdef __cplusplus
  extern "C" { 
  #endif
  </PRE>
! <H2>
!   System dependencies
! </H2>
! <P>
  The <A HREF="sysdep.html">sysdep.h</A> file includes system-specific include
! files and flags for I/O to network and disk. The only reason for this file
! is that the Internet world is more complicated than Posix and ANSI.
  <PRE>
  #include "sysdep.h"
  </PRE>
! <H2>
!   Library Includes
! </H2>
! <H3>
!   The main FTP state machine
! </H3>
! <PRE>
! #include "<A HREF="HTFTP.html">HTFTP.h</A>"			/* FTP client state machine */
! </PRE>
! <H3>
!   The FTP Directory listing Management
! </H3>
  <PRE>
! #include "<A HREF="HTFTPDir.html">HTFTPDir.h</A>"			/* Streams for parsing FTP output */
  </PRE>
! <P>
  End of FTP module
  <PRE>
  #ifdef __cplusplus
  } /* end extern C definitions */
***************
*** 58,67 ****
  
  #endif
  </PRE>
! 
  <HR>
  <ADDRESS>
! @(#) $Id: WWWFTP.html,v 2.5 1997/02/16 18:43:22 frystyk Exp $
  </ADDRESS>
! </BODY>
! </HTML>
--- 60,68 ----
  
  #endif
  </PRE>
! <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: WWWFTP.html,v 2.6 1998/03/25 15:10:03 frystyk Exp $
  </ADDRESS>
! </BODY></HTML>
Index: Library/src/WWWWAIS.html
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/Library/src/WWWWAIS.html,v
retrieving revision 2.6
retrieving revision 2.7
diff -w -c -r2.6 -r2.7
*** WWWWAIS.html	1997/02/16 18:43:32	2.6
--- WWWWAIS.html	1998/03/25 15:10:04	2.7
***************
*** 1,55 ****
  <HTML>
  <HEAD>
- <TITLE>W3C Sample Code Library libwww WAIS CLIENT</TITLE>
  <!-- Changed by: Henrik Frystyk Nielsen, 16-Apr-1996 -->
  <NEXTID N="z11">
  </HEAD>
  <BODY>
! 
! <H1>Declaration of W3C Sample Code WAIS MODULE</H1>
! 
  <PRE>
  /*
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
  */
  </PRE>
! 
! This is the include file for the basic WAIS module that can be used
! together with the core of the W3C Sample Code Library. It contains all
! WAIS specific modules which are required to compile and build the WAIS
! DLL.<P>
! 
  <PRE>
  #ifndef WWWWAIS_H
  #define WWWWAIS_H
  </PRE>
- 
  <PRE>
  #ifdef __cplusplus
  extern "C" { 
  #endif
  </PRE>
! 
! <H2>System dependencies</H2>
! 
  The <A HREF="sysdep.html">sysdep.h</A> file includes system-specific include
! files and flags for I/O to network and disk. The only reason for this
! file is that the Internet world is more complicated than Posix and
! ANSI.
! 
  <PRE>
! #include "sysdep.h"
  </PRE>
! 
! <H2>Library Includes</H2>
! 
  <PRE>
! #include "HTWAIS.h"			        /* WAIS client state machine */
  </PRE>
! 
  End of WAIS module
- 
  <PRE>
  #ifdef __cplusplus
  } /* end extern C definitions */
--- 1,51 ----
  <HTML>
  <HEAD>
    <!-- Changed by: Henrik Frystyk Nielsen, 16-Apr-1996 -->
    <NEXTID N="z11">
+   <TITLE>W3C Sample Code Library libwww WAIS CLIENT</TITLE>
  </HEAD>
  <BODY>
! <H1>
!   Declaration of W3C Sample Code WAIS MODULE
! </H1>
  <PRE>
  /*
  **	(c) COPYRIGHT MIT 1995.
  **	Please first read the full copyright statement in the file COPYRIGH.
  */
  </PRE>
! <P>
! This is the include file for the basic WAIS module that can be used together
! with the <A HREF="WWWCore.html">core of the W3C Sample Code Library</A>.
! It contains all WAIS specific modules which are required to compile and build
! the WAIS DLL.
  <PRE>
  #ifndef WWWWAIS_H
  #define WWWWAIS_H
  </PRE>
  <PRE>
  #ifdef __cplusplus
  extern "C" { 
  #endif
  </PRE>
! <H2>
!   System dependencies
! </H2>
! <P>
  The <A HREF="sysdep.html">sysdep.h</A> file includes system-specific include
! files and flags for I/O to network and disk. The only reason for this file
! is that the Internet world is more complicated than Posix and ANSI.
  <PRE>
! #include "<A HREF="sysdep.html">sysdep.h</A>"
  </PRE>
! <H2>
!   Library Includes
! </H2>
  <PRE>
! #include "<A HREF="HTWAIS.html">HTWAIS.h</A>"			        /* WAIS client state machine */
  </PRE>
! <P>
  End of WAIS module
  <PRE>
  #ifdef __cplusplus
  } /* end extern C definitions */
***************
*** 57,67 ****
  
  #endif
  </PRE>
! 
  <HR>
  <ADDRESS>
! @(#) $Id: WWWWAIS.html,v 2.6 1997/02/16 18:43:32 frystyk Exp $
  </ADDRESS>
! </BODY>
! </HTML>
! 
--- 53,61 ----
  
  #endif
  </PRE>
! <P>
    <HR>
  <ADDRESS>
!   @(#) $Id: WWWWAIS.html,v 2.7 1998/03/25 15:10:04 frystyk Exp $
  </ADDRESS>
! </BODY></HTML>
Index: ComLine/src/HTLine.c
===================================================================
RCS file: /afs/w3.org/CVS-Repository/WWW/ComLine/src/HTLine.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -w -c -r1.36 -r1.37
*** HTLine.c	1998/03/04 15:46:31	1.36
--- HTLine.c	1998/03/25 15:10:06	1.37
***************
*** 227,238 ****
  #endif
  
      /* Initiate W3C Reference Library with a client profile */
!     HTProfile_newClient(APP_NAME, APP_VERSION);
      HTTrace_setCallback(LineTrace);
  
-     /* Add progress notification */
-     HTAlert_add(HTProgress, HT_A_PROGRESS);
- 
      /* Add our own filter to update the history list */
      HTNet_addAfter(terminate_handler, NULL, NULL, HT_ALL, HT_FILTER_LAST);
  
--- 227,235 ----
  #endif
  
      /* Initiate W3C Reference Library with a client profile */
!     HTProfile_newNoCacheClient(APP_NAME, APP_VERSION);
      HTTrace_setCallback(LineTrace);
  
      /* Add our own filter to update the history list */
      HTNet_addAfter(terminate_handler, NULL, NULL, HT_ALL, HT_FILTER_LAST);
  
***************
*** 402,407 ****
--- 399,410 ----
  	Cleanup(cl, -1);
      }
  
+     /* Add progress notification */
+     if (cl->flags & CL_QUIET) {
+ 	HTList * global = HTAlert_global();
+ 	HTAlertCall_delete(global, HTProgress);
+     }
+ 
      /* Output file specified? */
      if (cl->outputfile) {
  	if ((cl->output = fopen(cl->outputfile, "wb")) == NULL) {
***************
*** 409,417 ****
  	    cl->output = OUTPUT;
  	}
      }
- 
-     /* We don't wanna cache */
-     HTCacheMode_setEnabled(NO);
  
      /*
      ** Set up the output. Even though we don't use this explicit, it is
--- 412,417 ----