Backport:

  Make some regex examples a little more exact.

  Submitted by: Jari Alto <jari.aalto@poboxes.com>
  PR: 22348

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101099 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en
index 5511f22a54e39328d91ec0f7bab07b4031675f6c..4e3d519f0110180cf7c92168abec36b3436a62a2 100755 (executable)
--- a/docs/manual/urlmapping.html.en
+++ b/docs/manual/urlmapping.html.en
@@ -92,7 +92,7 @@
     directives to do powerful regular-expression based matching and
     substitution. For example,</p>
 
-<div class="example"><p><code>ScriptAliasMatch ^/~([a-zA-Z0-9]*)/cgi-bin/(.*)
+<div class="example"><p><code>ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)
       /home/$1/cgi-bin/$2</code></p></div>
 
     <p>will map a request to
@@ -139,7 +139,7 @@
     <code>/home/user/public_html/file.html</code>, use the following
     <code>AliasMatch</code> directive:</p>
 
-<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]*)/?(.*)
+<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]+)/?(.*)
       /home/$1/public_html/$2</code></p></div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 894b98551430ac956bc152507062669c6cc42568..03629c9f464edb2d603dad006b535bb20eaff523 100644 (file)
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -97,7 +97,7 @@
     directives to do powerful regular-expression based matching and
     substitution. For example,</p>
 
-<example>ScriptAliasMatch ^/~([a-zA-Z0-9]*)/cgi-bin/(.*)
+<example>ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)
       /home/$1/cgi-bin/$2</example>
 
     <p>will map a request to
@@ -144,7 +144,7 @@
     <code>/home/user/public_html/file.html</code>, use the following
     <code>AliasMatch</code> directive:</p>
 
-<example>AliasMatch ^/upages/([a-zA-Z0-9]*)/?(.*)
+<example>AliasMatch ^/upages/([a-zA-Z0-9]+)/?(.*)
       /home/$1/public_html/$2</example>
 </section>