about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES9
-rw-r--r--PACKAGE/debian/changelog6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--WWW/Library/Implementation/HTMIME.c11
-rwxr-xr-xconfigure2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg6
-rw-r--r--makefile.in4
-rw-r--r--userdefs.h6
10 files changed, 38 insertions, 18 deletions
diff --git a/CHANGES b/CHANGES
index 521674e1..5c887ba1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,15 @@
--- $LynxId: CHANGES,v 1.617 2012/08/15 09:47:38 tom Exp $
+-- $LynxId: CHANGES,v 1.619 2012/08/22 09:56:16 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2012-08-22 (2.8.8dev.14)
+* reset anchor's actual-length calculation at the end of pumpData() to handle
+  scenario where this is used for internal data movement, i.e., for
+  decompressing files (report by Owen Leibman, Debian #681214) -TD
+* drop two files overlooked in previous commit:
+  lynx.rsp and WWW/Library/Implementation/HTFWriter.c
+
 2012-08-15 (2.8.8dev.13)
 * make nsl-fork work for the DNS lookup using getaddrinfo, i.e., for IPv6
   configurations (report by FLWM) -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index e7c228d6..52cec81b 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,3 +1,9 @@
+lynx-dev (2.8.8dev.14) unstable; urgency=high
+
+  * fix regresion in dev.13
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 22 Aug 2012 06:22:28 -0400
+
 lynx-dev (2.8.8dev.13) unstable; urgency=low
 
   * changes for dev.13
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 7863fe14..9ed2fb6d 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.13 2012/07/07 14:55:10 tom Exp $
+# $LynxId: lynx.spec,v 1.14 2012/08/22 10:21:56 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.8
-Release: dev.13
+Release: dev.14
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 51bc6750..28379484 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.8dev.13"
+#define LYNX_VERSION "2.8.8dev.14"
 

 #define MyAppName "Lynx"

 #define MyAppPublisher "Thomas E Dickey"

diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 66b69ab5..a8e41974 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.78 2012/08/15 10:59:12 tom Exp $
+ * $LynxId: HTMIME.c,v 1.79 2012/08/22 09:48:46 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -577,7 +577,12 @@ static int pumpData(HTStream *me)
 	    FREE(url);
 	}
     }
-    CTRACE((tfp, "...end of pumpData\n"));
+    CTRACE((tfp, "...end of pumpData, copied %"
+	    PRI_off_t " vs %"
+	    PRI_off_t "\n",
+	    me->anchor->actual_length,
+	    me->anchor->content_length));
+    me->anchor->actual_length = 0;
     return HT_OK;
 }
 
@@ -1079,6 +1084,8 @@ static void HTMIME_put_character(HTStream *me, int c)
 	if (me->anchor->content_length == 0 ||
 	    (me->anchor->content_length >= me->anchor->actual_length)) {
 	    (me->targetClass.put_character) (me->target, c);
+	} else {
+	    (me->targetClass.put_character) (me->target, c);
 	}
 	return;
 
diff --git a/configure b/configure
index 63ed7f9c..66172a5d 100755
--- a/configure
+++ b/configure
@@ -1270,7 +1270,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.8dev.13
+VERSION=2.8.8dev.14
 
 echo "$as_me:1275: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index d313f6de..f738a82f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.240 2012/08/16 00:48:47 tom Exp $
+dnl $LynxId: configure.in,v 1.241 2012/08/22 11:11:26 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.8dev.13)
+AC_REVISION(2.8.8dev.14)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.8dev.13
+VERSION=2.8.8dev.14
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 6deadaa9..46a09f1a 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.219 2012/08/16 00:48:47 tom Exp $
+# $LynxId: lynx.cfg,v 1.220 2012/08/22 11:11:26 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.8dev.13"
+#PRCS LYNX_VERSION "2.8.8dev.14"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Wed, 15 Aug 2012 17:47:03 -0700"
+#PRCS LYNX_DATE "Wed, 22 Aug 2012 03:53:37 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/makefile.in b/makefile.in
index 18c05a51..a2ec18d0 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.126 2012/08/16 00:48:47 tom Exp $
+# $LynxId: makefile.in,v 1.127 2012/08/22 11:11:26 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -38,7 +38,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.8dev.13
+LYNX_VERSION	= 2.8.8dev.14
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/userdefs.h b/userdefs.h
index c34f3c49..35c38a26 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.271 2012/08/16 00:48:47 tom Exp $
+ * $LynxId: userdefs.h,v 1.272 2012/08/22 11:11:26 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1432,11 +1432,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.8dev.13"
+#define LYNX_VERSION "2.8.8dev.14"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Wed, 15 Aug 2012 17:47:03 -0700"
+#define LYNX_DATE "Wed, 22 Aug 2012 03:53:37 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-17 21:49:54 +0000