Merge branch '7.4' into 8.0

* 7.4: (22 commits)
  Fix Warning: curl_multi_select(): timeout must be positive
  [PropertyInfo] Fix ReflectionExtractor handling of underscore-only property names
  ObjectNormalizer: allow null and scalar
  [Security] Fix `HttpUtils::createRequest()` when the context’s base URL isn’t empty
  [Serializer] fix Inherited properties normalization
  [OptionsResolver] Fix missing prototype key in nested error paths
  Bump Symfony version to 7.3.8
  Update VERSION for 7.3.7
  Update CHANGELOG for 7.3.7
  Bump Symfony version to 6.4.30
  Update VERSION for 6.4.29
  Update CHANGELOG for 6.4.29
  [FrameworkBundle] Update deprecation message for collect_serializer_data
  run test using a read-only directory on Windows too
  [Yaml] Fix parsing of unquoted multiline scalars with comments or blank lines
  [Clock] Align MockClock::sleep() behavior with NativeClock for negative values
  [OptionsResolver] Ensure remove() also unsets deprecation status
  Remove review state for Belarusian translations (entries 141 and 142)
  [ExpressionLanguage] Compile numbers with var_export in Compiler::repr for thread-safety
  compatibility with ext-redis 6.3
  ...

Author: xabbuh

HttpUtils.php

@@ -68,9 +68,21 @@ public function createRequest(Request $request, string $path): Request
         if ($trustedProxies = Request::getTrustedProxies()) {
             Request::setTrustedProxies([], Request::getTrustedHeaderSet());
         }
-        $newRequest = Request::create($this->generateUri($request, $path), 'get', [], $request->cookies->all(), [], $request->server->all());
-        if ($trustedProxies) {
-            Request::setTrustedProxies($trustedProxies, Request::getTrustedHeaderSet());
+
+        $context = $this->urlGenerator?->getContext();
+        if ($baseUrl = $context?->getBaseUrl()) {
+            $context->setBaseUrl('');
+        }
+
+        try {
+            $newRequest = Request::create($this->generateUri($request, $path), 'get', [], $request->cookies->all(), [], $request->server->all());
+        } finally {
+            if ($trustedProxies) {
+                Request::setTrustedProxies($trustedProxies, Request::getTrustedHeaderSet());
+            }
+            if ($baseUrl) {
+                $context->setBaseUrl($baseUrl);
+            }
         }
 
         static $setSession;

Tests/HttpUtilsTest.php

@@ -17,10 +17,13 @@
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Security\Http\HttpUtils;
 use Symfony\Component\Security\Http\SecurityRequestAttributes;
 
@@ -228,7 +231,7 @@ public static function provideSecurityRequestAttributes()
         ];
     }
 
-    public function testCreateRequestHandlesTrustedHeaders()
+    public function testCreateRequestFromPathHandlesTrustedHeaders()
     {
         Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_PREFIX);
 
@@ -238,6 +241,24 @@ public function testCreateRequestHandlesTrustedHeaders()
         );
     }
 
+    public function testCreateRequestFromRouteHandlesTrustedHeaders()
+    {
+        Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_PREFIX);
+
+        $request = Request::create('/', server: ['HTTP_X_FORWARDED_PREFIX' => '/foo']);
+
+        $urlGenerator = new UrlGenerator(
+            $routeCollection = new RouteCollection(),
+            (new RequestContext())->fromRequest($request),
+        );
+        $routeCollection->add('root', new Route('/'));
+
+        $this->assertSame(
+            'http://localhost/foo/',
+            (new HttpUtils($urlGenerator))->createRequest($request, 'root')->getUri(),
+        );
+    }
+
     public function testCheckRequestPath()
     {
         $utils = new HttpUtils($this->getUrlGenerator());