[openssl-commits] [web] master update

[Richard Levitte]

The branch master has been updated
       via  dde0a59b225168d49a5f6d90dd03b07727c321b0 (commit)
       via  b8b16c9fa6d82b90b692298aa0cfa09202e2d184 (commit)
      from  04aec9e4e49adb97b496b6e9bbd172bdab36cfe2 (commit)


- Log -----------------------------------------------------------------
commit dde0a59b225168d49a5f6d90dd03b07727c321b0
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 23 14:38:44 2015 +0200

    Avoid loops.

commit b8b16c9fa6d82b90b692298aa0cfa09202e2d184
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 23 14:38:28 2015 +0200

    Incorporate source/.htaccess in version control

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

Summary of changes:
 .gitignore       |  1 -
 docs/.htaccess   | 14 +++++++-------
 source/.htaccess | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 source/.htaccess

diff --git a/.gitignore b/.gitignore
index ed3211e..f99f40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ news/vulnerabilities.inc
 newsflash.inc
 source/*.gz*
 source/*.patch
-source/.htaccess
 source/index.inc
 source/license.txt
 source/old/*/*.patch
diff --git a/docs/.htaccess b/docs/.htaccess
index b6710c3..cc9c083 100644
--- a/docs/.htaccess
+++ b/docs/.htaccess
@@ -1,12 +1,12 @@
 RewriteEngine on
-RewriteRule fips/fipsnotes.html /docs/fipsnotes.html [L,R=302,NC]
-RewriteRule fips/fipsvalidation.html /docs/fipsvalidation.html [L,R=302,NC]
-RewriteRule fips/index.html /docs/fips/fips.html [L,R=302,NC]
+RewriteRule ^/fips/fipsnotes.html /docs/fipsnotes.html [L,R=302,NC]
+RewriteRule ^/fips/fipsvalidation.html /docs/fipsvalidation.html [L,R=302,NC]
+RewriteRule ^/fips/index.html /docs/fips/fips.html [L,R=302,NC]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule manmaster/apps/1/(.*)  /docs/manmaster/apps/$1 [L,R=302,NC]
+RewriteRule ^/manmaster/apps/1/(.*)  /docs/manmaster/apps/$1 [L,R=302,NC]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule apps/(..*)  /docs/manmaster/apps/$1 [L,R=302,NC]
+RewriteRule ^/apps/(..*)  /docs/manmaster/apps/$1 [L,R=302,NC]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule crypto/(..*)  /docs/manmaster/crypto/$1 [L,R=302,NC]
+RewriteRule ^/crypto/(..*)  /docs/manmaster/crypto/$1 [L,R=302,NC]
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ssl/(..*)  /docs/manmaster/ssl/$1 [L,R=302,NC]
+RewriteRule ^/ssl/(..*)  /docs/manmaster/ssl/$1 [L,R=302,NC]
diff --git a/source/.htaccess b/source/.htaccess
new file mode 100644
index 0000000..6a2766d
--- /dev/null
+++ b/source/.htaccess
@@ -0,0 +1,30 @@
+RewriteEngine on
+RewriteBase /source
+# First, rewrite all the 'latest' URLs
+RewriteRule ^latest.tar.gz$ openssl-1.0.2d.tar.gz [L,R=302,NC]
+RewriteRule ^openssl-0.9.8-latest.tar.gz$ openssl-0.9.8zg.tar.gz [L,R=302,NC]
+RewriteRule ^openssl-1.0.0-latest.tar.gz$ openssl-1.0.0s.tar.gz [L,R=302,NC]
+RewriteRule ^openssl-1.0.1-latest.tar.gz$ openssl-1.0.1p.tar.gz [L,R=302,NC]
+RewriteRule ^openssl-1.0.2-latest.tar.gz$ openssl-1.0.2d.tar.gz [L,R=302,NC]
+
+# Old distro's are in subdirs.
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(openssl-0\.9\.8.*) 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
+RewriteRule ^openssl-(1\.0\.1.*) old/1.0.1/openssl-$1 [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^openssl-(1\.0\.2.*) old/1.0.1/openssl-$1 [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^openssl-(fips.*)  old/fips/openssl-$1 [L]
+
+<Files *.gz.asc>
+    RemoveEncoding .gz
+</Files>
+<Files *.gz.md5>
+    RemoveEncoding .gz
+</Files>
+<Files *.gz.sha1>
+    RemoveEncoding .gz
+</Files>