From 1c4d50f11202d13c082869565f54b4d85c3d1086 Mon Sep 17 00:00:00 2001 From: zodiac Date: Wed, 8 Jul 2009 17:24:21 +0000 Subject: [PATCH] Treat a few more types of trailing characters as not forming part of a URL. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@144 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 8 ++++---- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 8 ++++---- shellinabox/vt100.jspp | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config.h b/config.h index d9f85ae..394a364 100644 --- a/config.h +++ b/config.h @@ -135,7 +135,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "143" +#define VCS_REVISION "144" /* Version number of package */ #define VERSION "2.9" diff --git a/configure b/configure index 3b32222..338baa9 100755 --- a/configure +++ b/configure @@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=143 +VCS_REVISION=144 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 69b5cef..2586f76 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.9, markus@shellinabox.com) -VCS_REVISION=143 +VCS_REVISION=144 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index c2b6d00..fc5a942 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -115,7 +115,7 @@ function VT100(container) { '(?::[1-9][0-9]*)?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' + (linkifyURLs <= 1 ? '' : // Also support URLs without a protocol (assume "http"). @@ -146,7 +146,7 @@ function VT100(container) { '(?::[1-9][0-9]{0,4})?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') + // In addition, support e-mail address. Optionally, recognize "mailto:" '(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + @@ -171,7 +171,7 @@ function VT100(container) { 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' + // Optional arguments - '(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); + '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?'); } this.initializeElements(container); this.initializeAnsiColors(); @@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.9 (revision 143)" + + alert("VT100 Terminal Emulator " + "2.9 (revision 144)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 2e169dc..9b396f5 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.9 (revision 143)" + + alert("Shell In A Box version " + "2.9 (revision 144)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index c2b6d00..fc5a942 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -115,7 +115,7 @@ function VT100(container) { '(?::[1-9][0-9]*)?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' + (linkifyURLs <= 1 ? '' : // Also support URLs without a protocol (assume "http"). @@ -146,7 +146,7 @@ function VT100(container) { '(?::[1-9][0-9]{0,4})?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') + // In addition, support e-mail address. Optionally, recognize "mailto:" '(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + @@ -171,7 +171,7 @@ function VT100(container) { 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' + // Optional arguments - '(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); + '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?'); } this.initializeElements(container); this.initializeAnsiColors(); @@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.9 (revision 143)" + + alert("VT100 Terminal Emulator " + "2.9 (revision 144)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp index b7a1765..17aca71 100644 --- a/shellinabox/vt100.jspp +++ b/shellinabox/vt100.jspp @@ -115,7 +115,7 @@ function VT100(container) { '(?::[1-9][0-9]*)?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' + (linkifyURLs <= 1 ? '' : // Also support URLs without a protocol (assume "http"). @@ -146,7 +146,7 @@ function VT100(container) { '(?::[1-9][0-9]{0,4})?' + // Path. - '(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') + // In addition, support e-mail address. Optionally, recognize "mailto:" '(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + @@ -171,7 +171,7 @@ function VT100(container) { 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' + // Optional arguments - '(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); + '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?'); } this.initializeElements(container); this.initializeAnsiColors();