From commits-return-10437-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Wed Feb 19 20:49:02 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 74A1D195EC for ; Wed, 19 Feb 2020 20:49:02 +0000 (UTC) Received: (qmail 20196 invoked by uid 500); 19 Feb 2020 20:49:02 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 20180 invoked by uid 500); 19 Feb 2020 20:49:01 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 20169 invoked by uid 99); 19 Feb 2020 20:49:01 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2020 20:49:01 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 64FD78DACA; Wed, 19 Feb 2020 20:49:01 +0000 (UTC) Date: Wed, 19 Feb 2020 20:49:01 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Add redirection to https via .htaccess for the source of the site MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158214534112.13396.10673516879641831678@gitbox.apache.org> From: fschumacher@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 90d6c880568f7689bddbc95befb41e59cc7d2b91 X-Git-Newrev: e30ee8d5be707221931a3e20f7be853fd05d3f43 X-Git-Rev: e30ee8d5be707221931a3e20f7be853fd05d3f43 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git The following commit(s) were added to refs/heads/master by this push: new e30ee8d Add redirection to https via .htaccess for the source of the site e30ee8d is described below commit e30ee8d5be707221931a3e20f7be853fd05d3f43 Author: Felix Schumacher AuthorDate: Wed Feb 19 21:48:25 2020 +0100 Add redirection to https via .htaccess for the source of the site --- src/dist/build.gradle.kts | 1 + xdocs/.htaccess | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts index 08faaa9..5b3d12c 100644 --- a/src/dist/build.gradle.kts +++ b/src/dist/build.gradle.kts @@ -275,6 +275,7 @@ val xdocs = "$rootDir/xdocs" fun CopySpec.docCssAndImages() { from(xdocs) { + include(".htaccess") include("css/**") include("images/**") } diff --git a/xdocs/.htaccess b/xdocs/.htaccess new file mode 100644 index 0000000..a92e2ce --- /dev/null +++ b/xdocs/.htaccess @@ -0,0 +1,6 @@ +RewriteEngine On + +RewriteCond %{HTTP_HOST} ^jmeter\.apache\.org [NC] +RewriteCond %{HTTPS} !on + +RewriteRule ^(.*)$ https://jmeter.apache.org/$1 [L]