summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [9.0] Call private cache methods only for `OC\Files\Cache\Cache`Daniel Jagszent2016-04-255-10/+34
| |/ /
* / / add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
|/ /
* | Merge pull request #24196 from ↵Thomas Müller2016-04-221-3/+3
|\ \ | | | | | | | | | | | | owncloud/backport-24183-change-background-job-sort-order [9.0] Change the sort order of background jobs to be DESC instead of ASC
| * | Change the sort order of background jobs to be DESC instead of ASCJoas Schilling2016-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In theory, if your instance ever creates more jobs then your system cron can handle, the default background jobs get never executed anymore. Because everytime when the joblist returns the next job it looks for the next ID, however there is always a new next ID, so it will never wrap back to execute the low IDs. But when we change the sort order to be DESC, we make sure that these low IDs are always executed, before the system jumps back up to execute the new IDs.
* | | Merge pull request #24195 from owncloud/stable9-fs-initmountpoint-nulluserThomas Müller2016-04-221-0/+3
|\ \ \ | | | | | | | | [stable9] Throw NoUserException when attempting to init mount point for null user
| * | | Throw NoUserException when attempting to init mount point for null userVincent Petry2016-04-221-0/+3
| |/ / | | | | | | | | | | | | | | | | | | In some scenarios initMountPoints is called with an empty user, and also there is no user in the session. In such cases, it is unsafe to let the code move on with an empty user.
* | | Merge pull request #24158 from owncloud/encryped-size-progation-9Thomas Müller2016-04-222-1/+11
|\ \ \ | |/ / |/| | [9.0] dont do optimized size propagation for encrypted files
| * | dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| | |
* | | Merge pull request #24131 from ↵Thomas Müller2016-04-222-0/+31
|\ \ \ | | | | | | | | | | | | | | | | owncloud/dont-transfer-files-to-not-ready-user-stable9 [9.0] Introduce isReadyForUser and verify in file transfer ownership
| * | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-202-0/+31
| | | |
* | | | [stable9] Ignore certificate file if it starts with file://Lukas Reschke2016-04-211-0/+7
| |/ / |/| |
* | | Merge pull request #24129 from owncloud/stable9_24098Thomas Müller2016-04-211-0/+2
|\ \ \ | | | | | | | | [stable9] When the scanner detects a file is changed clear checksum
| * | | When the scanner detects a file is changed clear checksumRoeland Jago Douma2016-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23782 and #23783 If the file scanner detects a changed file we clear the checksum while we update the cache. * Unit test added
* | | | Merge pull request #24134 from owncloud/fix-problems-caused-by-updaterThomas Müller2016-04-214-0/+129
|\ \ \ \ | | | | | | | | | | [stable9] Add repair step for updater issues
| * | | | Add repair step for updater issuesLukas Reschke2016-04-204-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updater as shipped with ownCloud =< 9.0.1 has several bugs leading to a not properly executed update. For example the third-party changes are not copied. This pull request: 1. Ships the third-party files changed since ownCloud 9.0.1 in the resources folder. On update the files are replaced. (https://github.com/owncloud/updater/issues/316) 2. Adds updater/* and _oc_upgrade/* as an exemption to the code integrity checker since the updater is updating in the wrong order. (https://github.com/owncloud/updater/issues/318)
* | | | | Write .htaccess also from CLILukas Reschke2016-04-201-7/+15
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating. This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression. - User installs 9.0.0 via web - User shares /s/1234 - User updates to 9.0.1 via ownCloud updater - Link to /s/1234 is broken, /index.php/s/1234 works
* | | | Merge pull request #23576 from owncloud/background-scan-unscanned-9Thomas Müller2016-04-201-19/+31
|\ \ \ \ | |_|/ / |/| | | [9.0] handle completely unscanned storages in the background scanner
| * | | handle completely unscanned storages in the background scannerRobin Appelman2016-03-241-19/+31
| | | |
* | | | preserve information if it is a rename operation or notBjörn Schießle2016-04-201-3/+4
| |/ / |/| |
* | | Merge pull request #23924 from josh4trunks/stable9Thomas Müller2016-04-131-1/+1
|\ \ \ | | | | | | | | Backport #23752 to stable9
| * | | Backport #23752 to stable9Joshua Ruehlig2016-04-111-1/+1
| | | | | | | | | | | | Fixes orientation of thumbnails and gallery view of JPG's with exif rotation.
* | | | Merge pull request #23930 from owncloud/stable9-backport-23901Thomas Müller2016-04-121-2/+9
|\ \ \ \ | | | | | | | | | | [stable9] Catch the AutoloadNotAllowedException also for legacy jobs
| * | | | Catch the AutoloadNotAllowedException also for legacy jobsMorris Jobke2016-04-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | * same as #18839 for legacy jobs * avoids spamming the log with useless entries
* | | | | Merge pull request #23784 from owncloud/stable9-backport-23304Thomas Müller2016-04-122-2/+15
|\ \ \ \ \ | |/ / / / |/| | | | [stable9] Fix PHP memory leak in file_get_contents()
| * | | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| | | | |
| * | | | Fix PHP memory leak in file_get_contents()Morris Jobke2016-04-042-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261
* | | | | Prevent null to be passed into the closure of callForAllUsersThomas Müller2016-04-072-10/+14
| | | | |
* | | | | Merge pull request #23572 from owncloud/stabe9-release-notesThomas Müller2016-04-062-0/+112
|\ \ \ \ \ | | | | | | | | | | | | [Stable9] release notes
| * | | | | Remove duplicated messageJoas Schilling2016-04-061-16/+5
| | | | | |
| * | | | | Show hint in CLIVictor Dubiniuk2016-04-063-26/+19
| | | | | |
| * | | | | Show release notesVictor Dubiniuk2016-04-052-0/+16
| | | | | |
| * | | | | Show cli notice for big installationsVictor Dubiniuk2016-04-051-10/+19
| | | | | |
| * | | | | Add releasenotes classVictor Dubiniuk2016-04-051-0/+105
| |/ / / /
* | | | | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9Thomas Müller2016-04-062-1/+12
|\ \ \ \ \ | | | | | | | | | | | | [stable9] Sabre plugin browser error page
| * | | | | Add magical regex to catch browsersLukas Reschke2016-03-241-0/+8
| | | | | |
| * | | | | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-241-1/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'stable9' into dont-collide-with-php-internalsC. Montero Luque2016-04-061-1/+1
|\ \ \ \ \
| * | | | | [stable9] Fix conditional check in MySQL setupDaniel Hansson2016-04-051-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Backport of #23760 Fix conditional check in MySQL setup.
* / | | | Use static methodLukas Reschke2016-04-051-3/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is ugly as hell. But if we directly access `\OCP\IUserSession::getUser` here PHP throws a segfault on some servers: ``` gdb /usr/sbin/apache2 --batch --quiet -ex "run -f /etc/apache2/apache2.conf -DNO_DETACH -DONE_PROCESS -DDEBUG $defines" -ex "quit" [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". AH00558: apache2: Could not reliably determine the server's fully qualified domain name, using 172.17.0.6. Set the 'ServerName' directive globally to suppress this message warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/mysql.so" does not match "/usr/lib/php5/20121212/mysql.so" (CRC mismatch). warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/mysql.so" does not match "/usr/lib/php5/20121212/mysql.so" (CRC mismatch). warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/mysqli.so" does not match "/usr/lib/php5/20121212/mysqli.so" (CRC mismatch). warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/mysqli.so" does not match "/usr/lib/php5/20121212/mysqli.so" (CRC mismatch). warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/pdo_mysql.so" does not match "/usr/lib/php5/20121212/pdo_mysql.so" (CRC mismatch). warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/pdo_mysql.so" does not match "/usr/lib/php5/20121212/pdo_mysql.so" (CRC mismatch). [New Thread 0x7fffdd206700 (LWP 28386)] [Thread 0x7fffdd206700 (LWP 28386) exited] [New Thread 0x7fffdd206700 (LWP 28387)] [New Thread 0x7fffdc975700 (LWP 28388)] Program received signal SIGSEGV, Segmentation fault. zend_parse_parameters (num_args=2, type_spec=type_spec@entry=0x7ffff3f85227 "s|s") at /build/php5-pO28mL/php5-5.5.9+dfsg/Zend/zend_API.c:923 923 /build/php5-pO28mL/php5-5.5.9+dfsg/Zend/zend_API.c: No such file or directory. A debugging session is active. Inferior 1 [process 28382] will be killed. Quit anyway? (y or n) [answered Y; input not from terminal] ``` I'm still struggling to get a minimal example of this (also considering that it doesn't happen on every system :party). Anyways, it's a functional workaround until I determined the root cause… (also given the fact that patches may never be backported to distributions :see_no_evil:
* | | | Merge pull request #23541 from owncloud/backport-23515-menu-languageThomas Müller2016-04-041-6/+4
|\ \ \ \ | | | | | | | | | | [9.0] Fix the translations of the User menu
| * | | | Fix the translations of the User menuJoas Schilling2016-03-241-6/+4
| | | | |
* | | | | [stable9] Read available l10n files also from theme folderMorris Jobke2016-04-042-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Read available l10n files also from theme folder The old behaviour was that only languages could be used for an app that are already present in the apps/$app/l10n folder. If there is a themed l10n that is not present in the apps default l10n folder the language could not be used and the texts are not translated. With this change this is possible and also the l10n files are loaded even if the default l10n doesn't contain the l10n file. * Inject server root - allows proper testing and separation of concerns
* | | | | Also replace password in updatePrivateKeyPasswordLukas Reschke2016-04-011-1/+1
| |_|/ / |/| | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23717
* | | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-04-013-1/+19
| | | | | | | | | | | | | | | | * fixes #23668
* | | | Merge pull request #23709 from ↵Thomas Müller2016-04-011-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/stable9-make-sure-that-encrypted-version-is-set [stable9] Make sure that the encrypted version is set
| * | | | Make sure that the encrypted version is setLukas Reschke2016-03-311-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following: 1. User uploaded a file 2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`. 3. The call when updating the file cache will use the old version.
* | | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-316-62/+160
|/ / / / | | | | | | | | | | | | | | | | | | | | in order to create a 1:1 copy of a file if a version gets created we need to store this information on copyBetweenStorage(). This allows us to by-pass the encryption wrapper if we read the source file.
* | | | Merge pull request #23640 from ↵Thomas Müller2016-03-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/backport-23545-lock-mountpoint-on-removal [9.0] Lock the mountpoint while removing
| * | | | Lock the mountpoint while removingJoas Schilling2016-03-301-0/+4
| | | | |
* | | | | Merge pull request #23659 from owncloud/backport-23654-xcache-availablilityThomas Müller2016-03-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [9.0] xcache.var_size with 64M should evaluate to isAvailable