simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Treat a few more types of trailing characters as not forming part of a URL.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@144 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-07-08 17:24:21 +00:00
parent d96e312a70
commit 1c4d50f112
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -135,7 +135,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "143" #define VCS_REVISION "144"
/* Version number of package */ /* Version number of package */
#define VERSION "2.9" #define VERSION "2.9"

2
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=143 VCS_REVISION=144
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.9, markus@shellinabox.com) AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
VCS_REVISION=143 VCS_REVISION=144
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

8
demo/vt100.js
View file

@ -115,7 +115,7 @@ function VT100(container) {
'(?::[1-9][0-9]*)?' + '(?::[1-9][0-9]*)?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' +
(linkifyURLs <= 1 ? '' : (linkifyURLs <= 1 ? '' :
// Also support URLs without a protocol (assume "http"). // Also support URLs without a protocol (assume "http").
@ -146,7 +146,7 @@ function VT100(container) {
'(?::[1-9][0-9]{0,4})?' + '(?::[1-9][0-9]{0,4})?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') +
// In addition, support e-mail address. Optionally, recognize "mailto:" // In addition, support e-mail address. Optionally, recognize "mailto:"
'(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + '(?: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]+)' + 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' +
// Optional arguments // Optional arguments
'(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?');
} }
this.initializeElements(container); this.initializeElements(container);
this.initializeAnsiColors(); this.initializeAnsiColors();
@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

2
shellinabox/shell_in_a_box.js
View file

@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

8
shellinabox/vt100.js
View file

@ -115,7 +115,7 @@ function VT100(container) {
'(?::[1-9][0-9]*)?' + '(?::[1-9][0-9]*)?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' +
(linkifyURLs <= 1 ? '' : (linkifyURLs <= 1 ? '' :
// Also support URLs without a protocol (assume "http"). // Also support URLs without a protocol (assume "http").
@ -146,7 +146,7 @@ function VT100(container) {
'(?::[1-9][0-9]{0,4})?' + '(?::[1-9][0-9]{0,4})?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') +
// In addition, support e-mail address. Optionally, recognize "mailto:" // In addition, support e-mail address. Optionally, recognize "mailto:"
'(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + '(?: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]+)' + 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' +
// Optional arguments // Optional arguments
'(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?');
} }
this.initializeElements(container); this.initializeElements(container);
this.initializeAnsiColors(); this.initializeAnsiColors();
@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

6
shellinabox/vt100.jspp
View file

@ -115,7 +115,7 @@ function VT100(container) {
'(?::[1-9][0-9]*)?' + '(?::[1-9][0-9]*)?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|' + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|' +
(linkifyURLs <= 1 ? '' : (linkifyURLs <= 1 ? '' :
// Also support URLs without a protocol (assume "http"). // Also support URLs without a protocol (assume "http").
@ -146,7 +146,7 @@ function VT100(container) {
'(?::[1-9][0-9]{0,4})?' + '(?::[1-9][0-9]{0,4})?' +
// Path. // Path.
'(?:/(?:(?![/ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)*|') + '(?:/(?:(?![/ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)*|') +
// In addition, support e-mail address. Optionally, recognize "mailto:" // In addition, support e-mail address. Optionally, recognize "mailto:"
'(?:mailto:)' + (linkifyURLs <= 1 ? '' : '?') + '(?: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]+)' + 'yu|za|zm|zw|arpa)(?![a-zA-Z0-9])|[Xx][Nn]--[-a-zA-Z0-9]+)' +
// Optional arguments // Optional arguments
'(?:[?](?:(?![ \u00A0]|[,.)][ \u00A0]|[,.)]$).)*)?'); '(?:[?](?:(?![ \u00A0]|[,.)}"\u0027!]+[ \u00A0]|[,.)}"\u0027!]+$).)*)?');
} }
this.initializeElements(container); this.initializeElements(container);
this.initializeAnsiColors(); this.initializeAnsiColors();