Skip to content

[stable23] Respect user settings in php.ini if they are big enough - #33645

Merged
szaimen merged 4 commits into
stable23from
backport/32216/stable23
Aug 30, 2022
Merged

[stable23] Respect user settings in php.ini if they are big enough#33645
szaimen merged 4 commits into
stable23from
backport/32216/stable23

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Aug 22, 2022

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete (fixed with 356c732)

backport of #32216

mickenordinand others added 3 commits August 22, 2022 22:00
In the admin guide:
* https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html
it is mentioned that you can tweek:
* max_input_time
* max_execution_time
in order to enable larger file uploads. However, the current codebase
will hard code these values to one hour, no matter what the user sets in
php.ini.
This patch will allow the user to set these settings in php.ini and they
will be respected, if and only if, they are set to something bigger than
3600 seconds.
Signed-off-by: Micke Nordin <kano@sunet.se>
Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Micke Nordin <kano@sunet.se>
Signed-off-by: Micke Nordin <kano@sunet.se>
@blizzzblizzz mentioned this pull request Aug 30, 2022
1 task
@blizzz

Copy link
Copy Markdown
Member

@szaimen conflicts

@blizzzblizzz added the 2. developing Work in progress label Aug 30, 2022
@szaimen

Copy link
Copy Markdown
Contributor

oh, didn't see that. Thanks for the ping!

Signed-off-by: szaimen <szaimen@e.mail.de>
@szaimen

Copy link
Copy Markdown
Contributor

fixed with 356c732

@szaimenszaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 30, 2022
@szaimen

Copy link
Copy Markdown
Contributor

samba failure unrelated

@szaimen
szaimen merged commit 985e41f into stable23Aug 30, 2022
@szaimen
szaimen deleted the backport/32216/stable23 branch August 30, 2022 23:15
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz@szaimen@CarlSchwan@mickenordin