reverting to stable plus Deb patch to trace segfault

solbu · Nov 9, 2017 · af7c704 · af7c704
1 parent 91e3d69
commit af7c704
Show file tree

Hide file tree

Showing 485 changed files with 404 additions and 452 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 autom4te.cache
 *~
+testing
+temp
diff --git a/ChangeLog b/ChangeLog
diff --git a/contrib/README b/contrib/README
diff --git a/contrib/autorun/README b/contrib/autorun/README
diff --git a/contrib/doc2html/DETAILS b/contrib/doc2html/DETAILS
diff --git a/contrib/doc2html/README b/contrib/doc2html/README
diff --git a/contrib/doc2html/doc2html.cfg b/contrib/doc2html/doc2html.cfg
diff --git a/contrib/doc2html/doc2html.sty b/contrib/doc2html/doc2html.sty
diff --git a/contrib/ewswrap/README b/contrib/ewswrap/README
diff --git a/contrib/examples/badwords b/contrib/examples/badwords
diff --git a/contrib/examples/rundig.sh b/contrib/examples/rundig.sh
diff --git a/contrib/htdig-3.2.0.spec b/contrib/htdig-3.2.0.spec
diff --git a/contrib/htparsedoc/README b/contrib/htparsedoc/README
diff --git a/contrib/htparsedoc/catdoc.c b/contrib/htparsedoc/catdoc.c
diff --git a/contrib/multidig/Makefile b/contrib/multidig/Makefile
diff --git a/contrib/multidig/README b/contrib/multidig/README
diff --git a/contrib/multidig/add-collect b/contrib/multidig/add-collect
diff --git a/contrib/multidig/add-urls b/contrib/multidig/add-urls
diff --git a/contrib/multidig/db.conf b/contrib/multidig/db.conf
diff --git a/contrib/multidig/gen-collect b/contrib/multidig/gen-collect
diff --git a/contrib/multidig/multidig b/contrib/multidig/multidig
diff --git a/contrib/multidig/multidig.conf b/contrib/multidig/multidig.conf
diff --git a/contrib/multidig/new-collect b/contrib/multidig/new-collect
diff --git a/contrib/multidig/new-db b/contrib/multidig/new-db
diff --git a/contrib/rtf2html/charset1252.h b/contrib/rtf2html/charset1252.h
diff --git a/contrib/rtf2html/charsetmac.h b/contrib/rtf2html/charsetmac.h
diff --git a/contrib/run-robot.sh b/contrib/run-robot.sh
diff --git a/contrib/scriptname/README b/contrib/scriptname/README
diff --git a/contrib/scriptname/results.shtml b/contrib/scriptname/results.shtml
diff --git a/contrib/scriptname/search.html b/contrib/scriptname/search.html
diff --git a/contrib/scriptname/templates/NOTE b/contrib/scriptname/templates/NOTE
diff --git a/contrib/scriptname/templates/footer.html b/contrib/scriptname/templates/footer.html
diff --git a/contrib/scriptname/templates/header.html b/contrib/scriptname/templates/header.html
diff --git a/contrib/scriptname/templates/long.html b/contrib/scriptname/templates/long.html
diff --git a/contrib/scriptname/templates/nomatch.html b/contrib/scriptname/templates/nomatch.html
diff --git a/contrib/scriptname/templates/short.html b/contrib/scriptname/templates/short.html
diff --git a/contrib/scriptname/templates/syntax.html b/contrib/scriptname/templates/syntax.html
diff --git a/contrib/wordfreq/wordfreq.html b/contrib/wordfreq/wordfreq.html
diff --git a/db/.cvsignore b/db/.cvsignore
diff --git a/db/LICENSE b/db/LICENSE
@@ -1,5 +1,5 @@
 The following is the license that applies to this copy of the Berkeley DB
-software, version 3.0.55.  For a license to use the Berkeley DB software
+software, version 3.3.11.  For a license to use the Berkeley DB software
 under conditions other than those described here, or to purchase support
 for this software, please contact Sleepycat Software at one of the
 following addresses:
@@ -22,12 +22,12 @@ following addresses:
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in the
   *    documentation and/or other materials provided with the distribution.
-  * 3. This license grant extends only to use of Berkeley DB version 3.0.55,
+  * 3. This license grant extends only to use of Berkeley DB version 3.3.11,
   *    modified or unmodified, in conjunction with the HtDig document
   *    indexing package, and only when the HtDig software is distributed
   *    under the GNU Lesser General Public License (LGPL) as published at
   *                  http://www.fsf.org/licenses/lgpl.html.
