From cf6fce15d5c79b7e1ed92d90255bac994b405b0c Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Tue, 5 May 2009 23:59:25 -0400 Subject: [PATCH] Fix Apache wonkiness with REQUEST_URL; also update TODO. Signed-off-by: Edward Z. Yang --- TODO.txt | 14 +++++++++++--- htaccess.php | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/TODO.txt b/TODO.txt index 567f994..982de01 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,10 +1,17 @@ ===== TODO ============================================= XHTML Compiler == Architectural +- Shorter is better. Reduce to eliminate the need for configuration files. - Determine how to express relationships between many different files into one cohesive "page". This is especially important with regards to preventing collisions. It might be useful to distinguish between source and metadata files (each of which can have different forms). +- Allow source files to live in another directory. Also, being called + .xhtml is somewhat a misnomer, given the extra gunk we stick in them. +- Apache Multiviews is what we want to move towards when serving + canonicalized URLs (i.e. /comparison); however, this is incompatible + with our current approach of organizing files as pages, i.e. + comparison.css, comparison.rss, etc. Reconsider a new naming scheme. DOMFilter - Directory listing generation @@ -13,12 +20,14 @@ DOMFilter - Embedded Math with LaTeX, see MediaWiki and texvc (difficult) - Comments (difficult) - Temporary different base URL (sorta like AbsolutePath, but more flexible) -- Notify when there are BROKEN LINKS! +- Notify when there are broken links +- News improved archive browsing UI - News listings imported from other pages (REALLY IMPORTANT!) Maintenance - Generate levels: 1 for a fast, 2 for all. Filters which perform expensive - operations only do those operations with level is 2 + operations only do those operations with level is 2. (This will allow + us to implement really expensive filters, and isn't that useful now) - Enable all update modes via config option - Single-file update using update.php - Incremental HTML page updates @@ -26,7 +35,6 @@ Maintenance Sugar - Prettier dashboard using a Circular Menu -- Support for Apache MultiViews/Content Negotiation - Allow linking to web-pages without extension - Compression of content diff --git a/htaccess.php b/htaccess.php index 985e91e..c908263 100644 --- a/htaccess.php +++ b/htaccess.php @@ -115,7 +115,7 @@ foreach ($allowed_dirs as $dir => $recursive) { $full_dir_exp = implode('|', $big_exp); // prefer the extension-less URL -$n[] = 'RewriteCond %{REQUEST_URI} \.html$'; +$n[] = 'RewriteCond %{THE_REQUEST} \.html\x20$'; $n[] = "RewriteRule ^(($full_dir_exp)[^/]+)\.html$ \$1 [NS,R=301]"; foreach ($allowed_dirs as $dir => $recursive) { -- 2.11.4.GIT