Merge remote-tracking branch 'origin/AC-15893' into spartans_pr_10112025

Author: glo60612

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php

@@ -129,7 +129,16 @@ public function execute()
 
         $result = $resultPage->getLayout()->renderElement('content');
         if ($request->getParam('as_js_varname')) {
-            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setUpdateResult($result);
+            $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
+
+            // Compress data for JSON responses to prevent session bloat while maintaining redirect pattern
+            if ($asJson && function_exists('gzencode')) {
+                // Level 6 compression for balance of speed/size
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                $session->setUpdateResult(['compressed' => true, 'data' => gzencode($result, 6)]);
+            } else {
+                $session->setUpdateResult($result);
+            }
             return $this->resultRedirectFactory->create()->setPath('sales/*/showUpdateResult');
         }
         return $this->resultRawFactory->create()->setContents($result);

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php

@@ -45,8 +45,7 @@ public function __construct(
     }
 
     /**
-     * Show item update result from loadBlockAction
-     * to prevent popup alert with resend data question
+     * Show item update result from loadBlockAction to prevent popup alert with resend data question
      *
      * @return \Magento\Framework\Controller\Result\Raw
      */
@@ -55,9 +54,25 @@ public function execute()
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
         $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
-        if ($session->hasUpdateResult() && is_scalar($session->getUpdateResult())) {
-            $resultRaw->setContents($session->getUpdateResult());
+
+        if ($session->hasUpdateResult()) {
+            $updateResult = $session->getUpdateResult();
+
+            // Handle compressed data (for JSON responses to reduce session bloat)
+            if (is_array($updateResult) && isset($updateResult['compressed']) && $updateResult['compressed']) {
+                if (isset($updateResult['data']) && function_exists('gzdecode')) {
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    $decompressed = gzdecode($updateResult['data']);
+                    // gzdecode returns false on error, handle gracefully
+                    $resultRaw->setContents(is_string($decompressed) ? $decompressed : '');
+                } else {
+                    $resultRaw->setContents('');
+                }
+            } elseif (is_scalar($updateResult)) {
+                $resultRaw->setContents($updateResult);
+            }
         }
+
         $session->unsUpdateResult();
         return $resultRaw;
     }