Skip to content

Commit 96ed77c

Browse files
committed
Fixes bz70027 - per-directory links to the Glossary, rather than
definining it as htaccess files, which is only part of the story. Also removes an example that I honestly cannot figure out what it is supposed to be illustrating. It may be worth adding a better example here at some point. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933891 13f79535-47bb-0310-9956-ffa450edef68
1 parent b03c43d commit 96ed77c

1 file changed

Lines changed: 10 additions & 24 deletions

File tree

docs/manual/mod/mod_rewrite.xml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ RewriteRule "^/ex/(.*)" "${examplemap:$1}"
418418
<directive module="mod_rewrite">RewriteRule</directive> directives that
419419
substitute a relative path.</p>
420420
<p> This directive is <em>required</em> when you use a relative path
421-
in a substitution in per-directory (htaccess) context unless any
421+
in a substitution in <glossary ref="perdirectory">per-directory</glossary> context unless any
422422
of the following conditions are true:</p>
423423
<ul>
424424
<li> The original request, and the substitution, are underneath the
@@ -436,21 +436,6 @@ RewriteRule "^/ex/(.*)" "${examplemap:$1}"
436436
or <module>mod_userdir</module>.</li>
437437
</ul>
438438

439-
<p> In the example below, <directive>RewriteBase</directive> is necessary
440-
to avoid rewriting to http://example.com/opt/myapp-1.2.3/welcome.html
441-
since the resource was not relative to the document root. This
442-
misconfiguration would normally cause the server to look for an "opt"
443-
directory under the document root.</p>
444-
<highlight language="config">
445-
DocumentRoot "/var/www/example.com"
446-
AliasMatch "^/myapp" "/opt/myapp-1.2.3"
447-
&lt;Directory "/opt/myapp-1.2.3"&gt;
448-
RewriteEngine On
449-
RewriteBase "/myapp/"
450-
RewriteRule "^index\.html$" "welcome.html"
451-
&lt;/Directory&gt;
452-
</highlight>
453-
454439
</usage>
455440

456441
</directivesynopsis>
@@ -770,7 +755,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
770755
<em>after</em> the URL translation phase (during which
771756
<module>mod_rewrite</module> operates).</p>
772757
<p>On the other hand, because <module>mod_rewrite</module> implements
773-
its per-directory context (<code>.htaccess</code> file) via
758+
its <glossary ref="perdirectory">per-directory</glossary> context via
774759
the Fixup phase of the API and because the authorization
775760
phases come <em>before</em> this phase, you just can use
776761
<code>%{REMOTE_USER}</code> in that context.</p></li>
@@ -1123,7 +1108,7 @@ RewriteRule "^/$" "/homepage.std.html" [L]
11231108

11241109
<p>The directory-path to which the rule applies is stripped from the currently mapped
11251110
filesystem path before comparison (up to and including a trailing slash).
1126-
The net result of this per-directory prefix stripping is that rules in
1111+
The net result of this <glossary ref="perdirectory">per-directory</glossary> prefix stripping is that rules in
11271112
this context only match against the portion of the currently mapped filesystem path
11281113
"below" the directory-path to which the rule applies.</p>
11291114

@@ -1161,13 +1146,14 @@ directory.</li>
11611146
directive for more information regarding what prefix will be added back to
11621147
relative substitutions.</li>
11631148

1164-
<li> If you wish to match against the full URL-path in a per-directory context
1149+
<li> If you wish to match against the full URL-path in a
1150+
<glossary ref="perdirectory">per-directory</glossary> context
11651151
RewriteRule, use the <code>%{REQUEST_URI}</code> variable in
11661152
a <directive module="mod_rewrite">RewriteCond</directive>.</li>
11671153

11681154
<li>The removed prefix always ends with a slash, meaning the matching occurs against a string which
11691155
<em>never</em> has a leading slash. Therefore, a <em>Pattern</em> with <code>^/</code> never
1170-
matches in per-directory context.</li>
1156+
matches in <glossary ref="perdirectory">per-directory</glossary> context.</li>
11711157

11721158
<li>Although rewrite rules are syntactically permitted in <directive
11731159
type="section" module="core">Location</directive> and <directive
@@ -1289,13 +1275,13 @@ cannot use <code>$N</code> in the substitution string!
12891275
<li><strong>Starts with <code>/</code>, server/vhost context:</strong>
12901276
Treated as a file-system path if the first path component exists
12911277
on disk; otherwise treated as a URL-path.</li>
1292-
<li><strong>Starts with <code>/</code>, per-directory context:</strong>
1278+
<li><strong>Starts with <code>/</code>, <glossary ref="perdirectory">per-directory</glossary> context:</strong>
12931279
Always treated as a URL-path. No file-system guessing occurs.</li>
12941280
<li><strong>Does not start with <code>/</code> (relative),
12951281
server/vhost context:</strong> Treated as a URL-path relative
12961282
to the current request URI.</li>
12971283
<li><strong>Does not start with <code>/</code> (relative),
1298-
per-directory context:</strong> Treated as a URL-path relative
1284+
<glossary ref="perdirectory">per-directory</glossary> context:</strong> Treated as a URL-path relative
12991285
to the directory-path for which the <directive
13001286
module="core">Directory</directive> or <code>.htaccess</code>
13011287
applies. See <directive>RewriteBase</directive> for controlling
@@ -1421,7 +1407,7 @@ cannot use <code>$N</code> in the substitution string!
14211407
<td>END</td>
14221408
<td>Stop the rewriting process immediately and don't apply any
14231409
more rules. Also prevents further execution of rewrite rules
1424-
in per-directory context. (Available in 2.3.9 and later)
1410+
in <glossary ref="perdirectory">per-directory</glossary> context. (Available in 2.3.9 and later)
14251411
<em><a href="../rewrite/flags.html#flag_end">details ...</a></em></td>
14261412
</tr>
14271413
<tr>
@@ -1450,7 +1436,7 @@ cannot use <code>$N</code> in the substitution string!
14501436
<tr>
14511437
<td>last|L</td>
14521438
<td>Stop the rewriting process immediately and don't apply any
1453-
more rules. Especially note caveats for per-directory context (see also the END flag). <em><a
1439+
more rules. Especially note caveats for <glossary ref="perdirectory">per-directory</glossary> context (see also the END flag). <em><a
14541440
href="../rewrite/flags.html#flag_l">details ...</a></em></td>
14551441
</tr>
14561442
<tr>

0 commit comments

Comments
 (0)