Commit b3fed630 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.8dev.15

parent c26c6cdc
-- $LynxId: CHANGES,v 1.619 2012/08/22 09:56:16 tom Exp $
-- $LynxId: CHANGES,v 1.634 2012/11/18 21:54:53 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2012-11-18 (2.8.8dev.15)
* corrected position of highlighting from search/whereis function when using
multibyte characters (Debian #673385) -TD
* modify default case for HTLoadGopher() to use the file's suffix to obtain
a MIME mapping rather than always storing unknown types to disk (suggested by
Dario Niederman) -TD
* modify ^X-e handling to not limit the result to the form field's length
(report by Keith Bowes) -TD
* modify the Inno Setup files to show lynx's version numbers. Development
and prerelease versions are indicated in the numeric-only versions by
prefixing a "10" or "20" -TD
* ask for filesize when downloading via ftp, to use this in the read-progress
ETA -TD
* fix special case when -dont_wrap_pre option is used, to restore space between
words which was lost when inserting a soft newline used to splice together
segments of a long line (Ubuntu #806749) -TD
* provide more readable ETA message as an option (prompted by patch by Joerg
Hahn) -TD
* add GNUTLS call to enable SNI (Server Name Indication) extension (Ubuntu
#732177) -TD
* correct typo for -bibhost option in manpage (Redhat #854574) -TD
* revise nsl-fork logic for passing addrinfo and hostent data back to eliminate
fixed limit on the number of records to return -TD
* correct problem with loop logic in fill_addrinfo() exposed by multiple
addresses from
http://fbcdn-sphotos-d-a.akamaihd.net
(report/analysis by TG) -TD
* updates for configure script macros (TD):
+ add 3rd parameter to AC_DEFINE's to allow autoheader to run
+ remove unused macros
* update nl.po from
http://translationproject.org/latest/lynx
* improve checking of certificates in the gnutls_certificate_verify_peers2()
by handling special case where self-signed certificates should be reported
(patch by Jamie Strandboge).
* update config.guess (2012-09-25), config.sub (2012-08-18)
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:
* drop two files overlooked in previous commit (TD):
lynx.rsp and WWW/Library/Implementation/HTFWriter.c
2012-08-15 (2.8.8dev.13)
......
lynx-dev (2.8.8dev.15) unstable; urgency=high
* changes for dev.15
-- Thomas E. Dickey <dickey@invisible-island.net> Thu, 08 Nov 2012 17:39:36 -0500
lynx-dev (2.8.8dev.14) unstable; urgency=high
* fix regresion in dev.13
......
; $LynxId: lynx.iss,v 1.6 2012/02/13 22:17:17 tom Exp $
; $LynxId: lynx.iss,v 1.9 2012/11/16 10:00:03 tom Exp $
; vile:ts=2 sw=2 notabinsert
;
; This is the BASE script for different flavors of the installer for Lynx.
......@@ -82,8 +82,15 @@
[Setup]
AppName={#MyAppName}
#emit 'AppVersion=' + LYNX_VERSION
#emit 'VersionInfoDescription=Setup for "' + MyAppName + '"'
#define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00")
#define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10")
#define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20")
#emit 'VersionInfoVersion=' + LYNX_TARGET2
AppVerName={#MyAppVerName}
AppPublisher={#MyAppPublisher}
AppCopyright= 1997-2011,2012, Thomas E. Dickey
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
......
# $LynxId: lynx.spec,v 1.14 2012/08/22 10:21:56 tom Exp $
# $LynxId: lynx.spec,v 1.16 2012/11/17 01:55:11 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.8
Release: dev.14
Release: dev.15
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......@@ -24,6 +24,8 @@ HTTP, FTP, WAIS, and NNTP servers.
%define lynx_etc %{_sysconfdir}/lynx
%prep
%define debug_package %{nil}
%setup -q -n lynx%{version}%{release}
%build
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.8dev.14"
#define LYNX_VERSION "2.8.8dev.15"
#define MyAppName "Lynx"
; most-recent full release and target
#define LYNX_RELEASE "2.8.7"
#define LYNX_TARGETS "2.8.8"
#define MyAppName "Lynx - web browser"
#define MyAppPublisher "Thomas E Dickey"
#define MyAppURL "http://lynx.isc.org"
#define MyAppVerName "Lynx " + LYNX_VERSION
/*
* $LynxId: HTFTP.c,v 1.104 2012/08/15 23:14:42 tom Exp $
* $LynxId: HTFTP.c,v 1.106 2012/11/15 23:51:23 tom Exp $
*
* File Transfer Protocol (FTP) Client
* for a WorldWideWeb browser
......@@ -4007,6 +4007,22 @@ int HTFTPLoad(const char *name,
* dealing with if we don't know yet. - FM
*/
if (!(type) || (type && *type != 'D')) {
/*
* If we are retrieving a file we will (except for CMS) use
* binary mode, which lets us use the size command supported by
* ftp servers which implement RFC 3659. Knowing the size lets
* us in turn display ETA in the progress message -TD
*/
if (control->binary) {
int code;
off_t size;
status = send_cmd_2("SIZE", filename);
if (status == 2 &&
sscanf(response_text, "%d %" PRI_off_t, &code, &size) == 2) {
anchor->content_length = size;
}
}
status = send_cmd_2("RETR", filename);
if (status >= 5) {
int check;
......@@ -4078,11 +4094,6 @@ int HTFTPLoad(const char *name,
CTRACE((tfp, "TCP: Accepted new socket %d\n", status));
data_soc = status;
}
/* !ftp_local_passive */
#if 0 /* no - this makes the data connection go away too soon (2.8.3dev.22) */
if ((status = send_cmd_nowait("QUIT")) == 1)
outstanding++;
#endif
if (isDirectory) {
if (server_type == UNIX_SERVER && !unsure_type &&
......@@ -4170,13 +4181,6 @@ int HTFTPLoad(const char *name,
/* Reset buffering to control connection DD 921208 */
if (rv < 0) {
#if 0 /* any known servers where ABOR would work this way? */
if (rv == HT_INTERRUPTED || rv == -501)
if (send_cmd_nowait("ABOR") == 1) {
outstanding++;
CTRACE((tfp, "HTFTP: outstanding responses: %d\n", outstanding));
}
#endif
if (rv == -2) /* weird error, don't expect much response */
outstanding--;
else if (rv == HT_INTERRUPTED || rv == -1)
......
/*
* $LynxId: HTFormat.c,v 1.75 2012/08/10 11:48:05 tom Exp $
* $LynxId: HTFormat.c,v 1.76 2012/11/17 01:31:19 tom Exp $
*
* Manage different file formats HTFormat.c
* =============================
......@@ -498,19 +498,11 @@ HTStream *HTStreamStack(HTFormat rep_in,
HTPresentation *match;
HTStream *result;
CTRACE((tfp, "HTFormat: Constructing stream stack for %s to %s (%s)\n",
CTRACE((tfp, "StreamStack: Constructing stream stack for %s to %s (%s)\n",
HTAtom_name(rep_in),
HTAtom_name(rep_out),
NONNULL(anchor->content_type_params)));
/* don't return on WWW_SOURCE some people might like
* to make use of the source!!!! LJM
*/
#if 0
if (rep_out == WWW_SOURCE || rep_out == rep_in)
return sink; /* LJM */
#endif
if (rep_out == rep_in) {
result = sink;
......
/*
* $LynxId: HTGopher.c,v 1.55 2011/06/11 13:06:08 tom Exp $
* $LynxId: HTGopher.c,v 1.56 2012/11/17 01:33:36 tom Exp $
*
* GOPHER ACCESS HTGopher.c
* =============
......@@ -21,6 +21,7 @@
#define HTSTREAM_INTERNAL 1
#include <HTUtils.h> /* Coding convention macros */
#include <HTFile.h> /* For HTFileFormat() */
#ifndef DISABLE_GOPHER
#include <HTAlert.h>
......@@ -1692,8 +1693,6 @@ static int HTLoadCSO(const char *arg,
/* Load by name. HTLoadGopher
* =============
*
* Bug: No decoding of strange data types as yet.
*
*/
static int HTLoadGopher(const char *arg,
HTParentAnchor *anAnchor,
......@@ -1941,11 +1940,28 @@ static int HTLoadGopher(const char *arg,
s, sink);
break;
default:
{
HTAtom *encoding = 0;
const char *desc = 0;
HTFormat format = HTFileFormat(arg, &encoding, &desc);
/*
* Ignore WWW_BINARY (since that is returned by HTFileFormat when
* it does not have a representation), but otherwise use the
* result.
*/
if (format != WWW_BINARY) {
HTParseSocket(format, format_out, anAnchor, s, sink);
break;
}
}
/* FALL-THRU */
case GOPHER_MACBINHEX:
case GOPHER_PCBINARY:
case GOPHER_UUENCODED:
case GOPHER_BINARY:
default:
/*
* Specifying WWW_UNKNOWN forces dump to local disk.
*/
......
This diff is collapsed.
/*
* $LynxId: HTTP.c,v 1.124 2012/08/01 11:00:26 tom Exp $
* $LynxId: HTTP.c,v 1.126 2012/11/13 22:49:46 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -710,7 +710,12 @@ static int HTLoadHTTP(const char *arg,
/* get host we're connecting to */
ssl_host = HTParse(url, "", PARSE_HOST);
ssl_host = StripIpv6Brackets(ssl_host);
#if SSLEAY_VERSION_NUMBER >= 0x0900
#if defined(USE_GNUTLS_FUNCS)
ret = gnutls_server_name_set(handle->gnutls_state,
GNUTLS_NAME_DNS,
ssl_host, strlen(ssl_host));
CTRACE((tfp, "...called gnutls_server_name_set(%s) ->%d\n", ssl_host, ret));
#elif SSLEAY_VERSION_NUMBER >= 0x0900
#ifndef USE_NSS_COMPAT_INCL
if (!try_tls) {
handle->options |= SSL_OP_NO_TLSv1;
......@@ -768,16 +773,17 @@ static int HTLoadHTTP(const char *arg,
GNUTLS_VERIFY_DO_NOT_ALLOW_SAME |
GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
ret = gnutls_certificate_verify_peers2(handle->gnutls_state, &tls_status);
if (ret < 0) {
if (ret < 0 || (ret == 0 &&
tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND)) {
int flag_continue = 1;
char *msg2;
if (tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
if (ret == 0 && tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
msg2 = gettext("self signed certificate");
} else if (tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
msg2 = gettext("no issuer was found");
} else if (tls_status & GNUTLS_CERT_SIGNER_NOT_CA) {
msg2 = gettext("issuer is not a CA");
} else if (tls_status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
msg2 = gettext("the certificate has no known issuer");
} else if (tls_status & GNUTLS_CERT_REVOKED) {
msg2 = gettext("the certificate has been revoked");
} else {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# $LynxId: lynx.cfg,v 1.215 2012/01/31 23:48:09 tom Exp $
# $LynxId: lynx.cfg,v 1.222 2012/11/14 01:18:19 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.14"
#PRCS LYNX_VERSION "2.8.8dev.15"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Wed, 22 Aug 2012 03:53:37 -0700"
#PRCS LYNX_DATE "Sun, 18 Nov 2012 16:20:40 -0800"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......@@ -699,6 +699,8 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# FALSE or BYTES for bytes/second.
# KB,ETA to show Kilobytes/second with estimated completion time.
# BYTES,ETA to show BYTES/second with estimated completion time.
# KB2,ETA to show Kilobytes/second with estimated completion time using 2-digits.
# BYTES2,ETA to show BYTES/second with estimated completion time using 2-digits.
# Note that the "ETA" values are available if USE_READPROGRESS was defined.
#SHOW_KB_RATE:TRUE
......
This diff is collapsed.
.\" $LynxId: lynx.man,v 1.91 2012/08/13 01:05:48 tom Exp $
.\" $LynxId: lynx.man,v 1.93 2012/11/15 00:56:24 tom Exp $
.nr N -1
.nr D 5
.TH LYNX 1
......@@ -140,7 +140,7 @@ this switch.
prepend a request URL comment and BASE tag to text/html
outputs for \fB\-source\fR dumps.
.TP
.B \-bibp\fR=\fIURL
.B \-bibhost\fR=\fIURL
specify a local bibp server (default http://bibhost/).
.TP
.B \-blink
......@@ -269,8 +269,8 @@ set the display variable for X rexec-ed programs.
set the charset for the terminal output.
.TP
.B \-dont_wrap_pre
inhibit wrapping of text in <pre> when \fB\-dump\fR'ing and \fB\-crawl\fR'ing,
mark wrapped lines in interactive session.
inhibit wrapping of text when \fB\-dump\fR'ing and \fB\-crawl\fR'ing,
mark wrapped lines of <pre> in interactive session.
.TP
.B \-dump
dumps the formatted output of the default document or those
......
......@@ -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.14
LYNX_VERSION = 2.8.8dev.15
## 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.
......
This diff is collapsed.
/*
* $LynxId: GridText.c,v 1.239 2012/08/15 22:20:41 tom Exp $
* $LynxId: GridText.c,v 1.243 2012/11/18 22:09:20 tom Exp $
*
* Character grid hypertext object
* ===============================
......@@ -2163,10 +2163,9 @@ static void display_page(HText *text,
((int) line->offset + LenNeeded) <= DISPLAY_COLS) {
size_t itmp = 0;
size_t written = 0;
int x_pos = offset + (int) (cp - data);
int x_off = offset + (int) (cp - data);
size_t len = strlen(target);
size_t utf_extra = 0;
int y;
text->page_has_target = YES;
......@@ -2185,14 +2184,16 @@ static void display_page(HText *text,
/*
* Ignore special characters.
*/
x_pos--;
x_off--;
} else if (&data[itmp] >= cp) {
if (cp == &data[itmp]) {
/*
* First printable character of target.
*/
LYmove((i + title_lines), x_pos);
LYmove((i + title_lines),
line->offset + LYstrExtent2(line->data,
x_off - line->offset));
}
/*
* Output all the printable target chars.
......@@ -2226,17 +2227,11 @@ static void display_page(HText *text,
* line. -FM
*/
LYstopTargetEmphasis();
LYGetYX(y, offset);
(void) y;
data = (char *) &data[itmp];
offset = (int) (data - line->data + line->offset);
/*
* Adjust the cursor position, should we be at
* the end of the line, or not have another hit
* in it. -FM
*/
LYmove((i + title_lines + 1), 0);
} /* end while */
LYmove((i + title_lines + 1), 0);
#endif /* USE_COLOR_STYLE */
#endif /* SHOW_WHEREIS_TARGETS */
......@@ -4277,6 +4272,9 @@ void HText_appendCharacter(HText *text, int ch)
target_cu + UTF_XLEN(ch) >= LYcols_cu(text))) {
int saved_kanji_buf;
eGridState saved_state;
BOOL add_blank = (dont_wrap_pre
&& line->size
&& (line->data[line->size - 1] == ' '));
new_line(text);
line = text->last_line;
......@@ -4286,6 +4284,8 @@ void HText_appendCharacter(HText *text, int ch)
text->kanji_buf = '\0';
text->state = S_text;
HText_appendCharacter(text, LY_SOFT_NEWLINE);
if (add_blank)
HText_appendCharacter(text, ' ');
text->kanji_buf = saved_kanji_buf;
text->state = saved_state;
}
......@@ -13345,14 +13345,10 @@ void HText_EditTextField(LinkInfo * form_link)
if ((ebuf = readEditedFile(ed_temp)) != 0) {
/*
* Only use the first line of the result, and only that up to
* the size of the field.
* Only use the first line of the result.
*/
for (p = ebuf; *p != '\0'; ++p) {
if ((p - ebuf) >= form->size - 1) {
*p = '\0';
break;
} else if (*p == '\n' || *p == '\r') {
if (*p == '\n' || *p == '\r') {
*p = '\0';
break;
}
......
/*
* $LynxId: HTAlert.c,v 1.95 2012/02/08 01:45:28 tom Exp $
* $LynxId: HTAlert.c,v 1.97 2012/11/16 01:22:25 tom Exp $
*
* Displaying messages and getting input for Lynx Browser
* ==========================================================
......@@ -167,6 +167,7 @@ const char *HTProgressUnits(int rate)
return ((rate == rateKB)
#ifdef USE_READPROGRESS
|| (rate == rateEtaKB)
|| (rate == rateEtaKB2)
#endif
)? kbunits : bunits;
}
......@@ -176,7 +177,7 @@ static const char *sprint_bytes(char *s, off_t n, const char *was_units)
static off_t kb_units = 1024;
const char *u = HTProgressUnits(LYTransferRate);
if (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe) {
if (isRateInKB(LYTransferRate)) {
if (n >= 10 * kb_units) {
sprintf(s, "%" PRI_off_t, CAST_off_t (n / kb_units));
} else if (n > 999) { /* Avoid switching between 1016b/s and 1K/s */
......@@ -196,16 +197,40 @@ static const char *sprint_bytes(char *s, off_t n, const char *was_units)
}
#ifdef USE_READPROGRESS
#define TIME_HMS_LENGTH (16)
#define TIME_HMS_LENGTH (36)
static char *sprint_tbuf(char *s, long t)
{
if (t > 3600)
sprintf(s, "%ldh%ldm%lds", t / 3600, (t / 60) % 60, t % 60);
else if (t > 60)
sprintf(s, "%ldm%lds", t / 60, t % 60);
else
sprintf(s, "%ld sec", t);
return s;
const char *format = ((LYTransferRate == rateEtaBYTES2 ||
LYTransferRate == rateEtaKB2)
? "% 2ld%c"
: "%ld%c");
char *base = s;
if (t < 0) {
strcpy(s, "forever");
} else {
if (t > (3600 * 24)) {
sprintf(s, format, t / (3600 * 24), 'd');
s += strlen(s);
t %= (3600 * 24);
}
if (t > 3600) {
sprintf(s, format, t / 3600, 'h');
s += strlen(s);
t %= 3600;
}
if (t > 60) {
sprintf(s, format, t / 60, 'm');
s += strlen(s);
t %= 60;
}
if (s == base) {
sprintf(s, "% 2ld sec", t);
} else if (t != 0) {
sprintf(s, format, t, 's');
}
}
return base;
}
#endif /* USE_READPROGRESS */
......@@ -339,7 +364,9 @@ void HTReadProgress(off_t bytes, off_t total)
#ifdef USE_READPROGRESS
if (LYTransferRate == rateEtaBYTES
|| LYTransferRate == rateEtaKB) {
|| LYTransferRate == rateEtaKB
|| LYTransferRate == rateEtaBYTES2
|| LYTransferRate == rateEtaKB2) {
char tbuf[TIME_HMS_LENGTH];
if (now - last_active >= 5)
......
/*
* $LynxId: LYGlobalDefs.h,v 1.132 2012/07/04 23:34:06 tom Exp $
* $LynxId: LYGlobalDefs.h,v 1.133 2012/11/14 01:09:44 tom Exp $
*
* global variable definitions
*/
......@@ -192,6 +192,8 @@ extern "C" {
#ifdef USE_READPROGRESS
,rateEtaBYTES
,rateEtaKB
,rateEtaBYTES2
,rateEtaKB2
#endif
#ifdef USE_PROGRESSBAR
,rateBAR
......@@ -199,9 +201,9 @@ extern "C" {
} TransferRate;
#ifdef USE_READPROGRESS
# define rateEtaKB_maybe rateEtaKB
# define isRateInKB(n) ((n) == rateKB || (n) == rateEtaKB || (n) == rateEtaKB2)
#else
# define rateEtaKB_maybe rateKB
# define isRateInKB(n) ((n) == rateKB)
#endif
#define TITLE_LINES 1
......
/*
* $LynxId: LYLocal.c,v 1.118 2012/02/09 11:45:06 tom Exp $
* $LynxId: LYLocal.c,v 1.119 2012/11/18 22:25:54 tom Exp $
*
* Routines to manipulate the local filesystem.
* Written by: Rick Mallett, Carleton University
......@@ -1568,8 +1568,8 @@ static int permit_location(char *destpath,
char amode[10];
char *tmpbuf = NULL;
HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned int) new_mode, destpath);
sprintf(amode, "%.4o", (unsigned int) new_mode);
HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned) new_mode, destpath);
sprintf(amode, "%.4o", (unsigned) new_mode);
args = make_argv("chmod",
amode,
destpath,
......@@ -1584,7 +1584,7 @@ static int permit_location(char *destpath,
code = -1;
}
CTRACE((tfp, "builtin chmod %.4o ->%d\n\t%s\n",
new_mode, code, destpath));
(unsigned) new_mode, code, destpath));
}
if (code == 1)
LYforce_no_cache = TRUE; /* Force update of dired listing. */
......
/* $LynxId: LYOptions.c,v 1.149 2012/02/10 18:36:39 tom Exp $ */
/* $LynxId: LYOptions.c,v 1.150 2012/11/14 01:07:12 tom Exp $ */
#include <HTUtils.h>
#include <HTFTP.h>
#include <HTTP.h> /* 'reloading' flag */
......@@ -2381,6 +2381,8 @@ static OptValues rate_values[] =
#ifdef USE_READPROGRESS
{rateEtaBYTES, N_("Show %s/sec, ETA"), "rate_eta_bytes"},
{rateEtaKB, N_("Show %s/sec, ETA"), "rate_eta_kb"},
{rateEtaBYTES2, N_("Show %s/sec (2-digits), ETA"), "rate_eta_bytes2"},
{rateEtaKB2, N_("Show %s/sec (2-digits), ETA"), "rate_eta_kb2"},
#endif
#ifdef USE_PROGRESSBAR
{rateBAR, N_("Show progressbar"), "rate_bar"},
......
/* $LynxId: LYrcFile.c,v 1.89 2012/08/13 00:30:44 tom Exp $ */
/* $LynxId: LYrcFile.c,v 1.90 2012/11/14 01:06:06 tom Exp $ */
#include <HTUtils.h>
#include <HTFTP.h>
#include <LYUtils.h>
......@@ -130,6 +130,8 @@ Config_Enum tbl_transfer_rate[] = {
#ifdef USE_READPROGRESS
{ "KB,ETA", rateEtaKB },
{ "BYTES,ETA", rateEtaBYTES },
{ "KB2,ETA", rateEtaKB2 },
{ "BYTES2,ETA", rateEtaBYTES2 },
#endif
#ifdef USE_PROGRESSBAR
{ "METER", rateBAR },
......
......@@ -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.14"
#define LYNX_VERSION "2.8.8dev.15"
#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, 22 Aug 2012 03:53:37 -0700"
#define LYNX_DATE "Sun, 18 Nov 2012 16:20:40 -0800"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment