From ac4957bb3d1853a9c5379a9e75c1050fd505721a Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 20:37:09 +0200 Subject: [PATCH 1/9] Add manual page redirects configuration --- redirects.xml | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 454 insertions(+) create mode 100644 redirects.xml diff --git a/redirects.xml b/redirects.xml new file mode 100644 index 000000000000..d6dc8252ff5e --- /dev/null +++ b/redirects.xml @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 58454a46575bec8041432fbff666ded0bdffdeaf Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 20:42:14 +0200 Subject: [PATCH 2/9] Revise current redirects. Remove old redirects --- redirects.xml | 74 +++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 55 deletions(-) diff --git a/redirects.xml b/redirects.xml index d6dc8252ff5e..111c7a80b525 100644 --- a/redirects.xml +++ b/redirects.xml @@ -101,23 +101,17 @@ - - - - - - - - + + - - - + + + @@ -180,8 +174,8 @@ - - + + - - + + @@ -244,10 +238,7 @@ - - - - + @@ -260,17 +251,11 @@ - - - - - - + - - - + + @@ -278,27 +263,23 @@ - - - - - + + - + - - - + + @@ -314,8 +295,6 @@ - - @@ -334,8 +313,6 @@ - - @@ -413,29 +390,16 @@ - - - - - - - - - - - - - - + From 78cb9795ad8a648eb1683b542f41f94095d33dc1 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 20:46:16 +0200 Subject: [PATCH 3/9] remove xmlns attribute and update security redirect --- redirects.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redirects.xml b/redirects.xml index 111c7a80b525..3c702bf41938 100644 --- a/redirects.xml +++ b/redirects.xml @@ -20,7 +20,7 @@ space; non-manual regex rewrites (news-N, release_*, GH-N, .php3) remain in error.php. --> - + @@ -403,7 +403,7 @@ - + From e2e166c2ad281083ed274f8df9a7e6bc932e949f Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 20:48:26 +0200 Subject: [PATCH 4/9] update security redirect to manual section --- redirects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redirects.xml b/redirects.xml index 3c702bf41938..a5e7bb5e3ae6 100644 --- a/redirects.xml +++ b/redirects.xml @@ -403,7 +403,7 @@ - + From a4754077d73c0e2f0e58aa797252b617ed6c3f3d Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 21:06:10 +0200 Subject: [PATCH 5/9] simplify redirects.xml comments and update security redirect --- redirects.xml | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/redirects.xml b/redirects.xml index a5e7bb5e3ae6..060e21b008a7 100644 --- a/redirects.xml +++ b/redirects.xml @@ -2,10 +2,10 @@ - - - - @@ -83,11 +73,7 @@ - - - - - + @@ -368,11 +354,7 @@ - - - - - + @@ -403,7 +385,7 @@ - + From 074ea0f110a200f5149b1aaf1b8ac421135fd954 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Mon, 6 Jul 2026 23:15:45 +0200 Subject: [PATCH 6/9] normalize redirects.xml formatting --- redirects.xml | 886 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 631 insertions(+), 255 deletions(-) diff --git a/redirects.xml b/redirects.xml index 060e21b008a7..eb8712cc5d7e 100644 --- a/redirects.xml +++ b/redirects.xml @@ -1,8 +1,9 @@ + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + @@ -58,110 +59,97 @@ - - + + - + - - - - + + + + - + - - - + + + - + - + - - - - - + + + - + - - - - - - - - - + + + + + - - - - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - + + + + + + + + - + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + - + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + - - - + + + - - + + @@ -244,10 +226,10 @@ - - + + - + @@ -257,144 +239,538 @@ Temporary hack to fix bug #49956 for mysqli. Data taken from mysqli/summary.xml. --> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - + - - - - - + + + + + - + + - + - - - - - + + + + + - + From 21342a181346caaf7c14723ea01b98ddc841462d Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 9 Nov 2026 11:09:17 +0100 Subject: [PATCH 7/9] Point exception keywords and url-rewriter.tags redirects at existing pages language.exceptions is only an anchor since the error handling restructure, and ini.url-rewriter.tags lives on the output control configuration page. --- redirects.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/redirects.xml b/redirects.xml index eb8712cc5d7e..e550ab639293 100644 --- a/redirects.xml +++ b/redirects.xml @@ -204,7 +204,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -603,12 +603,12 @@ - + - + @@ -666,7 +666,7 @@ - + From acaa3edde81b6f8d09ea4434ff3423836e2bf8e3 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 16 Nov 2026 19:22:39 +0100 Subject: [PATCH 8/9] Serve shortcut expansions in place, keep 301 for renamed pages A shortcut that is only an expansion (php.net/try) is not a redirect: its group is now marked serve="in-place". The shortcuts that stand for an old page name (tut.php, faq.php, the PHP 5 assets, the renamed regexp pages) move to a separate group that keeps the 301. --- redirects.xml | 54 +++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/redirects.xml b/redirects.xml index e550ab639293..18410ee2cb85 100644 --- a/redirects.xml +++ b/redirects.xml @@ -6,7 +6,10 @@ Rendered to redirects.php by phd and included by web-php/error.php. Only redirects that concern manual pages live here; - Every redirect here is served with HTTP 301. + A redirect is served with HTTP 301 when the name of a page changed. + A shortcut that is only an expansion (php.net/try) is not a redirect: + its group is marked serve="in-place" and the page is served at the + requested URL, without a round trip. Scopes: shortcut match a bare URI (php.net/{from}) @@ -14,6 +17,10 @@ in-manual match a manual URI (php.net/manual/{lang}/{from}.php) -> /manual/{lang}/{to}.php both fires at either entry point (bare or in-manual) + + Attribute of a group: + serve="in-place" serve the target page at the requested URL + instead of redirecting (default: 301) --> @@ -75,7 +82,7 @@ - + @@ -158,11 +165,7 @@ - - - - @@ -184,8 +187,6 @@ - - @@ -211,26 +212,9 @@ - - - - - - - - - - - - - - - - - @@ -730,6 +714,26 @@ + + + + + + + + + + + + + + + + + + + + From 0bcbe990f5f3c326d7a7924c844ae04b76f0bc54 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 16 Nov 2026 19:26:51 +0100 Subject: [PATCH 9/9] Keep the 301 for the shortcuts that point to an anchor Served in place, the page would not scroll to the anchor (INI directives and a few keywords), so these shortcuts stay redirects. --- redirects.xml | 387 +++++++++++++++++++++++++------------------------- 1 file changed, 193 insertions(+), 194 deletions(-) diff --git a/redirects.xml b/redirects.xml index 18410ee2cb85..9d0ceb23516f 100644 --- a/redirects.xml +++ b/redirects.xml @@ -320,8 +320,200 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -529,209 +721,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -