diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-12-15 18:18:18 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-12-15 18:18:18 (GMT) |
| commit | a37dd8f1c4c725c79941a379288a38664a390bda (patch) | |
| tree | 1301b0cf3eef42113ff2e99c5673536584e3fe14 | |
| parent | ba7c1327f590a7857a5b7c877b9f2a0477518364 (diff) | |
| parent | acc4b7e99cd05a78d1adbfdab1abc58db342c396 (diff) | |
| download | Doxygen-a37dd8f1c4c725c79941a379288a38664a390bda.zip Doxygen-a37dd8f1c4c725c79941a379288a38664a390bda.tar.gz Doxygen-a37dd8f1c4c725c79941a379288a38664a390bda.tar.bz2 | |
Merge branch 'albert-github-feature/bug_url_irc'
| -rw-r--r-- | src/doctokenizer.l | 2 | ||||
| -rw-r--r-- | src/util.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index f756186..451201a 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -386,7 +386,7 @@ ATTRNAME [a-z_A-Z\x80-\xFF][:a-z_A-Z0-9\x80-\xFF\-]* ATTRIB {ATTRNAME}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))? URLCHAR [a-z_A-Z0-9\!\~\,\:\;\'\$\?\@\&\%\#\.\-\+\/\=] URLMASK ({URLCHAR}+([({]{URLCHAR}*[)}])?)+ -URLPROTOCOL ("http:"|"https:"|"ftp:"|"file:"|"news:"|"irc") +URLPROTOCOL ("http:"|"https:"|"ftp:"|"ftps:"|"sftp:"|"file:"|"news:"|"irc:"|"ircs:") FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+&#@] FILEECHAR [a-z_A-Z0-9\-\+&#@] HFILEMASK ("."{FILESCHAR}*{FILEECHAR}+)+ diff --git a/src/util.cpp b/src/util.cpp index 74e5226..4a35517 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6686,7 +6686,10 @@ bool isURL(const QCString &url) { QCString loc_url = url.stripWhiteSpace(); return loc_url.left(5)=="http:" || loc_url.left(6)=="https:" || - loc_url.left(4)=="ftp:" || loc_url.left(5)=="file:"; + loc_url.left(4)=="ftp:" || loc_url.left(5)=="ftps:" || + loc_url.left(5)=="sftp:" || loc_url.left(5)=="file:" || + loc_url.left(5)=="news:" || loc_url.left(4)=="irc:" || + loc_url.left(5)=="ircs:"; } /** Corrects URL \a url according to the relative path \a relPath. * Returns the corrected URL. For absolute URLs no correction will be done. |