Skip to content
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

Jump to bottom

[stable24] Respect user settings in php.ini if they are big enough #33644

Merged
merged 3 commits into from
Aug 23, 2022
Merged

[stable24] Respect user settings in php.ini if they are big enough #33644

merged 3 commits into from
Aug 23, 2022

Commits on Aug 22, 2022

  1. Respect user settings in php.ini if they are big enough 

    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>
    @mickenordin @backportbot-nextcloud
    mickenordin authored and backportbot-nextcloud[bot] committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    ab7a5de View commit details
    Browse the repository at this point in the history

  2. Simpler version as proposed by @artonage 

    Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Micke Nordin <kano@sunet.se>
    @mickenordin @artonge @backportbot-nextcloud
    2 people authored and backportbot-nextcloud[bot] committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    da6e0d7 View commit details
    Browse the repository at this point in the history

  3. Fix suggestions by @artonage 

    Signed-off-by: Micke Nordin <kano@sunet.se>
    @mickenordin @backportbot-nextcloud
    mickenordin authored and backportbot-nextcloud[bot] committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    47fd27b View commit details
    Browse the repository at this point in the history