summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2013-07-18 22:51:20 -0600
committerEduardo Chappa <chappa@washington.edu>2013-07-18 22:51:20 -0600
commit9dcb8528d0ce6afb8afc1b0a219fc7eae0c9bb99 (patch)
tree71064fed8137c8662273c4733b32e91f05b9b3b7
parent3463dc142b787d8010cf9310caa7915f30a9e275 (diff)
downloadalpine-9dcb8528d0ce6afb8afc1b0a219fc7eae0c9bb99.tar.xz
* Added recognition of ws and wss URIs.
-rw-r--r--pith/pine.hlp3
-rw-r--r--pith/url.c12
2 files changed, 11 insertions, 4 deletions
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 7f7a1334..bc12d2e3 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 18 2013-07-18 20:57:53
+Alpine Commit 19 2013-07-18 22:51:10
============= h_news =================
<HTML>
<HEAD>
@@ -186,6 +186,7 @@ now they are considered part of a paragraph. Based on earlier joint work
with Jeff Franklin.
<LI> Extended support of recognition of UTF-8 in urls based on information from
http://url.spec.whatwg.org.
+ <LI> Added recognition of ws and wss URIs.
<LI> Add ability to <A HREF="h_config_folder_color">color folder names</A>,
<A HREF="h_config_directory_color">directory names</A>,
and <A HREF="h_config_folder_list_color">text</A> in the FOLDER SCREEN.
diff --git a/pith/url.c b/pith/url.c
index 1798320d..4550400c 100644
--- a/pith/url.c
+++ b/pith/url.c
@@ -82,9 +82,15 @@ rfc1738_scan(char *line, int *len)
* Make sure everyhing up to the colon is a known scheme...
*/
if(start && (n = colon - start) && !isdigit((unsigned char) *start)
- && (((n == 3
- && (*start == 'F' || *start == 'f')
- && !struncmp(start+1, "tp", 2))
+ && (((n == 2
+ && (*start == 'w' || *start == 'W')
+ && (*(start+1) == 's' || *(start+1) == 'S'))
+ || (n == 3
+ && (((*start == 'F' || *start == 'f')
+ && !struncmp(start+1, "tp", 2))
+ ||
+ ((*start == 'w' || *start == 'W')
+ && !struncmp(start+1, "ss", 2))))
|| (n == 4
&& (((*start == 'H' || *start == 'h')
&& !struncmp(start + 1, "ttp", 3))