about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--PACKAGE/debian/changelog4
-rw-r--r--PACKAGE/lynx.nsi6
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss2
-rw-r--r--configure.in6
-rw-r--r--lynx.cfg4
-rw-r--r--makefile.in4
-rw-r--r--src/LYIcon.rc10
-rw-r--r--src/LYMainLoop.c30
-rw-r--r--userdefs.h4
11 files changed, 43 insertions, 37 deletions
diff --git a/CHANGES b/CHANGES
index 7e29a3a0..31918a62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
--- $LynxId: CHANGES,v 1.746 2014/03/12 18:39:52 tom Exp $
+-- $LynxId: CHANGES,v 1.748 2014/06/06 00:18:12 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2014-06-05 (2.8.9dev.2)
+* add check to ensure that "submit" command from 2.8.8dev.10 is performed
+  in a form (report by Karen Lewellen) -TD
+
 2014-03-12 (2.8.9dev.1)
 
 2014-03-09 (2.8.8rel.2)
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index ab165e9f..2fc69962 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.1) unstable; urgency=low
+lynx-dev (2.8.9dev.2) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Mar 2014 17:44:33 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 16 Mar 2014 11:03:40 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index d75cd7bb..a175acca 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.18 2014/03/10 21:44:33 tom Exp $

+; $LynxId: lynx.nsi,v 1.19 2014/03/16 15:03:40 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "9"

-!define VERSION_LEVEL "1001"

-!define VERSION_PATCH "dev.1"

+!define VERSION_LEVEL "1002"

+!define VERSION_PATCH "dev.2"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 06146a8a..387eccf4 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.26 2014/03/10 21:44:33 tom Exp $
+# $LynxId: lynx.spec,v 1.27 2014/03/16 15:03:40 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.1
+Release: dev.2
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 577d529b..30110eff 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.9dev.1"
+#define LYNX_VERSION "2.8.9dev.2"
 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.8"

diff --git a/configure.in b/configure.in
index 6eee4d1e..f8b409bf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.268 2014/03/10 22:07:34 tom Exp $
+dnl $LynxId: configure.in,v 1.269 2014/03/16 15:03:40 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.9dev.1)
+AC_REVISION(2.8.9dev.2)
 
 # 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.9dev.1
+VERSION=2.8.9dev.2
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index 7f13a8bd..af767756 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.248 2014/03/12 19:14:45 tom Exp $
+# $LynxId: lynx.cfg,v 1.249 2014/03/16 15:03:40 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.9dev.1"
+#PRCS LYNX_VERSION "2.8.9dev.2"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
 #PRCS LYNX_DATE "Wed, 12 Mar 2014 12:14:45 -0700"
diff --git a/makefile.in b/makefile.in
index ad784419..23eb6863 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.146 2014/03/10 22:07:34 tom Exp $
+# $LynxId: makefile.in,v 1.147 2014/03/16 15:03:40 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,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.9dev.1
+LYNX_VERSION	= 2.8.9dev.2
 
 ## 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/src/LYIcon.rc b/src/LYIcon.rc
index ed98e5c1..ee6861ae 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.12 2014/03/10 21:44:33 tom Exp $
+// $LynxId: LYIcon.rc,v 1.13 2014/03/16 15:03:40 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1001
-PRODUCTVERSION 2,8,9,1001
+FILEVERSION    2,8,9,1002
+PRODUCTVERSION 2,8,9,1002
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://lynx.isc.org"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1001"
+      VALUE "FileVersion",      "2.8.9.1002"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2014 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1001"
+      VALUE "ProductVersion",   "2.8.9.1002"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 6fa2af27..b91f7966 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.230 2013/11/28 11:20:34 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.231 2014/06/06 00:13:03 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -1549,21 +1549,23 @@ static void handle_LYK_SUBMIT(int cur, DocInfo *doc, BOOLEAN *refresh_screen)
 	form = make;
     }
 
-    StrAllocCopy(save_submit_action, form->submit_action);
-    form->submit_action = HTPrompt(EDIT_SUBMIT_URL, form->submit_action);
+    if (form != 0) {
+	StrAllocCopy(save_submit_action, form->submit_action);
+	form->submit_action = HTPrompt(EDIT_SUBMIT_URL, form->submit_action);
 
-    if (isEmpty(form->submit_action) ||
-	(!isLYNXCGI(form->submit_action) &&
-	 StrNCmp(form->submit_action, "http", 4))) {
-	HTUserMsg(FORM_ACTION_NOT_HTTP_URL);
-    } else {
-	HTInfoMsg(SUBMITTING_FORM);
-	HText_SubmitForm(form, doc, form->name, form->value);
-	*refresh_screen = TRUE;
-    }
+	if (isEmpty(form->submit_action) ||
+	    (!isLYNXCGI(form->submit_action) &&
+	     StrNCmp(form->submit_action, "http", 4))) {
+	    HTUserMsg(FORM_ACTION_NOT_HTTP_URL);
+	} else {
+	    HTInfoMsg(SUBMITTING_FORM);
+	    HText_SubmitForm(form, doc, form->name, form->value);
+	    *refresh_screen = TRUE;
+	}
 
-    StrAllocCopy(form->submit_action, save_submit_action);
-    FREE(make);
+	StrAllocCopy(form->submit_action, save_submit_action);
+	FREE(make);
+    }
 }
 
 static void handle_LYK_RESET(int cur, BOOLEAN *refresh_screen)
diff --git a/userdefs.h b/userdefs.h
index 7feeb47d..3f3da4a5 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.296 2014/03/12 19:14:45 tom Exp $
+ * $LynxId: userdefs.h,v 1.297 2014/03/16 15:03:40 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,7 +1442,7 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.1"
+#define LYNX_VERSION "2.8.9dev.2"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */