bug #44327 [Debug][ErrorHandler] Increased the reserved memory from 10k to 32k (sakalys)

fabpot · fabpot · commit cacce1cdc8b1 · 2021-11-29T10:14:08.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Debug][ErrorHandler] Increased the reserved memory from 10k to 32k | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40824 | License | MIT | Doc PR | n/a The ErrorHandler's job includes handling out of memory (OOM) exceptions, therefore it is important that that feature works. In the current state, when handling OOM exceptions, the error handler produces an OOM error itself, because the old 10kB reserve is apparently not enough anymore. To mitigate that, the reserved memory gets bumped to 32k (which is enough). *Note* I'm not familiar with the whole open source submitting process, so any feedback and instructions on how to improve this PR are welcome. I am not sure on how to write a unit test to test something like that (talking about the issue here #40824). Commits ------- cbac313 Increased the reserved memory from 10k to 32k
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -119,7 +119,7 @@ class ErrorHandler
     public static function register(self $handler = null, $replace = true)
     {
         if (null === self::$reservedMemory) {
-            self::$reservedMemory = str_repeat('x', 10240);
+            self::$reservedMemory = str_repeat('x', 32768);
             register_shutdown_function(__CLASS__.'::handleFatalError');
         }
 
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -111,7 +111,7 @@ class ErrorHandler
     public static function register(self $handler = null, bool $replace = true): self
     {
         if (null === self::$reservedMemory) {
-            self::$reservedMemory = str_repeat('x', 10240);
+            self::$reservedMemory = str_repeat('x', 32768);
             register_shutdown_function(__CLASS__.'::handleFatalError');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class ErrorHandler`
`119`	`119`	`public static function register(self $handler = null, $replace = true)`
`120`	`120`	`{`
`121`	`121`	`if (null === self::$reservedMemory) {`
`122`		`- self::$reservedMemory = str_repeat('x', 10240);`
	`122`	`+ self::$reservedMemory = str_repeat('x', 32768);`
`123`	`123`	`register_shutdown_function(__CLASS__.'::handleFatalError');`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ class ErrorHandler`
`111`	`111`	`public static function register(self $handler = null, bool $replace = true): self`
`112`	`112`	`{`
`113`	`113`	`if (null === self::$reservedMemory) {`
`114`		`- self::$reservedMemory = str_repeat('x', 10240);`
	`114`	`+ self::$reservedMemory = str_repeat('x', 32768);`
`115`	`115`	`register_shutdown_function(__CLASS__.'::handleFatalError');`
`116`	`116`	`}`
`117`	`117`