docs: Add backreference flow diagram (Figure 3) in rewrite/tech

Add SVG source and regenerated PNG for mod_rewrite_fig2 showing how
backreferences flow: $N from RewriteRule Pattern (matched first) to
all RewriteCond TestStrings and Substitution; %N from last matched
CondPattern to Substitution. Insert as Figure 3 in tech.html. Add
crosslink from intro.html backreferences section to the new diagram.
Remove obsolete GIF.

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

diff --git a/docs/manual/images/mod_rewrite_fig2.gif b/docs/manual/images/mod_rewrite_fig2.gif
deleted file mode 100644 (file)
index 3ea8cb6..0000000
Binary files a/docs/manual/images/mod_rewrite_fig2.gif and /dev/null differ

diff --git a/docs/manual/images/mod_rewrite_fig2.png b/docs/manual/images/mod_rewrite_fig2.png
index 6ee23b009a0fe835491deb44f5d33b21cc4e136e..9cadc8476b442afe61dcdecb38aad7c2d3277dd5 100644 (file)
Binary files a/docs/manual/images/mod_rewrite_fig2.png and b/docs/manual/images/mod_rewrite_fig2.png differ

diff --git a/docs/manual/images/mod_rewrite_fig2.svg b/docs/manual/images/mod_rewrite_fig2.svg
new file mode 100644 (file)
index 0000000..b745e1f
--- /dev/null
+++ b/docs/manual/images/mod_rewrite_fig2.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 520 290" width="520" height="290">
+  <defs>
+    <marker id="arrowhead-blue" markerWidth="8" markerHeight="6" refX="7" refY="3" orient="auto">
+      <polygon points="0 0, 8 3, 0 6" fill="#2563eb"/>
+    </marker>
+    <marker id="arrowhead-red" markerWidth="8" markerHeight="6" refX="7" refY="3" orient="auto">
+      <polygon points="0 0, 8 3, 0 6" fill="#dc2626"/>
+    </marker>
+    <style>
+      text { font-family: Arial, Helvetica, sans-serif; font-size: 11px; fill: #333; }
+      .title { font-size: 12px; font-weight: bold; }
+      .directive { font-size: 11px; font-weight: bold; fill: #333; }
+      .part { font-size: 10px; }
+      .backref { font-size: 11px; font-weight: bold; }
+      .backref-rule { fill: #2563eb; }
+      .backref-cond { fill: #dc2626; }
+      .note { font-size: 9px; fill: #666; font-style: italic; }
+      .order { font-size: 9px; fill: #888; }
+      .ellipsis { font-size: 14px; fill: #666; }
+      rect.cond-box { fill: #fef3c7; stroke: #d97706; stroke-width: 1.5; rx: 4; ry: 4; }
+      rect.rule-box { fill: #dbeafe; stroke: #2563eb; stroke-width: 1.5; rx: 4; ry: 4; }
+      rect.cond-last { fill: #fde68a; stroke: #b45309; stroke-width: 2; rx: 4; ry: 4; }
+    </style>
+  </defs>
+
+  <text x="260" y="16" text-anchor="middle" class="title">Figure 2: Backreference Flow in mod_rewrite</text>
+
+  <!-- Processing order annotation -->
+  <text x="468" y="70" class="order">② evaluated</text>
+  <text x="468" y="81" class="order">second</text>
+  <text x="468" y="170" class="order">① matched</text>
+  <text x="468" y="181" class="order">first</text>
+
+  <!-- RewriteCond 1 -->
+  <text x="15" y="48" class="directive">RewriteCond 1</text>
+  <rect class="cond-box" x="125" y="34" width="115" height="24"/>
+  <text x="182" y="50" text-anchor="middle" class="part">TestString</text>
+  <rect class="cond-box" x="255" y="34" width="115" height="24"/>
+  <text x="312" y="50" text-anchor="middle" class="part">CondPattern</text>
+
+  <!-- RewriteCond 2 -->
+  <text x="15" y="78" class="directive">RewriteCond 2</text>
+  <rect class="cond-box" x="125" y="64" width="115" height="24"/>
+  <text x="182" y="80" text-anchor="middle" class="part">TestString</text>
+  <rect class="cond-box" x="255" y="64" width="115" height="24"/>
+  <text x="312" y="80" text-anchor="middle" class="part">CondPattern</text>
+
+  <!-- Ellipsis -->
+  <text x="60" y="103" text-anchor="middle" class="ellipsis">⋮</text>
+  <text x="182" y="103" text-anchor="middle" class="ellipsis">⋮</text>
+  <text x="312" y="103" text-anchor="middle" class="ellipsis">⋮</text>
+
+  <!-- RewriteCond n (last matched) -->
+  <text x="15" y="127" class="directive">RewriteCond n</text>
+  <rect class="cond-last" x="125" y="113" width="115" height="24"/>
+  <text x="182" y="129" text-anchor="middle" class="part">TestString</text>
+  <rect class="cond-last" x="255" y="113" width="115" height="24"/>
+  <text x="312" y="129" text-anchor="middle" class="part">CondPattern</text>
+
+  <!-- RewriteRule -->
+  <text x="15" y="172" class="directive">RewriteRule</text>
+  <rect class="rule-box" x="125" y="158" width="115" height="24"/>
+  <text x="182" y="174" text-anchor="middle" class="part">Pattern</text>
+  <rect class="rule-box" x="255" y="158" width="160" height="24"/>
+  <text x="335" y="174" text-anchor="middle" class="part">Substitution</text>
+
+  <!-- === BACKREFERENCE ARROWS === -->
+
+  <!-- $N (blue): Rule Pattern → RewriteCond 1 TestString -->
+  <path d="M 155,158 C 120,148 100,80 100,56 C 100,48 110,46 125,46"
+        style="stroke: #2563eb; stroke-width: 2.2; fill: none; marker-end: url(#arrowhead-blue);"/>
+
+  <!-- $N (blue): Rule Pattern → RewriteCond 2 TestString -->
+  <path d="M 145,158 C 108,148 88,100 88,76 C 88,70 100,68 125,68"
+        style="stroke: #2563eb; stroke-width: 2.2; fill: none; marker-end: url(#arrowhead-blue);"/>
+
+  <!-- $N (blue): Rule Pattern → RewriteCond n TestString -->
+  <path d="M 140,158 C 100,150 80,140 80,125 C 80,118 100,117 125,117"
+        style="stroke: #2563eb; stroke-width: 2.2; fill: none; marker-end: url(#arrowhead-blue);"/>
+
+  <!-- $N (blue): Rule Pattern → Rule Substitution -->
+  <path d="M 182,182 C 182,210 335,210 335,182"
+        style="stroke: #2563eb; stroke-width: 2.2; fill: none; marker-end: url(#arrowhead-blue);"/>
+
+  <!-- $N label — positioned to the left of the arrows, clear of text -->
+  <text x="55" y="155" class="backref backref-rule">$1...$9</text>
+
+  <!-- %N (red): Last CondPattern → Rule Substitution -->
+  <path d="M 370,125 C 420,125 430,150 415,158 C 405,163 395,166 415,170"
+        style="stroke: #dc2626; stroke-width: 2.2; fill: none; marker-end: url(#arrowhead-red);"/>
+  <text x="425" y="145" class="backref backref-cond">%1...%9</text>
+
+  <!-- $N label on bottom arrow -->
+  <text x="260" y="218" text-anchor="middle" class="backref backref-rule">$1...$9</text>
+
+  <!-- Legend -->
+  <line x1="15" y1="250" x2="55" y2="250" style="stroke: #2563eb; stroke-width: 3; fill: none; marker-end: none;"/>
+  <text x="60" y="254" class="backref backref-rule">$N — from RewriteRule Pattern (matched first) → all TestStrings + Substitution</text>
+  <line x1="15" y1="270" x2="55" y2="270" style="stroke: #dc2626; stroke-width: 3; fill: none; marker-end: none;"/>
+  <text x="60" y="274" class="backref backref-cond">%N — from last matched CondPattern → Substitution</text>
+</svg>
\ No newline at end of file

diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index 0c6bc2c8008bd2ce4bdb0e75f4234c01eeabdd66..c26eb4459fe9016288bbad8658bf481968bc2e32 100644 (file)
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -216,6 +216,8 @@ RewriteRule "!^/admin" "/xyz.html" [R,L]
       <dfn>Figure 1:</dfn> The back-reference flow through a rule.<br />
       In this example, a request for <code>/test/1234</code> would be transformed into <code>/admin.foo?page=test&amp;id=1234&amp;host=admin.example.com</code>.
 </p>
+      <p>See also <a href="tech.html#InternalRuleset">Technical Details</a>
+      for a diagram showing backreference flow with multiple conditions.</p>
 
 </section>
 </section>

diff --git a/docs/manual/rewrite/tech.xml b/docs/manual/rewrite/tech.xml
index 9e3922b4ac6349748e18bdfa82c7d3ca25acd8f5..8e1eded63817242a9d013f7eb259ee1f21f6d8f7 100644 (file)
--- a/docs/manual/rewrite/tech.xml
+++ b/docs/manual/rewrite/tech.xml
@@ -258,6 +258,16 @@ RewriteRule "^/horses/ponies$" "/special-handler" [L]
       with the substitution of the URL with
       <em>Substitution</em>.</p>
 
+<p class="figure">
+      <img src="../images/mod_rewrite_fig2.png"
+          alt="Flow of backreferences between RewriteRule and
+          RewriteCond directives" /><br />
+      <dfn>Figure 3:</dfn>The flow of backreferences through a rule.
+      RewriteRule Pattern is matched first; its captures ($1...$9)
+      are available in all RewriteCond TestStrings. The last matched
+      CondPattern's captures (%1...%9) are available in Substitution.
+</p>
+
 </section>