diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2013-06-22 21:56:04 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2013-06-22 21:56:04 -0600 |
| commit | c9e90d3c705c2a2636a24626c5d52e624f91e6e7 (patch) | |
| tree | 5386bcff1398606b8f2238d94f97074a91bb4976 /pith | |
| parent | e4b35478c8b3ce7352a74b2fea0e067f068daf18 (diff) | |
| download | alpine-c9e90d3c705c2a2636a24626c5d52e624f91e6e7.tar.xz | |
* fix crushing bug when Alpine bails on read error during a tcp timeout.
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/Makefile.in | 5 | ||||
| -rw-r--r-- | pith/charconv/Makefile.in | 5 | ||||
| -rw-r--r-- | pith/osdep/Makefile.in | 5 | ||||
| -rw-r--r-- | pith/pine.hlp | 3 | ||||
| -rw-r--r-- | pith/state.h | 3 |
5 files changed, 20 insertions, 1 deletions
diff --git a/pith/Makefile.in b/pith/Makefile.in index 322291b0..c3c18ed5 100644 --- a/pith/Makefile.in +++ b/pith/Makefile.in @@ -58,6 +58,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/pith/charconv/Makefile.in b/pith/charconv/Makefile.in index 3a6f5220..28e6c4dd 100644 --- a/pith/charconv/Makefile.in +++ b/pith/charconv/Makefile.in @@ -56,6 +56,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/pith/osdep/Makefile.in b/pith/osdep/Makefile.in index 436101c8..8b08c7f9 100644 --- a/pith/osdep/Makefile.in +++ b/pith/osdep/Makefile.in @@ -56,6 +56,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ + $(top_srcdir)/VERSION $(top_srcdir)/VERSION \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/pith/pine.hlp b/pith/pine.hlp index e36c1bc5..dd0d9cad 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 9 2013-05-29 16:02:24 +Alpine Commit 13 2013-06-21 12:51:47 ============= h_news ================= <HTML> <HEAD> @@ -198,6 +198,7 @@ message, as specified by original sender. Bugs that have been addressed include: <P> <UL> + <LI> Do not bail out during a tcp timeout, instead close connection and avoid crash. <LI> Do not use a shell to open a browser. <LI> Configure script did not test for crypto or pam libraries. <LI> Fix Cygwin separator to "/". diff --git a/pith/state.h b/pith/state.h index 47e97ce4..671cd752 100644 --- a/pith/state.h +++ b/pith/state.h @@ -139,6 +139,9 @@ struct pine { unsigned def_sort_rev:1; /* true if reverse sort is default */ unsigned restricted:1; + unsigned tcptimeout:1; /* a tcp timeout is in progress */ + unsigned read_bail:1; /* we are coming back from a read bail! */ + unsigned save_msg_rule:5; unsigned fcc_rule:3; unsigned ab_sort_rule:3; |