Skip to content

Fix GH-17951: Addition of max_memory_limit INI #18011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+209 −2
Open

Fix GH-17951: Addition of max_memory_limit INI #18011

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9341c6e
Fix GH-17951: Addition of max_memory_limit INI
frederikpyt Mar 10, 2025
25c4028
Fix format specifiers to match type & utilize stage
frederikpyt Mar 10, 2025
2d61446
Fix format specifiers to be platform specific
frederikpyt Mar 10, 2025
9e42b57
Fix scenario where max_memory_limit could be lower than memory_limit
frederikpyt Mar 10, 2025
da70576
Fix issues addressed during review
frederikpyt Mar 10, 2025
72f4df4
Made it so max_memory_limit INI is set before memory_limit INI
frederikpyt Mar 11, 2025
ffe7913
Fix whitespace and remove vim comments
frederikpyt Mar 11, 2025
1d49976
Changed fatals to warnings during startup
frederikpyt Apr 22, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix whitespace and remove vim comments
  • Loading branch information
@frederikpyt
frederikpyt committed Mar 11, 2025
commit ffe79135b50c31701cd3cc849317e1e73f6a41de
4 changes: 0 additions & 4 deletions main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ static PHP_INI_MH(OnSetSerializePrecision)
static PHP_INI_MH(OnChangeMemoryLimit)
{
size_t value;

if (new_value) {
value = zend_ini_parse_uquantity_warn(new_value, entry->name);
} else {
Expand Down Expand Up @@ -360,13 +359,11 @@ static PHP_INI_MH(OnChangeMemoryLimit)
return FAILURE;
}
}

PG(memory_limit) = value;
return SUCCESS;
}
/* }}} */

/* {{{ PHP_INI_MH */
static PHP_INI_MH(OnChangeMaxMemoryLimit)
{
size_t value;
Expand All @@ -386,7 +383,6 @@ static PHP_INI_MH(OnChangeMaxMemoryLimit)

return SUCCESS;
}
/* }}} */

/* {{{ PHP_INI_MH */
static PHP_INI_MH(OnSetLogFilter)
Expand Down
Loading