Skip to content

Commit 133113d

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.3
2 parents d3db7d1 + 513dcd6 commit 133113d

4 files changed

Lines changed: 13 additions & 1 deletion

File tree

system/Commands/Server/rewrite.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
return;
2525
}
2626

27-
$uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
27+
$uri = urldecode(
28+
parse_url('https://codeigniter.com' . $_SERVER['REQUEST_URI'], PHP_URL_PATH) ?? ''
29+
);
2830

2931
// All request handle by index.php file.
3032
$_SERVER['SCRIPT_NAME'] = '/index.php';

user_guide_src/source/changelogs/v4.2.0.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ Behavior Changes
6060
Enhancements
6161
************
6262

63+
.. _v420-new-improved-auto-routing:
64+
6365
New Improved Auto Routing
6466
=========================
6567

user_guide_src/source/incoming/controllers.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ Auto Routing (Improved)
153153

154154
Since v4.2.0, the new more secure Auto Routing has been introduced.
155155

156+
.. note:: If you are familiar with Auto Routing, which was enabled by default
157+
from CodeIgniter 3 through 4.1.x, you can see the differences in
158+
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
159+
156160
This section describes the functionality of the new auto-routing.
157161
It automatically routes an HTTP request, and executes the corresponding controller method
158162
without route definitions.

user_guide_src/source/incoming/routing.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@ Auto Routing (Improved)
606606

607607
Since v4.2.0, the new more secure Auto Routing has been introduced.
608608

609+
.. note:: If you are familiar with Auto Routing, which was enabled by default
610+
from CodeIgniter 3 through 4.1.x, you can see the differences in
611+
:ref:`ChangeLog v4.2.0 <v420-new-improved-auto-routing>`.
612+
609613
When no defined route is found that matches the URI, the system will attempt to match that URI against the controllers and methods when Auto Routing is enabled.
610614

611615
.. important:: For security reasons, if a controller is used in the defined routes, Auto Routing (Improved) does not route to the controller.

0 commit comments

Comments
 (0)