-  *    Any use or redistribution of Berkeley DB version 3.0.55, modified or
+  *    Any use or redistribution of Berkeley DB version 3.3.11, modified or
   *    unmodified, with HtDig requires compliance with the terms of the LGPL
   *    with respect to the HtDig software, and with the terms of this license
   *    grant with respect to the Berkeley DB software and any modifications.
@@ -47,7 +47,7 @@ following addresses:
   *    nominal fee, and must be freely redistributable under reasonable
   *    conditions.
   * 8. Nothing of this license grant, and nothing of the bundling of Berkeley
-  *    DB version 3.0.55 with HtDig, shall permit redistribution of Berkeley
+  *    DB version 3.3.11 with HtDig, shall permit redistribution of Berkeley
   *    DB under the terms of the LGPL.
   *
   * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
@@ -90,7 +90,7 @@ following addresses:
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   */
-
+/*
   * Copyright (c) 1995, 1996
   *    The President and Fellows of Harvard University.  All rights reserved.
   *

diff --git a/db/README b/db/README
diff --git a/db/bt_curadj.c b/db/bt_curadj.c
@@ -30,12 +30,12 @@ int
 CDB___bam_cprint(dbp)
 	DB *dbp;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		fprintf(stderr,
 	    "%#0x->%#0x: page: %lu index: %lu dpage %lu dindex: %lu recno: %lu",
@@ -65,6 +65,7 @@ CDB___bam_ca_delete(dbp, pgno, indx, delete)
 	u_int32_t indx;
 	int delete;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 	int count;		/* !!!: Has to contain max number of cursors. */
 
@@ -86,7 +87,6 @@ CDB___bam_ca_delete(dbp, pgno, indx, delete)
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (count = 0, dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 
 		if ((cp->pgno == pgno && cp->indx == indx) ||
@@ -116,6 +116,7 @@ CDB___bam_ca_di(dbp, pgno, indx, adjust)
 	u_int32_t indx;
 	int adjust;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	/* Recno is responsible for its own adjustments. */
@@ -128,7 +129,6 @@ CDB___bam_ca_di(dbp, pgno, indx, adjust)
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		if (cp->pgno == pgno && cp->indx >= indx) {
 			/* Cursor indices should never be negative. */
@@ -158,6 +158,7 @@ CDB___bam_ca_dup(dbp, fpgno, first, fi, tpgno, ti)
 	db_pgno_t fpgno, tpgno;
 	u_int32_t first, fi, ti;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	/* Recno is responsible for its own adjustments. */
@@ -170,7 +171,6 @@ CDB___bam_ca_dup(dbp, fpgno, first, fi, tpgno, ti)
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		/*
 		 * Ignore matching entries that have already been moved,
@@ -198,6 +198,7 @@ CDB___bam_ca_rsplit(dbp, fpgno, tpgno)
 	DB *dbp;
 	db_pgno_t fpgno, tpgno;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	/* Recno is responsible for its own adjustments. */
@@ -210,7 +211,6 @@ CDB___bam_ca_rsplit(dbp, fpgno, tpgno)
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		if (cp->pgno == fpgno)
 			cp->pgno = tpgno;
@@ -232,6 +232,7 @@ CDB___bam_ca_split(dbp, ppgno, lpgno, rpgno, split_indx, cleft)
 	u_int32_t split_indx;
 	int cleft;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	/* Recno is responsible for its own adjustments. */
@@ -251,7 +252,6 @@ CDB___bam_ca_split(dbp, ppgno, lpgno, rpgno, split_indx, cleft)
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		if (cp->pgno == ppgno) {
 			if (cp->indx < split_indx) {
@@ -288,12 +288,12 @@ CDB___bam_ca_repl(dbp, dpgno, dindx, newpgno, newindx)
 	db_pgno_t dpgno, newpgno;
 	u_int32_t dindx, newindx;
 {
+	BTREE_CURSOR *cp;
 	DBC *dbc;
 
 	MUTEX_THREAD_LOCK(dbp->mutexp);
 	for (dbc = TAILQ_FIRST(&dbp->active_queue);
 	    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
-		BTREE_CURSOR *cp;
 		cp = (BTREE_CURSOR *)dbc->internal;
 		if (cp->dpgno == dpgno && cp->dindx == dindx) {
 			cp->dpgno = newpgno;

diff --git a/db/bt_cursor.c b/db/bt_cursor.c
@@ -848,7 +848,7 @@ CDB___bam_c_put(dbc_orig, key, data, flags)
 {
 	BTREE_CURSOR *cp, *orig;
 	DB *dbp;
-	DBC *dbc = malloc(sizeof *dbc);
+	DBC *dbc;
 	DBT dbt;
 	db_indx_t indx;
 	db_pgno_t pgno;
@@ -1092,7 +1092,7 @@ CDB___bam_c_put(dbc_orig, key, data, flags)
 	if (F_ISSET(dbc_orig, DBC_WRITECURSOR))
 		(void)CDB___lock_downgrade(dbp->dbenv,
 		    &dbc_orig->mylock, DB_LOCK_IWRITE, 0);
-	free (dbc);
+
 	return (ret);
 }
 

diff --git a/db/bt_put.c b/db/bt_put.c
@@ -700,6 +700,7 @@ CDB___bam_ritem(dbc, h, indx, data)
 	DBT orig, repl;
 	db_indx_t cnt, lo, ln, min, off, prefix, suffix;
 	int32_t nbytes;
+	int ret;
 	u_int8_t *p, *t;
 
 	dbp = dbc->dbp;
@@ -736,7 +737,6 @@ CDB___bam_ritem(dbc, h, indx, data)
 		orig.size = bk->len - (prefix + suffix);
 		repl.data = (u_int8_t *)data->data + prefix;
 		repl.size = data->size - (prefix + suffix);
-		int ret = 0;
 		if ((ret = CDB___bam_repl_log(dbp->dbenv, dbc->txn,
 		    &LSN(h), 0, dbp->log_fileid, PGNO(h), &LSN(h),
 		    (u_int32_t)indx, (u_int32_t)B_DISSET(bk->type),

diff --git a/db/build_win32/DB_VC4.mdp b/db/build_win32/DB_VC4.mdp
diff --git a/db/configure.in b/db/configure.in
diff --git a/db/docs/images/folder.gif b/db/docs/images/folder.gif
diff --git a/db/docs/images/folder_open.gif b/db/docs/images/folder_open.gif
diff --git a/db/docs/images/next.gif b/db/docs/images/next.gif
diff --git a/db/docs/images/prev.gif b/db/docs/images/prev.gif
diff --git a/db/docs/images/ps.gif b/db/docs/images/ps.gif
diff --git a/db/docs/images/sleepycat.gif b/db/docs/images/sleepycat.gif
diff --git a/db/docs/images/toc.gif b/db/docs/images/toc.gif
diff --git a/db/docs/ref/arch/bigpic.gif b/db/docs/ref/arch/bigpic.gif
diff --git a/db/docs/ref/arch/smallpic.gif b/db/docs/ref/arch/smallpic.gif
diff --git a/db/ltmain.sh b/db/ltmain.sh
diff --git a/db/patch1 b/db/patch1
diff --git a/db/patch2 b/db/patch2
diff --git a/db/prefix-symbols.sh b/db/prefix-symbols.sh
diff --git a/db/stamp-h.in b/db/stamp-h.in
diff --git a/db/uts4_cc.s b/db/uts4_cc.s
diff --git a/htcommon/.cvsignore b/htcommon/.cvsignore
diff --git a/htdb/.cvsignore b/htdb/.cvsignore
diff --git a/htdb/Makefile.am b/htdb/Makefile.am
diff --git a/htdb/Makefile.in b/htdb/Makefile.in
diff --git a/htdb/htdb_dump.cc b/htdb/htdb_dump.cc
diff --git a/htdb/htdb_load.cc b/htdb/htdb_load.cc
diff --git a/htdb/htdb_stat.cc b/htdb/htdb_stat.cc
diff --git a/htdb/mifluzdict.cc b/htdb/mifluzdict.cc
diff --git a/htdb/mifluzdump.cc b/htdb/mifluzdump.cc
diff --git a/htdb/mifluzload.cc b/htdb/mifluzload.cc
diff --git a/htdb/util_sig.cc b/htdb/util_sig.cc
diff --git a/htdb/util_sig.h b/htdb/util_sig.h
diff --git a/htdig/.cvsignore b/htdig/.cvsignore
diff --git a/htdig/ExternalParser.cc b/htdig/ExternalParser.cc
@@ -227,7 +227,7 @@ ExternalParser::parse(Retriever &retriever, URL &base)
     int		get_file = (convertToType.length() != 0);
     String	newcontent;
 
-    StringList	cpargs(currentParser, " \t");
+    StringList	cpargs(currentParser);
     char   **parsargs = new char * [cpargs.Count() + 5];
     int    argi;
     for (argi = 0; argi < cpargs.Count(); argi++)
@@ -280,11 +280,7 @@ ExternalParser::parse(Retriever &retriever, URL &base)
 	// Call External Parser
 	execv(parsargs[0], parsargs);
 
-	perror("execv");
-	write(STDERR_FILENO, "External parser error: Can't execute ", 37);
-	write(STDERR_FILENO, parsargs[0], strlen(parsargs[0]));
-	write(STDERR_FILENO, "\n", 1);
-	_exit(EXIT_FAILURE);
+	exit(EXIT_FAILURE);
     }
 
     // Parent Process
@@ -428,7 +424,7 @@ ExternalParser::parse(Retriever &retriever, URL &base)
 		  {
 			metadatetags = new StringMatch();
 			metadatetags->IgnoreCase();
-			metadatetags->Pattern("date|dc.date|dc.date.created|dc.date.modified");
+			metadatetags->Pattern("date|dc.date|dc.date.created|dc.data.modified");
 		  }
 
 		  // <URL:http://www.w3.org/MarkUp/html-spec/html-spec_5.html#SEC5.2.5> 

diff --git a/htdig/Retriever.cc b/htdig/Retriever.cc
@@ -12,7 +12,7 @@
 // or the GNU Library General Public License (LGPL) version 2 or later
 // <http://www.gnu.org/copyleft/lgpl.html>
 //
-// $Id: Retriever.cc,v 1.95 2004/06/14 12:16:17 lha Exp $
+// $Id: Retriever.cc,v 1.94 2004/05/28 13:15:15 lha Exp $
 //
 
 #ifdef HAVE_CONFIG_H
@@ -485,11 +485,8 @@ void Retriever::Start()
 #endif
 
 
-	    		// Loop until interrupted, too many requests, or done.
-			// ('noSignal' must be before 'pop', or the popped
-			// URL will not be included in  url_log  file, below.)
-			while (noSignal && ((max_connection_requests == -1) ||
-				   (count < max_connection_requests)) && (ref = server->pop()))
+			while (((max_connection_requests == -1) ||
+				   (count < max_connection_requests)) && (ref = server->pop()) && noSignal)
 			{
 				count++;
 

diff --git a/htdoc/.cvsignore b/htdoc/.cvsignore
diff --git a/htdoc/COPYING b/htdoc/COPYING
diff --git a/htdoc/ChangeLog b/htdoc/ChangeLog
diff --git a/htdoc/FAQ.html b/htdoc/FAQ.html
diff --git a/htdoc/Makefile.am b/htdoc/Makefile.am
diff --git a/htdoc/Makefile.in b/htdoc/Makefile.in
diff --git a/htdoc/RELEASE.html b/htdoc/RELEASE.html
diff --git a/htdoc/THANKS.html b/htdoc/THANKS.html
diff --git a/htdoc/TODO.html b/htdoc/TODO.html
diff --git a/htdoc/all.html b/htdoc/all.html
diff --git a/htdoc/attrs_head.html b/htdoc/attrs_head.html
diff --git a/htdoc/attrs_tail.html b/htdoc/attrs_tail.html
diff --git a/htdoc/author.html b/htdoc/author.html
diff --git a/htdoc/bdot.gif b/htdoc/bdot.gif
diff --git a/htdoc/bugs.html b/htdoc/bugs.html
diff --git a/htdoc/cf_blocks.html b/htdoc/cf_blocks.html
diff --git a/htdoc/cf_byname.html b/htdoc/cf_byname.html
diff --git a/htdoc/cf_byname_head.html b/htdoc/cf_byname_head.html
diff --git a/htdoc/cf_byname_tail.html b/htdoc/cf_byname_tail.html
diff --git a/htdoc/cf_byprog.html b/htdoc/cf_byprog.html
diff --git a/htdoc/cf_byprog_head.html b/htdoc/cf_byprog_head.html
diff --git a/htdoc/cf_byprog_tail.html b/htdoc/cf_byprog_tail.html
diff --git a/htdoc/cf_general.html b/htdoc/cf_general.html
diff --git a/htdoc/cf_types.html b/htdoc/cf_types.html
diff --git a/htdoc/cf_variables.html b/htdoc/cf_variables.html
diff --git a/htdoc/config.html b/htdoc/config.html
diff --git a/htdoc/confindex.html b/htdoc/confindex.html
diff --git a/htdoc/confmenu.html b/htdoc/confmenu.html
diff --git a/htdoc/contents.html b/htdoc/contents.html
diff --git a/htdoc/dot.gif b/htdoc/dot.gif
diff --git a/htdoc/htdig.gif b/htdoc/htdig.gif
diff --git a/htdoc/htdig.html b/htdoc/htdig.html
diff --git a/htdoc/htdig_big.gif b/htdoc/htdig_big.gif
diff --git a/htdoc/htdump.html b/htdoc/htdump.html
diff --git a/htdoc/htfuzzy.html b/htdoc/htfuzzy.html
diff --git a/htdoc/htload.html b/htdoc/htload.html
diff --git a/htdoc/htmerge.html b/htdoc/htmerge.html
diff --git a/htdoc/htnotify.html b/htdoc/htnotify.html
diff --git a/htdoc/htpurge.html b/htdoc/htpurge.html
diff --git a/htdoc/hts_form.html b/htdoc/hts_form.html
diff --git a/htdoc/hts_general.html b/htdoc/hts_general.html
diff --git a/htdoc/hts_menu.html b/htdoc/hts_menu.html
diff --git a/htdoc/hts_method.html b/htdoc/hts_method.html
diff --git a/htdoc/hts_selectors.html b/htdoc/hts_selectors.html
diff --git a/htdoc/hts_templates.html b/htdoc/hts_templates.html
diff --git a/htdoc/htsearch.html b/htdoc/htsearch.html
diff --git a/htdoc/htstat.html b/htdoc/htstat.html
diff --git a/htdoc/index.html b/htdoc/index.html
diff --git a/htdoc/install.html b/htdoc/install.html
diff --git a/htdoc/isp.html b/htdoc/isp.html
diff --git a/htdoc/ma_menu.html b/htdoc/ma_menu.html
diff --git a/htdoc/mailarchive.html b/htdoc/mailarchive.html
diff --git a/htdoc/mailing.html b/htdoc/mailing.html
diff --git a/htdoc/main.html b/htdoc/main.html
diff --git a/htdoc/meta.html b/htdoc/meta.html
diff --git a/htdoc/notification.html b/htdoc/notification.html
diff --git a/htdoc/require.html b/htdoc/require.html
diff --git a/htdoc/triangle.gif b/htdoc/triangle.gif
diff --git a/htdoc/up.gif b/htdoc/up.gif
diff --git a/htdoc/upgrade.html b/htdoc/upgrade.html
diff --git a/htdoc/uses.html b/htdoc/uses.html
diff --git a/htdoc/where.html b/htdoc/where.html
diff --git a/htfuzzy/.cvsignore b/htfuzzy/.cvsignore
diff --git a/htlib/.cvsignore b/htlib/.cvsignore
diff --git a/htlib/Configuration.cc b/htlib/Configuration.cc
diff --git a/htlib/Configuration.h b/htlib/Configuration.h
diff --git a/htlib/DB2_db.cc b/htlib/DB2_db.cc
diff --git a/htlib/DB2_db.h b/htlib/DB2_db.h
diff --git a/htlib/Database.cc b/htlib/Database.cc
diff --git a/htlib/Database.h b/htlib/Database.h
diff --git a/htlib/Dictionary.cc b/htlib/Dictionary.cc
diff --git a/htlib/Dictionary.h b/htlib/Dictionary.h
diff --git a/htlib/HtCodec.cc b/htlib/HtCodec.cc
diff --git a/htlib/HtCodec.h b/htlib/HtCodec.h
diff --git a/htlib/HtDateTime.cc b/htlib/HtDateTime.cc
diff --git a/htlib/HtDateTime.h b/htlib/HtDateTime.h
diff --git a/htlib/HtHeap.cc b/htlib/HtHeap.cc
diff --git a/htlib/HtHeap.h b/htlib/HtHeap.h
diff --git a/htlib/HtMaxMin.cc b/htlib/HtMaxMin.cc
diff --git a/htlib/HtMaxMin.h b/htlib/HtMaxMin.h
diff --git a/htlib/HtPack.cc b/htlib/HtPack.cc
diff --git a/htlib/HtPack.h b/htlib/HtPack.h
diff --git a/htlib/HtRandom.h b/htlib/HtRandom.h
diff --git a/htlib/HtRegex.cc b/htlib/HtRegex.cc
diff --git a/htlib/HtRegex.h b/htlib/HtRegex.h
diff --git a/htlib/HtRegexReplace.cc b/htlib/HtRegexReplace.cc
diff --git a/htlib/HtRegexReplace.h b/htlib/HtRegexReplace.h
diff --git a/htlib/HtRegexReplaceList.cc b/htlib/HtRegexReplaceList.cc
diff --git a/htlib/HtRegexReplaceList.h b/htlib/HtRegexReplaceList.h
diff --git a/htlib/HtTime.h b/htlib/HtTime.h
diff --git a/htlib/HtVector.cc b/htlib/HtVector.cc
diff --git a/htlib/HtVector.h b/htlib/HtVector.h
diff --git a/htlib/HtVectorGeneric.cc b/htlib/HtVectorGeneric.cc
diff --git a/htlib/HtVectorGeneric.h b/htlib/HtVectorGeneric.h
diff --git a/htlib/HtVectorGenericCode.h b/htlib/HtVectorGenericCode.h
diff --git a/htlib/HtVector_String.h b/htlib/HtVector_String.h
diff --git a/htlib/HtVector_int.h b/htlib/HtVector_int.h
diff --git a/htlib/HtWordCodec.cc b/htlib/HtWordCodec.cc
diff --git a/htlib/HtWordCodec.h b/htlib/HtWordCodec.h
diff --git a/htlib/HtWordType.cc b/htlib/HtWordType.cc
diff --git a/htlib/HtWordType.h b/htlib/HtWordType.h
diff --git a/htlib/IntObject.cc b/htlib/IntObject.cc
diff --git a/htlib/IntObject.h b/htlib/IntObject.h
diff --git a/htlib/List.cc b/htlib/List.cc
diff --git a/htlib/List.h b/htlib/List.h
diff --git a/htlib/Makefile.am b/htlib/Makefile.am
diff --git a/htlib/Makefile.in b/htlib/Makefile.in
diff --git a/htlib/Object.cc b/htlib/Object.cc
diff --git a/htlib/Object.h b/htlib/Object.h
diff --git a/htlib/ParsedString.cc b/htlib/ParsedString.cc
diff --git a/htlib/ParsedString.h b/htlib/ParsedString.h
diff --git a/htlib/Queue.cc b/htlib/Queue.cc
diff --git a/htlib/Queue.h b/htlib/Queue.h
diff --git a/htlib/QuotedStringList.cc b/htlib/QuotedStringList.cc
diff --git a/htlib/QuotedStringList.h b/htlib/QuotedStringList.h
diff --git a/htlib/Stack.cc b/htlib/Stack.cc
diff --git a/htlib/Stack.h b/htlib/Stack.h
diff --git a/htlib/String.cc b/htlib/String.cc
diff --git a/htlib/StringList.cc b/htlib/StringList.cc
diff --git a/htlib/StringList.h b/htlib/StringList.h
diff --git a/htlib/StringMatch.cc b/htlib/StringMatch.cc
diff --git a/htlib/StringMatch.h b/htlib/StringMatch.h
diff --git a/htlib/String_fmt.cc b/htlib/String_fmt.cc
diff --git a/htlib/ber.h b/htlib/ber.h
diff --git a/htlib/clib.h b/htlib/clib.h
diff --git a/htlib/getcwd.c b/htlib/getcwd.c
diff --git a/htlib/good_strtok.cc b/htlib/good_strtok.cc
diff --git a/htlib/good_strtok.h b/htlib/good_strtok.h
diff --git a/htlib/gregex.h b/htlib/gregex.h
diff --git a/htlib/htString.h b/htlib/htString.h
diff --git a/htlib/lib.h b/htlib/lib.h
diff --git a/htlib/libdefs.h b/htlib/libdefs.h
diff --git a/htlib/md5.cc b/htlib/md5.cc
diff --git a/htlib/md5.h b/htlib/md5.h
diff --git a/htlib/memcmp.c b/htlib/memcmp.c
diff --git a/htlib/memcpy.c b/htlib/memcpy.c
diff --git a/htlib/memmove.c b/htlib/memmove.c
diff --git a/htlib/mhash_md5.c b/htlib/mhash_md5.c
diff --git a/htlib/mhash_md5.h b/htlib/mhash_md5.h
diff --git a/htlib/mktime.c b/htlib/mktime.c
diff --git a/htlib/myqsort.c b/htlib/myqsort.c
diff --git a/htlib/myqsort.h b/htlib/myqsort.h
diff --git a/htlib/raise.c b/htlib/raise.c
diff --git a/htlib/regex.c b/htlib/regex.c
diff --git a/htlib/regex_win32.c b/htlib/regex_win32.c
diff --git a/htlib/regex_win32.h b/htlib/regex_win32.h
diff --git a/htlib/snprintf.c b/htlib/snprintf.c
diff --git a/htlib/strcasecmp.cc b/htlib/strcasecmp.cc
diff --git a/htlib/strerror.c b/htlib/strerror.c
diff --git a/htlib/strptime.cc b/htlib/strptime.cc
diff --git a/htlib/timegm.c b/htlib/timegm.c
diff --git a/htlib/vsnprintf.c b/htlib/vsnprintf.c
diff --git a/htnet/.cvsignore b/htnet/.cvsignore
diff --git a/htnet/Connection.cc b/htnet/Connection.cc
diff --git a/htnet/Connection.h b/htnet/Connection.h
diff --git a/htnet/HtFTP.cc b/htnet/HtFTP.cc
diff --git a/htnet/HtFTP.h b/htnet/HtFTP.h
diff --git a/htnet/HtFile.cc b/htnet/HtFile.cc
diff --git a/htnet/HtFile.h b/htnet/HtFile.h
diff --git a/htnet/HtHTTP.cc b/htnet/HtHTTP.cc
diff --git a/htnet/HtHTTP.h b/htnet/HtHTTP.h
diff --git a/htnet/HtNNTP.cc b/htnet/HtNNTP.cc
diff --git a/htnet/HtNNTP.h b/htnet/HtNNTP.h
diff --git a/htnet/Makefile.am b/htnet/Makefile.am
diff --git a/htnet/Makefile.in b/htnet/Makefile.in
diff --git a/htnet/Makefile.win32 b/htnet/Makefile.win32
diff --git a/htnet/SSLConnection.cc b/htnet/SSLConnection.cc
@@ -131,21 +131,18 @@ int SSLConnection::Read_Partial(char *buffer, int maxlength)
     {
       errno = 0;
 
-      if (!SSL_pending(ssl)) {
-        if (timeout_value > 0) {
-            FD_SET_T fds;
-            FD_ZERO(&fds);
-            FD_SET(sock, &fds);
-
-            timeval tv;
-            tv.tv_sec = timeout_value;
-            tv.tv_usec = 0;
-
-            int selected = select(sock+1, &fds, 0, 0, &tv);
-            if (selected <= 0)
-                need_io_stop++;
-        }
-
+      if (timeout_value > 0) {
+          FD_SET_T fds;
+          FD_ZERO(&fds);
+          FD_SET(sock, &fds);
+
+          timeval tv;
+          tv.tv_sec = timeout_value;
+          tv.tv_usec = 0;
+
+          int selected = select(sock+1, &fds, 0, 0, &tv);
+          if (selected <= 0)
+              need_io_stop++;
       }
 
       if (!need_io_stop)

diff --git a/htnet/Transport.cc b/htnet/Transport.cc
diff --git a/htnet/Transport.h b/htnet/Transport.h
diff --git a/htsearch/.cvsignore b/htsearch/.cvsignore
diff --git a/htsearch/AndQuery.cc b/htsearch/AndQuery.cc
diff --git a/htsearch/AndQuery.h b/htsearch/AndQuery.h
diff --git a/htsearch/AndQueryParser.h b/htsearch/AndQueryParser.h
diff --git a/htsearch/BooleanLexer.cc b/htsearch/BooleanLexer.cc
diff --git a/htsearch/BooleanLexer.h b/htsearch/BooleanLexer.h
diff --git a/htsearch/BooleanQueryParser.cc b/htsearch/BooleanQueryParser.cc
diff --git a/htsearch/BooleanQueryParser.h b/htsearch/BooleanQueryParser.h
diff --git a/htsearch/Collection.cc b/htsearch/Collection.cc
diff --git a/htsearch/Collection.h b/htsearch/Collection.h
diff --git a/htsearch/Display.cc b/htsearch/Display.cc
@@ -138,7 +138,7 @@ Display::display(int pageNumber)
       // Must temporarily stash the message in a String, since
       // displaySyntaxError will overwrite the static temp used in form.
 
-      String s("invalid sort method");
+      String s("Invalid sort method.");
 
       displaySyntaxError(s);
       return;

diff --git a/htsearch/Display.h b/htsearch/Display.h
diff --git a/htsearch/DocMatch.cc b/htsearch/DocMatch.cc
diff --git a/htsearch/DocMatch.h b/htsearch/DocMatch.h
diff --git a/htsearch/ExactWordQuery.cc b/htsearch/ExactWordQuery.cc
diff --git a/htsearch/ExactWordQuery.h b/htsearch/ExactWordQuery.h
diff --git a/htsearch/FuzzyExpander.h b/htsearch/FuzzyExpander.h
diff --git a/htsearch/GParser.cc b/htsearch/GParser.cc
diff --git a/htsearch/GParser.h b/htsearch/GParser.h
diff --git a/htsearch/HtURLSeedScore.cc b/htsearch/HtURLSeedScore.cc
diff --git a/htsearch/HtURLSeedScore.h b/htsearch/HtURLSeedScore.h
diff --git a/htsearch/Makefile.am b/htsearch/Makefile.am
diff --git a/htsearch/Makefile.in b/htsearch/Makefile.in
diff --git a/htsearch/Makefile.win32 b/htsearch/Makefile.win32
diff --git a/htsearch/NearQuery.cc b/htsearch/NearQuery.cc
diff --git a/htsearch/NearQuery.h b/htsearch/NearQuery.h
diff --git a/htsearch/NotQuery.cc b/htsearch/NotQuery.cc
diff --git a/htsearch/NotQuery.h b/htsearch/NotQuery.h
diff --git a/htsearch/OperatorQuery.cc b/htsearch/OperatorQuery.cc
diff --git a/htsearch/OperatorQuery.h b/htsearch/OperatorQuery.h
diff --git a/htsearch/OrFuzzyExpander.cc b/htsearch/OrFuzzyExpander.cc
diff --git a/htsearch/OrFuzzyExpander.h b/htsearch/OrFuzzyExpander.h
diff --git a/htsearch/OrQuery.cc b/htsearch/OrQuery.cc
diff --git a/htsearch/OrQuery.h b/htsearch/OrQuery.h
diff --git a/htsearch/OrQueryParser.h b/htsearch/OrQueryParser.h
diff --git a/htsearch/PhraseQuery.cc b/htsearch/PhraseQuery.cc
diff --git a/htsearch/PhraseQuery.h b/htsearch/PhraseQuery.h
diff --git a/htsearch/Query.cc b/htsearch/Query.cc
diff --git a/htsearch/Query.h b/htsearch/Query.h
diff --git a/htsearch/QueryCache.h b/htsearch/QueryCache.h
diff --git a/htsearch/QueryLexer.cc b/htsearch/QueryLexer.cc
diff --git a/htsearch/QueryLexer.h b/htsearch/QueryLexer.h
diff --git a/htsearch/QueryParser.cc b/htsearch/QueryParser.cc
diff --git a/htsearch/QueryParser.h b/htsearch/QueryParser.h
diff --git a/htsearch/ResultList.cc b/htsearch/ResultList.cc
diff --git a/htsearch/ResultList.h b/htsearch/ResultList.h
diff --git a/htsearch/ResultMatch.cc b/htsearch/ResultMatch.cc
diff --git a/htsearch/ResultMatch.h b/htsearch/ResultMatch.h
diff --git a/htsearch/SimpleLexer.h b/htsearch/SimpleLexer.h
diff --git a/htsearch/SimpleQueryParser.cc b/htsearch/SimpleQueryParser.cc
diff --git a/htsearch/SimpleQueryParser.h b/htsearch/SimpleQueryParser.h
diff --git a/htsearch/SplitMatches.cc b/htsearch/SplitMatches.cc
diff --git a/htsearch/SplitMatches.h b/htsearch/SplitMatches.h
diff --git a/htsearch/Template.cc b/htsearch/Template.cc
diff --git a/htsearch/Template.h b/htsearch/Template.h