Commit fe864a19 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.8pre5

parent d341ccc3
-- $LynxId: CHANGES,v 1.730 2014/02/04 01:45:19 tom Exp $
-- $LynxId: CHANGES,v 1.738 2014/02/14 00:35:10 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2014-02-14 (2.8.8pre.5)
* change quoting for fixup to help_files.sed in 2.8.8dev.17 to work around
bug in cygwin's make/sed programs -TD
* change quality value for application/xhtml+xml mime type added for Debian
#184482, to ensure that it is offered as one of Lynx's internal types on
an "Accept:" line sent to the server (Debian #725178) -TD
* trim unexpected query-parameters from file: URIs when checking for their
presentation and compression types. Not all browsers do this, etc. -TD
* modify forms-submit to trim query-parameters from the action URI if it
happens to be a file-URL. IE and some other browsers do this. The RFCs
do not mention this since forms are an HTTP feature (Debian #738121) -TD
* reviewed command-line options which were not provided in lynx.cfg; added
others which could be useful for dumps (i.e., force_html, hiddenlinks,
listonly, list_inline, localhost, short_url, with_backspaces) -TD:
* add dont_wrap_pre to lynx.cfg (request by GV) -TD
* use idn_free() rather than ordinary free (patch by GV)
* build-fix when alt-bindings are disabled (patch by GV)
* correct sense of --disable-alt-bindings option in configure script (prompted
by report by GV) -TD
2014-02-04 (2.8.8pre.4)
* modify the LOCALE_CHARSET feature to provide a default value for the
ASSUMED_CHARSET feature aka "display-charset" (Debian #737416) -TD
......
lynx-dev (2.8.8pre.4) unstable; urgency=low
lynx-dev (2.8.8pre.5) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 19 Jan 2014 06:47:17 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 07 Feb 2014 20:00:47 -0500
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
; $LynxId: lynx.nsi,v 1.14 2014/01/19 11:47:17 tom Exp $
; $LynxId: lynx.nsi,v 1.15 2014/02/08 01:00:47 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 "8"
!define VERSION_LEVEL "2004"
!define VERSION_PATCH "pre.4"
!define VERSION_LEVEL "2005"
!define VERSION_PATCH "pre.5"
!define SUBKEY "Lynx"
......
# $LynxId: lynx.spec,v 1.22 2014/01/19 11:47:17 tom Exp $
# $LynxId: lynx.spec,v 1.23 2014/02/08 01:00:47 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.8
Release: pre.4
Release: pre.5
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.8pre.4"
#define LYNX_VERSION "2.8.8pre.5"
; most-recent full release and target
#define LYNX_RELEASE "2.8.7"
......
Lynx README file
Lynx Version 2.8.7 is the latest release (July 2009).
Lynx Version 2.8.8 is the latest release (February 2014).
See the CHANGES file for a complete record of all changes and bug fixes.
New releases are announced on the lynx-dev mailing list (see below).
......@@ -150,5 +150,5 @@ LYNX-DEV MAILING LIST
------------------------------------------------------------------------------
-- vile:txtmode fc=72 noti
-- $LynxId: README,v 1.29 2013/10/13 17:33:49 tom Exp $
-- $LynxId: README,v 1.30 2014/02/13 13:25:42 tom Exp $
------------------------------------------------------------------------------
/*
* $LynxId: HTFile.c,v 1.139 2013/11/28 11:33:56 tom Exp $
* $LynxId: HTFile.c,v 1.142 2014/02/13 18:30:01 tom Exp $
*
* File Access HTFile.c
* ===========
......@@ -173,6 +173,16 @@ static HTSuffix unknown_suffix =
static void free_suffixes(void);
#endif
static char *FindSearch(const char *filename)
{
char *result = 0;
if ((result = strchr(filename, '?')) == 0) {
result = strstr(filename, "%3F");
}
return result;
}
#ifdef LONG_LIST
static char *FormatStr(char **bufp,
char *start,
......@@ -886,9 +896,21 @@ HTFormat HTFileFormat(const char *filename,
int n;
int i;
int lf;
char *search;
VMS_DEL_VERSION(filename);
if ((search = FindSearch(filename)) != 0) {
char *newname = NULL;
HTFormat result;
StrAllocCopy(newname, filename);
*(FindSearch(newname)) = '\0';
result = HTFileFormat(newname, pencoding, pdesc);
free(newname);
return result;
}
if (pencoding)
*pencoding = NULL;
if (pdesc)
......@@ -1240,37 +1262,50 @@ CompressFileType HTCompressFileType(const char *filename,
int *rootlen)
{
CompressFileType result = cftNone;
size_t len = strlen(filename);
const char *ftype = filename + len;
char *search;
VMS_DEL_VERSION(filename);
if ((search = FindSearch(filename)) != 0) {
char *newname = NULL;
if ((len > 4)
&& !strcasecomp((ftype - 3), "bz2")
&& StrChr(dots, ftype[-4]) != 0) {
result = cftBzip2;
ftype -= 4;
} else if ((len > 3)
&& !strcasecomp((ftype - 2), "gz")
&& StrChr(dots, ftype[-3]) != 0) {
result = cftGzip;
ftype -= 3;
} else if ((len > 3)
&& !strcasecomp((ftype - 2), "zz")
&& StrChr(dots, ftype[-3]) != 0) {
result = cftDeflate;
ftype -= 3;
} else if ((len > 2)
&& !strcmp((ftype - 1), "Z")
&& StrChr(dots, ftype[-2]) != 0) {
result = cftCompress;
ftype -= 2;
}
StrAllocCopy(newname, filename);
newname[((const char *) search) - filename] = '\0';
result = HTCompressFileType(newname, dots, rootlen);
free(newname);
} else {
size_t len;
const char *ftype;
VMS_DEL_VERSION(filename);
len = strlen(filename);
ftype = filename + len;
if ((len > 4)
&& !strcasecomp((ftype - 3), "bz2")
&& StrChr(dots, ftype[-4]) != 0) {
result = cftBzip2;
ftype -= 4;
} else if ((len > 3)
&& !strcasecomp((ftype - 2), "gz")
&& StrChr(dots, ftype[-3]) != 0) {
result = cftGzip;
ftype -= 3;
} else if ((len > 3)
&& !strcasecomp((ftype - 2), "zz")
&& StrChr(dots, ftype[-3]) != 0) {
result = cftDeflate;
ftype -= 3;
} else if ((len > 2)
&& !strcmp((ftype - 1), "Z")
&& StrChr(dots, ftype[-2]) != 0) {
result = cftCompress;
ftype -= 2;
}
*rootlen = (int) (ftype - filename);
*rootlen = (int) (ftype - filename);
CTRACE((tfp, "HTCompressFileType(%s) returns %d:%s\n",
filename, (int) result, filename + *rootlen));
CTRACE((tfp, "HTCompressFileType(%s) returns %d:%s\n",
filename, (int) result, filename + *rootlen));
}
return result;
}
......
/*
* $LynxId: HTParse.c,v 1.71 2013/11/28 11:14:12 tom Exp $
* $LynxId: HTParse.c,v 1.75 2014/02/12 23:15:42 tom Exp $
*
* Parse HyperText Document Address HTParse.c
* ================================
......@@ -24,6 +24,7 @@
#ifdef USE_IDNA
#include <idna.h>
#include <idn-free.h>
#endif
#define HEX_ESCAPE '%'
......@@ -300,8 +301,8 @@ static void convert_to_idna(char *host)
buffer,
idna_strerror((Idna_rc) code)));
}
if (output) /* "(free)" to bypass LYLeaks.c */
(free) (output);
if (output)
idn_free (output);
}
free(buffer);
}
......
/*
* $LynxId: config.hin,v 1.132 2013/10/23 22:23:59 tom Exp $
* $LynxId: config.hin,v 1.135 2014/02/12 22:14:34 tom Exp $
* vile:cmode
*
* The configure script translates "config.hin" into "lynx_cfg.h"
......
#! /bin/sh
# From configure.in 2.8.8pre.3.
# From configure.in 2.8.8pre.5.
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20121002.
#
......@@ -742,7 +742,7 @@ Basic Configuration Options:
--enable-htmlized-cfg build htmlized lynx.cfg
--enable-local-docs link local doc-directory to help-page
--with-mime-libdir=DIR MIME data, mime.types and mailcap (default: /etc)
--enable-locale-charset use locale-charset selection logic
--disable-locale-charset use locale-charset selection logic
--with-charsets=list limit charsets to given list of MIME names
Experimental Options:
--disable-bibp-urls disable support for bibp: URLs
......@@ -1273,7 +1273,7 @@ rm conftest.sed
PACKAGE=lynx
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.8pre.4
VERSION=2.8.8pre.5
echo "$as_me:1278: checking for DESTDIR" >&5
echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
......@@ -32492,14 +32492,14 @@ echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO
# Check whether --enable-alt-bindings or --disable-alt-bindings was given.
if test "${enable_alt_bindings+set}" = set; then
enableval="$enable_alt_bindings"
test "$enableval" != yes && enableval=no
if test "$enableval" != "no" ; then
test "$enableval" != no && enableval=yes
if test "$enableval" != "yes" ; then
use_alt_bindings=$enableval
else
use_alt_bindings=yes
fi
else
enableval=no
enableval=yes
use_alt_bindings=yes
fi;
dnl $LynxId: configure.in,v 1.259 2014/01/19 11:47:17 tom Exp $
dnl $LynxId: configure.in,v 1.264 2014/02/12 22:17:21 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.8pre.4)
AC_REVISION(2.8.8pre.5)
# 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.8pre.4
VERSION=2.8.8pre.5
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -680,7 +680,7 @@ AC_DEFINE_UNQUOTED(MIME_LIBDIR,"$MIME_LIBDIR",[Define to default path for MIME l
dnl --------------------------------------------------------------------------
AC_MSG_CHECKING(if locale-charset selection logic should be used)
CF_ARG_DISABLE(locale-charset,
[ --enable-locale-charset use locale-charset selection logic],
[ --disable-locale-charset use locale-charset selection logic],
[use_locale_charset=$enableval],
[use_locale_charset=yes])
AC_MSG_RESULT($use_locale_charset)
......@@ -998,7 +998,7 @@ Miscellaneous Options:)
dnl --------------------------------------------------------------------------
AC_MSG_CHECKING(if alternative line-edit bindings should be used)
CF_ARG_ENABLE(alt-bindings,
CF_ARG_DISABLE(alt-bindings,
[ --disable-alt-bindings disable alternative line-edit bindings],
[use_alt_bindings=$enableval],
[use_alt_bindings=yes])
......
-- $LynxId: README.metrics,v 1.9 2014/02/03 00:34:01 tom Exp $
-- $LynxId: README.metrics,v 1.12 2014/02/13 23:56:42 tom Exp $
This is a short summary of code metrics showing how lynx has grown from
release to release. It also shows how the original codebase has
......@@ -23,8 +23,8 @@ Release Current Original
15573 13587 3.9 8.0
2.8.7 441453 180674 25064 23101 5.7 12.8
15436 13473 3.5 7.5
2.8.8pre.4 465760 184841 24026 22288 5.2 12.1
14602 12864 3.1 7.0
2.8.8 465971 184961 24031 22293 5.2 12.1
14612 12874 3.1 7.0
Beginning with 2.8.6, the percentage of the remaining original codebase is
shown on two lines (i.e., comparing against 2.4.2 indented to use the current
......@@ -203,28 +203,29 @@ There is neither a source repository nor a mailing-list archive to consult to
resolve these issues.
However, some information can be gleaned from the existing change-logs
to show the principal contributors for each release:
to show the principal contributors for each release (i.e., not listing those
with less than 1%):
** credits from CHANGES docs/CHANGES2.8 (4319.6 changes)
** credits from CHANGES docs/CHANGES2.8 (4328.6 changes)
1.1 Brian J Pardy
3.0 Doug Kaufman
6.5 Foteos Macrides
2.0 Ilya Zakharevich
16.4 Klaus Weide
16.3 Klaus Weide
7.9 Leonid Pauzner
1.2 Paul Gilmartin
47.4 Thomas E Dickey
2.0 Vlad Harchev
** credits from CHANGES docs/CHANGES* (5786.6 changes)
** credits from CHANGES docs/CHANGES* (5795.6 changes)
2.3 Doug Kaufman
23.6 Foteos Macrides
1.5 Ilya Zakharevich
12.5 Klaus Weide
12.4 Klaus Weide
5.9 Leonid Pauzner
35.4 Thomas E Dickey
1.5 Vlad Harchev
3.6 unknown
** credits from CHANGES (3399.6 changes)
** credits from CHANGES (3408.6 changes)
1.4 Brian J Pardy
3.5 Doug Kaufman
2.5 Ilya Zakharevich
......
# $LynxId: lynx.cfg,v 1.238 2014/02/04 01:36:21 tom Exp $
# $LynxId: lynx.cfg,v 1.242 2014/02/13 00:39:00 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.8pre.4"
#PRCS LYNX_VERSION "2.8.8pre.5"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Tue, 04 Feb 2014 16:50:18 -0800"
#PRCS LYNX_DATE "Fri, 14 Feb 2014 05:00:16 -0800"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......@@ -858,14 +858,17 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
.h2 SOURCE_CACHE
# SOURCE_CACHE sets the source caching behavior for Lynx:
#
# FILE causes Lynx to keep a temporary file for each cached document
# containing the HTML source of the document, which it uses to regenerate
# the document when certain settings are changed (for instance,
# historical vs. minimal vs. valid comment parsing) instead of reloading
# the source from the network.
#
# MEMORY is like FILE, except the document source is kept in memory. You
# may wish to adjust DEFAULT_CACHE_SIZE and DEFAULT_VIRTUAL_MEMORY_SIZE
# accordingly.
#
# NONE is the default; the document source is not cached, and is reloaded
# from the network when needed.
#
......@@ -3672,6 +3675,7 @@ COLOR:6:brightred:black
#
# See also BLAT_MAIL and SYSTEM_MAIL flags.
#ALT_BLAT_MAIL:FALSE
.h1 Internal Behavior
.h2 TRACK_INTERNAL_LINKS
# With `internal links' (links within a document to a location within the same
......@@ -3685,3 +3689,58 @@ COLOR:6:brightred:black
# asserts that the feature could actually result in inappropriate resubmission
# of form content.
#TRACK_INTERNAL_LINKS:FALSE
.h1 HTML Parsing
.h2 DONT_WRAP_PRE
# Inhibit wrapping of text when -dump'ing and -crawl'ing, mark
# wrapped lines of <pre> in interactive session.
#DONT_WRAP_PRE:FALSE
.h2 FORCE_HTML
# When true, this forces the first document specified on the command-line
# to be interpreted as HTML.
#FORCE_HTML:FALSE
.h2 HIDDENLINKS
# Control the display of hidden links, using one of the following names:
#
# MERGE
# hidden links show up as bracketed numbers and are numbered
# together with other links in the sequence of their occurrence
# in the document.
#
# LISTONLY
# hidden links are shown only on L)ist screens and listings
# generated by -dump or from the P)rint menu, but appear
# separately at the end of those lists. This is the default
# behavior.
#
# IGNORE
# hidden links do not appear even in listings.
#
#HIDDENLINKS:LISTONLY
.h1 Appearance
.h2 SHORT_URL
# If true, show very long URLs in the status line with "..." to represent the
# portion which cannot be displayed. The beginning and end of the URL are
# displayed, rather than suppressing the end.
#SHORT_URL:FALSE
.h1 Dump/Crawl
.h2 LISTONLY
# For -dump, show only the list of links.
#LISTONLY:FALSE
.h2 LIST_INLINE
# For -dump, show the links inline with the text.
#LIST_INLINE:FALSE
.h2 LOCALHOST
# When true, this disables URLs that point to remote hosts.
#LOCALHOST:FALSE
.h2 WITH_BACKSPACES
# Emit backspaces in output if -dump'ing or -crawl'ing (like 'man' does).
#WITH_BACKSPACES:FALSE
......@@ -1095,7 +1095,7 @@
for message catalogs.
2 Notes
This is the Lynx v2.8.7 Release; development is in progress for 2.8.8.
This is the Lynx v2.8.8 Release; development is in progress for 2.8.9.
If you wish to contribute to the further development of Lynx, subscribe
to our mailing list. Send email to <lynx-dev-request@nongnu.org> with
......
.\" $LynxId: lynx.man,v 1.109 2013/12/15 23:20:40 Bjarni.I.Gislason Exp $
.\" $LynxId: lynx.man,v 1.110 2014/02/13 13:32:15 tom Exp $
.\" **************************************************************************
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds AQ \(aq
......@@ -1222,7 +1222,7 @@ Currently, it is hard-coded to a wish list.
.B NLSPATH
This variable, if set, is used as the path prefix for message catalogs.
.SH NOTES
This is the \fILynx\fP v2.8.7 Release; development is in progress for 2.8.8.
This is the \fILynx\fP v2.8.8 Release; development is in progress for 2.8.9.
.PP
If you wish to contribute to the further development
of \fILynx\fR, subscribe to our mailing list.
......
<!-- $LynxId: Lynx_users_guide.html,v 1.123 2014/01/09 00:17:56 tom Exp $ -->
<!-- $LynxId: Lynx_users_guide.html,v 1.124 2014/02/13 13:24:06 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
......@@ -6,7 +6,7 @@
<meta name="generator" content=
"HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
<title>Lynx Users Guide v2.8.7</title>
<title>Lynx Users Guide v2.8.8</title>
<link rev="made" href="mailto:lynx-dev@nongnu.org">
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
......@@ -15,7 +15,7 @@
</head>
<body>
<h1>Lynx Users Guide v2.8.7</h1>
<h1>Lynx Users Guide v2.8.8</h1>
<p>Lynx is a fully-featured <em>World Wide Web</em>
(<em>WWW</em>) client for users running cursor-addressable,
......@@ -1381,7 +1381,7 @@
indicate the User-Agent is displayed here. Changes may be
disallowed via the <em>-restrictions</em> switch. Otherwise,
the header can be changed temporarily to a string such as
<em>L_y_n_x/2.8.7</em> for access to sites which discriminate
<em>L_y_n_x/2.8.8</em> for access to sites which discriminate
against Lynx based on checks for the presence of "Lynx" in the
header. If the User-Agent header has been changed, it can be
restored to the built-in default value by deleting the modified
......@@ -4419,7 +4419,9 @@ the other two cannot be saved between sessions.
The 2.8.5 development set was released as v2.8.6 in October
2006.<br>
The 2.8.6 development set was released as v2.8.7 in July
2009.<br></p>
2009.<br>
The 2.8.7 development set was released as v2.8.8 in February
2014.<br></p>
<p>Since early 1997, the Lynx code has expanded into
autoconfigure and PC versions. The branching of the Lynx source
......
# $LynxId: makefile.in,v 1.139 2014/01/19 14:40:59 tom Exp $
# $LynxId: makefile.in,v 1.142 2014/02/14 00:30:43 tom Exp $
##makefile for lynx
SHELL = @CONFIG_SHELL@
......@@ -46,14 +46,14 @@ 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.8pre.4
LYNX_VERSION = 2.8.8pre.5
## 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.
VERSION = 2-8-8
##this is the name of the directory the lynx source code is in.
##(e.g., lynx2-8-7, not the full path)
##(e.g., lynx2-8-8, not the full path)
lynxdir= lynx$(VERSION)
lynxname= lynx$(VERSION)
......@@ -401,7 +401,7 @@ help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt
-e 's%\(.*\)=\(.*\.html\)$$%s=\2=\2$(COMPRESS_EXT)=g%' \
-e 's%\.html=%\\.html=%' \
help_files.tmp | $(FIX_SED) >> $@
@ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\\(\$(COMPRESS_EXT)\\)*\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> $@; fi
@ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo "s%\\(\$(COMPRESS_EXT)\\)*\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g" >> $@; fi
@-rm -f help_files.tmp
install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $(SYSCONFDIR)
......
#!/bin/bash.exe
# $LynxId: conf.mingw.sh,v 1.2 2014/02/13 13:30:54 tom Exp $
LYNX_DEV=d
LYNX_TOP=/cygwin/mingw/lynx2.8.7dev.13
LYNX_ETC=$LYNX_TOP/lynx-conf
LDFLAGS="-mno-cygwin -static -L/mingw/lib" \
LIBS="-lwsock32 -lgdi32 -lmsvcrt -liconv" \
CFLAGS="-mno-cygwin -I/mingw/include -I/mingw/include/openssl -W -Wall -O3 -D_WINDOWS -DSH_EX -DWIN_EX -DNOUSERS -DNOSIGHUP -DDOSPATH -DUSE_ALT_BLAT_MAILER -DBOXHORI=0 -DBOXVERT=0" \
CPPFLAGS="-mno-cygwin -I/mingw/include -I/mingw/include/openssl" \
./configure --prefix=/d/cygwin/mingw/lynx2.8.7dev.13/lynx-conf \
./configure --prefix=/$LYNX_DEV$LYNX_ETC \
--host=mingw32 \
--disable-dired-override \
--disable-full-paths \
......@@ -19,11 +25,11 @@ CPPFLAGS="-mno-cygwin -I/mingw/include -I/mingw/include/openssl" \
--enable-nls \
--enable-vertrace \
--includedir=/mingw/include \
--sysconfdir=/d/cygwin/mingw/lynx2.8.7dev.13/lynx-conf \
--datadir=/d/cygwin/mingw/lynx2.8.7dev.13/lynx-conf \
--sysconfdir=/$LYNX_DEV$LYNX_ETC \
--datadir=/$LYNX_DEV$LYNX_ETC \
--with-bzlib \
--with-cfg-file=d:/cygwin/mingw/lynx2.8.7dev.13/lynx-conf/lynx.cfg \
--with-lss-file=d:/cygwin/mingw/lynx2.8.7dev.13/lynx-conf/lynx.lss \
--with-cfg-file=$LYNX_DEV:$LYNX_ETC/lynx.cfg \
--with-lss-file=$LYNX_DEV:$LYNX_ETC/lynx.lss \
--with-mime-libdir=c:/ \
--with-nls-datadir=d:/cygwin/mingw/share \
--with-pkg-config=no \
......
/*
* $LynxId: GridText.c,v 1.274 2013/11/28 11:16:50 tom Exp $
* $LynxId: GridText.c,v 1.277 2014/02/13 19:32:01 tom Exp $
*
* Character grid hypertext object
* ===============================
......@@ -11114,6 +11114,7 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc,
*/
StrAllocCat(temp, "?");
BStrCat0(my_query, temp);
free(temp);
} else {
/*
* We are submitting POST content to a server,
......@@ -11797,6 +11798,20 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc,
} else {
_statusline(SUBMITTING_FORM);
/*
* File-URLs (whether via GET or POST) cannot provide search queries.
* The relevant RFCs 1630, 1738 are silent on what to do with
* unexpected query parameters in a file-URL.
*
* Internet Explorer trims the query string here (after all, a "?" is
* not a legal part of a Windows filename), and other browsers copy the
* behavior. We do this for compatibility, in case someone cares.
*/
if (my_query != 0 &&
my_query->len > 5 &&
!strncmp(my_query->str, "file:", 5)) {
strtok(my_query->str, "?");
}
if (submit_item->submit_method == URL_POST_METHOD || Boundary) {
LYFreePostData(doc);
doc->post_data = my_query;
......@@ -11805,9 +11820,10 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc,
StrAllocCopy(doc->address, submit_item->submit_action);
} else { /* GET_METHOD */
HTSABCat(&my_query, "", 1); /* append null */
StrAllocCopy(doc->address, BStrData(my_query)); /* FIXME? */
StrAllocCopy(doc->address, BStrData(my_query));
LYFreePostData(doc);
FREE(content_type_out);
HTSABFree(&my_query);
}
result = 1;
}
......
/*
* $LynxId: HTInit.c,v 1.85 2013/11/28 11:17:21 tom Exp $
* $LynxId: HTInit.c,v 1.88 2014/02/13 21:39:04 tom Exp $
*
* Configuration-specific Initialization HTInit.c
* ----------------------------------------
......@@ -115,15 +115,13 @@ void HTFormatInit(void)
SET_INTERNL("www/compressed", "www/dump", HTCompressed, 1.0);
/*
* Added the following to support some content types beginning to surface.
* The following support some content types seen here/there:
*/
SET_INTERNL("application/html", "text/x-c", HTMLToC, 0.5);
SET_INTERNL("application/html", "text/plain", HTMLToPlain, 0.5);
SET_INTERNL("text/css", "text/plain", HTMLToPlain, 0.5);
SET_INTERNL("application/html", "www/present", HTMLPresent, 2.0);
SET_INTERNL("application/xhtml+xml", "www/present", HTMLPresent, 2.0);
SET_INTERNL("application/xml", "www/present", HTMLPresent, 2.0);
SET_INTERNL("application/html", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("application/xml", "www/present", HTMLPresent, 2.0);
SET_INTERNL("application/x-wais-source", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("application/x-wais-source", "www/present", HTWSRCConvert, 2.0);
SET_INTERNL("application/x-wais-source", "www/download", HTWSRCConvert, 1.0);
......@@ -143,19 +141,49 @@ void HTFormatInit(void)
SET_EXTERNL("www/source", "www/dump", HTDumpToStdout, 1.0);
/*
* Now add our basic conversions.
* Other internal types, which must precede the "www/present" entries
* below (otherwise, they will be filtered out in HTFilterPresentations()).
*/
SET_INTERNL("text/x-sgml", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/x-sgml", "www/present", HTMLPresent, 2.0);
SET_INTERNL("text/css", "text/plain", HTMLToPlain, 0.5);
SET_INTERNL("text/html", "text/plain", HTMLToPlain, 0.5);
SET_INTERNL("text/html", "text/x-c", HTMLToC, 0.5);
SET_INTERNL("text/html", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/plain", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/sgml", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/sgml", "www/present", HTMLPresent, 1.0);
SET_INTERNL("text/x-sgml", "www/source", HTPlainPresent, 1.0);
/*
* Now add our basic conversions. These include the types which will
* be listed in a "Accept:" line sent to a server. These criteria are
* used in HTFilterPresentations() to select acceptable types:
*
* a) input is not "www/mime" or "www/compressed"
* b) output is "www/present"
* c) quality is in the range 0.0 to 1.0, i.e., excludes the 2.0's.
*
* For reference:
* RFC 1874 - text/sgml
* RFC 2046 - text/plain
* RFC 2318 - text/css
* RFC 3023 - text/xml
* obsolete - text/x-sgml
*
* as well as
* http://www.iana.org/assignments/media-types/media-types.xhtml
*
* and
* http://www.w3.org/TR/xhtml-media-types/
*
* which describes
* application/xhtml+xml
* text/html
*/
SET_INTERNL("application/xhtml+xml", "www/present", HTMLPresent, 1.0);
SET_INTERNL("text/css", "www/present", HTPlainPresent, 1.0);
SET_INTERNL("text/plain", "www/present", HTPlainPresent, 1.0);
SET_INTERNL("text/plain", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/html", "www/source", HTPlainPresent, 1.0);
SET_INTERNL("text/html", "text/x-c", HTMLToC, 0.5);
SET_INTERNL("text/html", "text/plain", HTMLToPlain, 0.5);
SET_INTERNL("text/html", "www/present", HTMLPresent, 1.0);
SET_INTERNL("text/plain", "www/present", HTPlainPresent, 1.0);
SET_INTERNL("text/sgml", "www/present", HTMLPresent, 1.0);
SET_INTERNL("text/x-sgml", "www/present", HTMLPresent, 2.0);
SET_INTERNL("text/xml", "www/present", HTMLPresent, 2.0);
if (LYisAbsPath(global_type_map)) {
......
/*
* $LynxId: LYEditmap.c,v 1.72 2013/11/28 11:18:33 tom Exp $
* $LynxId: LYEditmap.c,v 1.73 2014/02/08 01:12:58 Gisle.Vanem Exp $
*
* LYEditMap.c
* Keybindings for line and form editing.
......@@ -1750,9 +1750,11 @@ void LYinitEditmap(void)
LYEditorNames[j] = LYLineEditors[j].name;
initLineEditor(&LYLineEditors[j]);
}
#ifdef USE_ALT_BINDINGS
for (j = 0; j < TABLESIZE(LYModifierBindings); ++j) {
initLineEditor(&LYModifierBindings[j]);
}