Fix infinite loop for unsecure upgrading to secure

Author: thomas-kl1

Plugin/App/Request/StorePathInfoValidator.php

@@ -36,14 +36,13 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
             $storeCode = $this->resolveStoreCode($request, $pathInfo);
             $pathInfo = $storeCode === '' ? $pathInfo : $storeCode;
         }
-        $this->stack--;
 
         return [$request, $pathInfo];
     }
 
     public function afterGetValidStoreCode(Subject $subject, ?string $store, Http $request, string $path = ''): ?string
     {
-        if (!$this->config->isStoreInPath() && $this->config->isBaseUrlResolverEnabled()) {
+        if ($this->stack === 1 && !$this->config->isStoreInPath() && $this->config->isBaseUrlResolverEnabled()) {
             try {
                 $store = $this->storeRepository->getActiveStoreByCode(
                     $this->resolveStoreCode($request, $path)
@@ -52,6 +51,7 @@ public function afterGetValidStoreCode(Subject $subject, ?string $store, Http $r
                 $store = null;
             }
         }
+        $this->stack--;
 
         return $store;
     }