Remove the upload and memory setting #14430

nickvergessen · 2019-02-28T10:06:47Z

See #13990 for details and discussion

MorrisJobke

Tested and works 👍

rcdailey

To the best of my limited knowledge of the code base, looks good to me. And some of this looks familiar because on my branch I started removing some of this. Looks like you covered a lot more than I thought to look at though. Thanks so much for your change!

ghost · 2019-03-01T09:24:54Z

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16565: failure

ENABLE_REDIS=true, TESTS=nodb-codecov

Show full log

There was 1 error:

1) Test\IntegrityCheck\CheckerTest::testWriteCoreSignatureWithValidModifiedHtaccessAndUserIni
Exception: /drone/src/github.com/nextcloud/server/tests/data/integritycheck/htaccessWithValidModifiedContent/core is not writable

/drone/src/github.com/nextcloud/server/lib/private/IntegrityCheck/Checker.php:283
/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:660

--

There was 1 failure:

1) Test\IntegrityCheck\CheckerTest::testVerifyCoreSignatureWithValidModifiedHtaccessAndUserIniSignatureData
Failed asserting that Array &0 (
    'INVALID_HASH' => Array &1 (
        '.htaccess' => Array &2 (
            'expected' => '9a37a508ad4cc3a7ff668e3cd63177891e5601143fa18bb605346020d5f3cd7979748beab956554aca43ae59ff146755cfe83de0f93a3a7bb328b1395b2ccf2f'
            'current' => 'e7140c092ecf6ed3401f922efc81b635cb253d90f56cad5ad9765511edf6b2d8c663fcb5648617d561ecd2cf7ae8503d7d2ce3b88f46844d5771909aa0dba188'
        )
        '.user.ini' => Array &3 (
            'expected' => '467d4f028c447895716a2b7859ed6e569f8ee34b87b51d73dab2e6a9ca4fbe63172c7be3e365ae864a60408286afcce852dd38ee544b61685ed4ee5e021fecb0'
            'current' => '8362e2f91924dde144162fe6b6757d88b8e6cd7266fd0e90e32aee37e662b7854384a211ac44e8703fa093833df6d5cceef5426eb141dc2638ff88d245cea3c0'
        )
    )
) is identical to Array &0 ().

/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:763

DB=NODB, ENABLE_REDIS=true, PHP=7.1

Show full log

There was 1 error:

1) Test\IntegrityCheck\CheckerTest::testWriteCoreSignatureWithValidModifiedHtaccessAndUserIni
Exception: /drone/src/github.com/nextcloud/server/tests/data/integritycheck/htaccessWithValidModifiedContent/core is not writable

/drone/src/github.com/nextcloud/server/lib/private/IntegrityCheck/Checker.php:283
/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:660

--

There was 1 failure:

1) Test\IntegrityCheck\CheckerTest::testVerifyCoreSignatureWithValidModifiedHtaccessAndUserIniSignatureData
Failed asserting that Array &0 (
    'INVALID_HASH' => Array &1 (
        '.htaccess' => Array &2 (
            'expected' => '9a37a508ad4cc3a7ff668e3cd63177891e5601143fa18bb605346020d5f3cd7979748beab956554aca43ae59ff146755cfe83de0f93a3a7bb328b1395b2ccf2f'
            'current' => 'e7140c092ecf6ed3401f922efc81b635cb253d90f56cad5ad9765511edf6b2d8c663fcb5648617d561ecd2cf7ae8503d7d2ce3b88f46844d5771909aa0dba188'
        )
        '.user.ini' => Array &3 (
            'expected' => '467d4f028c447895716a2b7859ed6e569f8ee34b87b51d73dab2e6a9ca4fbe63172c7be3e365ae864a60408286afcce852dd38ee544b61685ed4ee5e021fecb0'
            'current' => '8362e2f91924dde144162fe6b6757d88b8e6cd7266fd0e90e32aee37e662b7854384a211ac44e8703fa093833df6d5cceef5426eb141dc2638ff88d245cea3c0'
        )
    )
) is identical to Array &0 ().

/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:763

DB=NODB, ENABLE_REDIS=false, PHP=7.2

Show full log

There was 1 error:

1) Test\IntegrityCheck\CheckerTest::testWriteCoreSignatureWithValidModifiedHtaccessAndUserIni
Exception: /drone/src/github.com/nextcloud/server/tests/data/integritycheck/htaccessWithValidModifiedContent/core is not writable

