[Boost-commit] svn:boost r46835 - in website/public_html/beta: common/code doc

From: grafikrobot_at_[hidden]
Date: 2008-06-29 00:08:51

Author: grafik
Date: 2008-06-29 00:08:50 EDT (Sun, 29 Jun 2008)
New Revision: 46835
URL: http://svn.boost.org/trac/boost/changeset/46835

Log:
Some files look like directory names, but really aren't. This both prevents such files from being redirected to an index.html file. And displays them within the appropriate context. (fixes 1753)
Text files modified: 
   website/public_html/beta/common/code/boost_archive.php |     3 ++-                                     
   website/public_html/beta/doc/.htaccess                 |     4 +++-                                    
   website/public_html/beta/doc/display_libs.php          |     1 +                                       
   3 files changed, 6 insertions(+), 2 deletions(-)

Modified: website/public_html/beta/common/code/boost_archive.php
==============================================================================
--- website/public_html/beta/common/code/boost_archive.php	(original)
+++ website/public_html/beta/common/code/boost_archive.php	2008-06-29 00:08:50 EDT (Sun, 29 Jun 2008)
@@ -1,6 +1,6 @@
 <?php
 /*
-  Copyright 2005-2007 Redshift Software, Inc.
+  Copyright 2005-2008 Redshift Software, Inc.
   Distributed under the Boost Software License, Version 1.0.
   (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 */
@@ -39,6 +39,7 @@
             array('@.*@','@[.]js$@i','raw','application/x-javascript'),
             array('@.*@','@[.]pdf$@i','raw','application/pdf'),
             array('@.*@','@[.](html|htm)$@i','raw','text/html'),
+            array('@.*@','@[^.](Jamroot|Jamfile)$@i','text','text/plain'),
             ));
         
         $this->version_ = $path_parts[1];

Modified: website/public_html/beta/doc/.htaccess
==============================================================================
--- website/public_html/beta/doc/.htaccess	(original)
+++ website/public_html/beta/doc/.htaccess	2008-06-29 00:08:50 EDT (Sun, 29 Jun 2008)
@@ -14,7 +14,9 @@
 RewriteRule ^libs/release(/.*)?$ libs/1_35_0$1 [R]
 RewriteRule ^libs/development(/.*)?$ libs/1_36_0$1 [R]
 
-# In case we don't get a file looking URI we send it to the index.html file.
+#~  # In case we don't get a file looking URI we send it to the index.html file.
+#~  # - With some exceptions.
+RewriteCond %{REQUEST_URI} !^/doc/libs/([0-9_]+)/([^.]*[^./])/(Jamroot|Jamfile)$
 RewriteRule ^libs/([0-9_]+)/([^.]*[^./])/?$ libs/$1/$2/index.html [R]
 
 # Rewrite specific versions to the dynamic handlers.

Modified: website/public_html/beta/doc/display_libs.php
==============================================================================
--- website/public_html/beta/doc/display_libs.php	(original)
+++ website/public_html/beta/doc/display_libs.php	2008-06-29 00:08:50 EDT (Sun, 29 Jun 2008)
@@ -56,6 +56,7 @@
   //~ default to processed output for libs and tools
   array('@.*@','@^libs/[^/]+/doc/html/.*(html|htm)$@i','boost_book_html','text/html'),
   array('@.*@','@^libs/[^/]+/doc/[^/]+/html/.*(html|htm)$@i','boost_book_html','text/html'),
+  array('@.*@','@^libs/[^/]+/doc/[^/]+/doc/html/.*(html|htm)$@i','boost_book_html','text/html'),
   array('@.*@','@^libs.*(html|htm)$@i','boost_libs_html','text/html'),
   array('@.*@','@^tools.*(html|htm)$@i','boost_libs_html','text/html'),
   array('@.*@','@^doc/html/.*html$@i','boost_book_html','text/html'),