[openssl-commits] [web] master update

[Richard Levitte]

The branch master has been updated
       via  f0dd77fca46f3d630d5a47d3bb93e8d50c66f7df (commit)
       via  4fc0fbf43218d56c669b1b426687e8797c3dfaa1 (commit)
      from  1a509e9e5395e713e42d4e5f334aec68cf43d146 (commit)


- Log -----------------------------------------------------------------
commit f0dd77fca46f3d630d5a47d3bb93e8d50c66f7df
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Apr 3 15:42:54 2018 +0200

    bin/mk-latest: Allow for 1.1.1 URLs

commit 4fc0fbf43218d56c669b1b426687e8797c3dfaa1
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Apr 3 15:42:14 2018 +0200

    source/.htaccess: I forgot it's autogenerated

-----------------------------------------------------------------------

Summary of changes:
 bin/mk-latest    | 4 +++-
 source/.htaccess | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 source/.htaccess

diff --git a/bin/mk-latest b/bin/mk-latest
index 122d950..2307837 100755
--- a/bin/mk-latest
+++ b/bin/mk-latest
@@ -41,7 +41,7 @@ print <<\EOF;
 
 # Old distro's are in subdirs.
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-0\.9\.8.*) old/0.9.x/$1 [L]
+RewriteRule ^(openssl-0\.9\.\d.*) old/0.9.x/$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^openssl-(1\.0\.0.*) old/1.0.0/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -51,6 +51,8 @@ RewriteRule ^openssl-(1\.0\.2.*) old/1.0.2/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^openssl-(1\.1\.0.*) old/1.1.0/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^openssl-(1\.1\.1.*) old/1.1.1/openssl-$1 [L]
+RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^openssl-(fips.*)  old/fips/openssl-$1 [L]
 
 <Files *.gz.asc>
diff --git a/source/.htaccess b/source/.htaccess
deleted file mode 100644
index 1bbeac9..0000000
--- a/source/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-(\d+\.\d+\.\d+).*\.tar\.gz) /source/old/$2/$1 [L,R=301,NC]