/drone/src/github.com/nextcloud/server/lib/private/IntegrityCheck/Checker.php:283
/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:660

--

There was 1 failure:

1) Test\IntegrityCheck\CheckerTest::testVerifyCoreSignatureWithValidModifiedHtaccessAndUserIniSignatureData
Failed asserting that Array &0 (
    'INVALID_HASH' => Array &1 (
        '.htaccess' => Array &2 (
            'expected' => '9a37a508ad4cc3a7ff668e3cd63177891e5601143fa18bb605346020d5f3cd7979748beab956554aca43ae59ff146755cfe83de0f93a3a7bb328b1395b2ccf2f'
            'current' => 'e7140c092ecf6ed3401f922efc81b635cb253d90f56cad5ad9765511edf6b2d8c663fcb5648617d561ecd2cf7ae8503d7d2ce3b88f46844d5771909aa0dba188'
        )
        '.user.ini' => Array &3 (
            'expected' => '467d4f028c447895716a2b7859ed6e569f8ee34b87b51d73dab2e6a9ca4fbe63172c7be3e365ae864a60408286afcce852dd38ee544b61685ed4ee5e021fecb0'
            'current' => '8362e2f91924dde144162fe6b6757d88b8e6cd7266fd0e90e32aee37e662b7854384a211ac44e8703fa093833df6d5cceef5426eb141dc2638ff88d245cea3c0'
        )
    )
) is identical to Array &0 ().

/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:763

DB=NODB, ENABLE_REDIS=false, PHP=7.3

Show full log

There was 1 error:

1) Test\IntegrityCheck\CheckerTest::testWriteCoreSignatureWithValidModifiedHtaccessAndUserIni
Exception: /drone/src/github.com/nextcloud/server/tests/data/integritycheck/htaccessWithValidModifiedContent/core is not writable

/drone/src/github.com/nextcloud/server/lib/private/IntegrityCheck/Checker.php:283
/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:660

--

There was 1 failure:

1) Test\IntegrityCheck\CheckerTest::testVerifyCoreSignatureWithValidModifiedHtaccessAndUserIniSignatureData
Failed asserting that Array &0 (
    'INVALID_HASH' => Array &1 (
        '.htaccess' => Array &2 (
            'expected' => '9a37a508ad4cc3a7ff668e3cd63177891e5601143fa18bb605346020d5f3cd7979748beab956554aca43ae59ff146755cfe83de0f93a3a7bb328b1395b2ccf2f'
            'current' => 'e7140c092ecf6ed3401f922efc81b635cb253d90f56cad5ad9765511edf6b2d8c663fcb5648617d561ecd2cf7ae8503d7d2ce3b88f46844d5771909aa0dba188'
        )
        '.user.ini' => Array &3 (
            'expected' => '467d4f028c447895716a2b7859ed6e569f8ee34b87b51d73dab2e6a9ca4fbe63172c7be3e365ae864a60408286afcce852dd38ee544b61685ed4ee5e021fecb0'
            'current' => '8362e2f91924dde144162fe6b6757d88b8e6cd7266fd0e90e32aee37e662b7854384a211ac44e8703fa093833df6d5cceef5426eb141dc2638ff88d245cea3c0'
        )
    )
) is identical to Array &0 ().

/drone/src/github.com/nextcloud/server/tests/lib/IntegrityCheck/CheckerTest.php:763

ENABLE_OPENLDAP=true, ENABLE_REDIS=true, TESTS=integration-ldap-openldap-features
- git clone failure - can typically be ignored
ENABLE_OPENLDAP=true, ENABLE_REDIS=true, TESTS=integration-ldap-openldap-uid-features
- git clone failure - can typically be ignored

rullzer

Fine by me 👍

MorrisJobke · 2019-03-01T13:11:07Z

unit tests still fail - let me look into this.

tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json

MorrisJobke · 2019-03-04T10:07:26Z

I will update this once #14493 is in to avoid doubled work due to conflicting lines.

* Remove unneeded private method phpFileSize() * Bump autoloader * Remove setUploadLimit tests * Remove integrity check hacks for upload limit Signed-off-by: Joas Schilling <[email protected]> Signed-off-by: Morris Jobke <[email protected]>

MorrisJobke · 2019-03-04T11:14:35Z

I rebased this and fixed the failing tests.

MorrisJobke · 2019-03-04T12:32:33Z

Failures are unrelated -> merging.

rcdailey · 2019-03-05T20:43:00Z

Thanks to everyone for the help on this one. You're all awesome! 🎊

nickvergessen added bug 3. to review Waiting for reviews feature: settings labels Feb 28, 2019

nickvergessen added this to the Nextcloud 16 milestone Feb 28, 2019

nickvergessen requested review from MorrisJobke and rcdailey February 28, 2019 10:06

MorrisJobke approved these changes Feb 28, 2019

View reviewed changes

MorrisJobke requested review from blizzz and rullzer February 28, 2019 11:17

MorrisJobke mentioned this pull request Feb 28, 2019

Remove memory and upload PHP settings #13990

Closed

rcdailey approved these changes Feb 28, 2019

View reviewed changes

This was referenced Feb 28, 2019

Configure PHP memory_limit via environment variable nextcloud/docker#568

Closed

Exclude memory_limit from .user.ini and .htaccess #121

Closed

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish 2. developing Work in progress and removed 3. to review Waiting for reviews 4. to release Ready to be released and/or waiting for tests to finish labels Feb 28, 2019

rullzer approved these changes Mar 1, 2019

View reviewed changes

MorrisJobke mentioned this pull request Mar 4, 2019

Remove unused php5 config from .htaccess #14493

Merged

MorrisJobke reviewed Mar 4, 2019

View reviewed changes

tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json Outdated Show resolved Hide resolved

MorrisJobke force-pushed the bugfix/13990/remove-upload-setting branch from c14edb9 to c6a69ba Compare March 4, 2019 11:14

Remove the upload and memory setting

c6a69ba

* Remove unneeded private method phpFileSize() * Bump autoloader * Remove setUploadLimit tests * Remove integrity check hacks for upload limit Signed-off-by: Joas Schilling <[email protected]> Signed-off-by: Morris Jobke <[email protected]>

MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 4, 2019

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 4, 2019

MorrisJobke mentioned this pull request Mar 4, 2019

16.0.0 Alpha 1 #14501

Merged

45 tasks

MorrisJobke merged commit bbb168a into master Mar 4, 2019

MorrisJobke deleted the bugfix/13990/remove-upload-setting branch March 4, 2019 12:32

MorrisJobke mentioned this pull request Mar 14, 2019

Maximum upload size resets to 511MB #14704

Closed

wiswedel mentioned this pull request May 13, 2019

Can anyone explain why the “upload and memory setting” has been removed? #15512

Closed

kesselb mentioned this pull request Jul 23, 2019

Integrity check fails on 16.0.2 / 16.0.3 #16391

Closed

This was referenced Sep 29, 2019

Suggestion: Allow us to specify Upload Max Size in Docker-Compose nextcloud/docker#873

Closed

Change upload_max_filesize nextcloud/docker#865

Closed

Remove "configuring upload limits within the gui" nextcloud/documentation#1643

Merged

silentcreek mentioned this pull request Jan 4, 2020

Regression: Removed upload and memory limit settings resulting in lower effective defaults since Nextcloud 16 #18655

Closed

kesselb mentioned this pull request Mar 13, 2020

modified .user.ini integrity check fails #19935

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove the upload and memory setting #14430

Remove the upload and memory setting #14430

nickvergessen commented Feb 28, 2019

MorrisJobke left a comment

rcdailey left a comment

ghost commented Mar 1, 2019

rullzer left a comment

MorrisJobke commented Mar 1, 2019

MorrisJobke commented Mar 4, 2019

MorrisJobke commented Mar 4, 2019

MorrisJobke commented Mar 4, 2019

rcdailey commented Mar 5, 2019

Remove the upload and memory setting #14430

Remove the upload and memory setting #14430

Conversation

nickvergessen commented Feb 28, 2019

MorrisJobke left a comment

Choose a reason for hiding this comment

rcdailey left a comment

Choose a reason for hiding this comment

ghost commented Mar 1, 2019

Status of 16565: failure

rullzer left a comment

Choose a reason for hiding this comment

MorrisJobke commented Mar 1, 2019

MorrisJobke commented Mar 4, 2019

MorrisJobke commented Mar 4, 2019

MorrisJobke commented Mar 4, 2019

rcdailey commented Mar 5, 2019