From nobody Sun Apr 28 18:21:40 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSFCm1M5mz5JjD0 for ; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSFCm0vY0z55Mt; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5/RPsv8p+vsK7vlneqSzjN2Yo4rGV4SAvV+iEE9xhs=; b=U6jMh3yr2jchB6cyVr8jmD7Gs7mSU30yzctqqzhbYn8jhSUngKlsRjN+7jFk4r8hYBW7AT HyDfcQog5UQGI2Y0wCRKHexx0RRXit0X8wbgsWxXgsk5KXVBD0iszA4vFaW+Pv6cd31x8X JGjwnUyhfzJA2y4DLnyM7GPtEDlJhqMs89hXj5UEW/lvsulws1SfjylR0A7BjgcYFT/37h 13b+wvNAP8CSWdcM3teHE99LIVgD21LdqTGVp5C6k6w43t3g2wmkVymBdBWHTx4r155ZaN I2gpdAP4IudhQEqHCMKP5YnnW7M8rgginz3kU8Ry6d3j+WOyYitRCZyhJm1t6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328500; a=rsa-sha256; cv=none; b=yD0Rk6LhFgK2QGgXzaHx2us11SSALOPZxXaWvq1cydzy+NgktRiFHHzCZGTnQ+C7k7GCdL O/1CqFjWQtkFySStqJGKKWAWUcmzrRgaxT5T22P6Y1eOCspHx3Qc6FYMxBHRQzlQrcC/iu 7HTg2718xNBdT4v+MGl57oryT298nBLRfDhyDPdZzEHaWFdj2Z1Xo4A0G+6E0LHrewO1Vf u4trnCWsKhv0staam9LZAQCvt4WtTDaIUmKJa1v/2h7F8eN6/J0Pdb90+3ZyKIeUjqoM1n rKhxi4JTR+VjIxPVSa0FNuiOVfptaagytUh/jkVfsCuY512RppUig9nPsU2ddg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5/RPsv8p+vsK7vlneqSzjN2Yo4rGV4SAvV+iEE9xhs=; b=mCIe4UR+oQ+/kbpNtXF7ICKFSP2mY5iw61GX5Bwo9Ew9QiRtjV5ycrhsCs3R+5xlg8TvcI w2q+ZqG2EFYAT1/xQwABTIr9V44FXqAZ7AHEQmvQ9Vn9hag6+SK1Sja+qJwuOhHft7tetO IKSZFyEwLXdYHWzLsiL//DxguDyWetsJO8CPcQov31wUpCZGY2mxrWtlj2Rt/2X3+h6axx 3opfj7jbVuDAo1LsYT+J6IOWL82NVOm0yzzNFDyE+XsRpksvj2t+I3BI4HVQVO2Ul52GH7 vlsr75hg0we2FSGf5drnAFlK5plN5McCkIG9N5ek/ObgeDDlg1fcWMXOOiWmbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSFCm0X2zzc5G; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SILeF6022437; Sun, 28 Apr 2024 18:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SILecP022434; Sun, 28 Apr 2024 18:21:40 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:21:40 GMT Message-Id: <202404281821.43SILecP022434@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: e4d3f14695 - main - improve URL matching List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4d3f14695b1e2a23143ca940e3b73df224dcb43 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=e4d3f14695b1e2a23143ca940e3b73df224dcb43 commit e4d3f14695b1e2a23143ca940e3b73df224dcb43 Author: Wolfram Schneider AuthorDate: 2024-04-28 18:19:51 +0000 Commit: Wolfram Schneider CommitDate: 2024-04-28 18:19:51 +0000 improve URL matching for trailing '>', comma and other characters PR: 266336 --- website/content/en/cgi/man.cgi | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 8ddfa7f27f..d82411491b 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1579,6 +1579,18 @@ sub manpath_without_ports { return join(":", @list); } +# strip trailing dots, comma etc. from an URL +sub url_strip { + my $url = shift; + my $part = shift; + + if ($url =~ m/(.+)([,\.])$/) { + return ($1, $1, $2); + } else { + return ($url, $url, ""); + } +} + sub man { local ( $name, $section, $arch ) = @_; local ( $_, $title, $head, *MAN ); @@ -1842,8 +1854,8 @@ s/([a-z0-9_\-\.]+\@[a-z0-9\-\.]+\.[a-z]+)/$1<\/A>/gi; } # detect URLs in manpages - if (m,\b(ftp|http|https)://,) { - s,((ftp|http|https)://[^\s<>\)]+),$1,gi; + if (m,\b(http|https)://,) { + s|(https?://[^\s\)&<>'`";\]\[]+)|sprintf("%s%s", &url_strip($1))|egi; } if (s%^(.*?)+\n?$% ($str = $1) =~ s,(|),,g; $str%ge) {