Merge branch 'patches/pi-172' into 7.0 * patches/pi-172: FSGC: Release memory when going to be halted for more than 10 minutes. ConfigIF [FSGC]: Inform about the FSGC being halted/going to halt.
Merge branch 'patches/pi-172' into devel * patches/pi-172: FSGC: Release memory when going to be halted for more than 10 minutes. ConfigIF [FSGC]: Inform about the FSGC being halted/going to halt.
FSGC: Release memory when going to be halted for more than 10 minutes. Fixes [REP-713] some more.
Merge branch 'patches/pi-172' into 7.0 * patches/pi-172: FSGC: Improved robustness of sleep at start of activity interval.
Merge branch 'patches/pi-172' into devel * patches/pi-172: FSGC: Improved robustness of sleep at start of activity interval.
FSGC: Improved robustness of sleep at start of activity interval.
Merge branch 'patches/pi-172' into 7.0 * patches/pi-172: FSGC: Survive negative max_sleep. ConfigIF [FSGC]: Add title, and warn some more when disabled. FSGC: Add global settings for controlling when the fsgc is to run. Variable.Schedule: Add argument to reduce the number of options.
Merge branch 'patches/pi-172' into devel * patches/pi-172: FSGC: Survive negative max_sleep.
FSGC: Survive negative max_sleep. Fixes race where time(1) has gotten bumped efter the call of Variable.Schedule()->get_next().
Merge branch 'patches/pi-172' into devel * patches/pi-172: ConfigIF [FSGC]: Add title, and warn some more when disabled. FSGC: Add global settings for controlling when the fsgc is to run. Variable.Schedule: Add argument to reduce the number of options.
FSGC: Add global settings for controlling when the fsgc is to run. Fixes [REP-713].
Add option to clean up parent directories when a file is deleted or moved into quarantine. Added event logging and improved refdoc.
Force the FSGarb to run with some regularity even if the purge threshold is many weeks or months.
Merge branch 'patches/ws562' into patches/ws558 * patches/ws562: (9454 commits) VFS: find_above(): Don't add to cache if no cache key. [WS-562] Perform negative caching of (typically) htaccess files for 5 seconds. Fixed request trace nesting inconsistency. FTP: Allow anonymous ftp without TLS even when TLS required. FTP: Added support for the CCC command. FTP: Default to PROT P for FTPS. FTP: Allow FEAT before login. FTP: Fixed bug in MLSD/MLST handling. FTP: Extended AUTH TLS config option. FTP: Fixed SSL data connection. Pike 8.0: Temporary workaround for SSL/TLS API change. FTP: Fixed typo in PBSZ error message. FTP: Support ending the TLS control connection with REIN. FTP: Added configuration flag to require AUTH TLS. FTP: Support AUTH TLS (RFC 4217). FTP: The ftp server is always the server side of TLS. FTP: Splitted send() into low_send() and send(). Pike 8.0: More SSL/TLS API changes. FTP: Prepare for supporting AUTH TLS (RFC 4217). Protocols: Added StartTLSProtocol. ...
Merge branch 'devel' into ponost/admin-if-17 * devel: (182 commits) Version bumped to 6.2.137 by buildsystem. Version bumped to 6.2.136 by buildsystem. Version bumped to 6.2.135 by buildsystem. Version bumped to 6.2.134 by buildsystem. XML Test Tags: Added tag "testsuite". [CMS-439] Version bumped to 6.2.133 by buildsystem. Testsuite [WebDAV] [NT]: Fix test_x_move_file() some more. Filesystem [NT]: Fixed the MOVE destination filename some more. Version bumped to 6.2.132 by buildsystem. Testsuite [WebDAV] [NT]: More fixes of test_x_special_chars(). Filesystem [NT]: Fix issue where MOVE lost case of the destination. Filesystem [NT]: Added some more filename validation on NT. Version bumped to 6.2.131 by buildsystem. Version bumped to 6.2.130 by buildsystem. Filesystem: Fixed typo. Roxen [NT]: Look some more at Stdio.__HAVE_UTF8_FS__. Documentation: Added some notes about Unicode-NFC normalization. HTTP: Fixed path normalization issue. Loader: Make the utf8_string type available. Version bumped to 6.2.129 by buildsystem. ...
Move thread name handling to Roxen.pmod to make it easier to use from other pmods. Adjust existing calls and add compat stubs.
Merge branch 'devel' into kg/WS-168-webdav * devel: (1803 commits) Loader [MariaDB]: Set sql_mode in my.cnf. DBManager: Use CREATE USER with MariaDB 10.2 and later. WebDAV: Use urn:uuid: namespace for locks. Version bumped to 6.2.94 by buildsystem. APIs: Roxen.lookup_real_path_case_insens() now assumes utf-8 fs. APIs: Improved ambiguity recovery in lookup_real_path_case_insens(). APIs: Roxen.lookup_real_path_case_insens() now survives NFD. FTP: Normalize filenames to NFC. APIs: find_dir() now normalizes paths to NFC. HTTP: Normalize paths to Unicode NFC. Fixes bug [WS-172] where an empty initial prestate issued an internal server error. Loader: Remove the global __pragma_save_parent__. Version bumped to 6.2.93 by buildsystem. Use string_to_utf8 rather than Charset.Encoder when possible. Added more verifications in test base class. [WS-168] Adding support for copy and move between different mount points. [WS-168] Broke out parent class from RoxenTest_webdav.pike [WS-168] Version bumped to 6.2.92 by buildsystem. Fixed FIXME comment in RoxenTest_webdav.pike. [WS-168] Version bumped to 6.2.91 by buildsystem. ...
Merge branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 commits) ...
Merge branch 'devel' into ponost/admin-if-17
FSGC: Avoid using DefaultMonitor implementation [EP-329]
FSGC: Fixed some typos.
FSGC [DEBUG]: Don't claim that the root directory is getting deleted.
FSGC: Pedantic threshold fix.
FSGC: Restore stable change notification after override. Fixes [EP-329] Comment #1.
FSGC: Override accelerated stable change notification [EP-327]
Merge branch 'patches/ep302' into 6.1 * patches/ep302: FSGC: Avoid using DefaultMonitor implementation [EP-329] FSGC: Fixed some typos. FSGC [DEBUG]: Don't claim that the root directory is getting deleted. FSGC: Pedantic threshold fix. FSGC: Restore stable change notification after override. FSGC: Override accelerated stable change notification [EP-327]
Merge branch 'patches/ep302' into devel * patches/ep302: FSGC: Avoid using DefaultMonitor implementation [EP-329]
Merge branch 'devel' into kg/archive-client
Merge branch 'patches/ep302' into devel * patches/ep302: FSGC: Fixed some typos.
Merge branch 'patches/ep302' into devel * patches/ep302: FSGC [DEBUG]: Don't claim that the root directory is getting deleted. FSGC: Pedantic threshold fix. FSGC: Restore stable change notification after override.
Merge branch 'patches/ep31' into 6.0 * patches/ep31: FSGC: Added support for quarantining instead of deleting.
Merge branch 'patches/ep31' into 6.1 * patches/ep31: FSGC: Added support for quarantining instead of deleting.
Merge branch 'patches/ep31' into devel * patches/ep31: FSGC: Added support for quarantining instead of deleting.
FSGC: Added support for quarantining instead of deleting. This moves files to a quarantine directory instead of just deleting them. Fixes some of [ep-31].
Merge branch 'patches/bug6950 (#6950)' into grubba/patchsystem * patches/bug6950 (#6950): Logging: Remove log notices after 7 days. Fixes [bug 6950 (#6950)]. FSGC: Added API for adding Filesystem Garbage Collectors.
Merge branch 'patches/pike8.0' into patches/bug4594 * patches/pike8.0: (230 commits) Pike 8.0: More SSL/TLS API changes. FTPS: Fixed support for Pike 8.0. Roxen: Use the current names for the ASN1 classes. SNMP: The LDAP private ASN.1 classes aren't available in Pike 8.0. SNMP: The fields tag and cls are variables in Pike 8.0. Pike 8.0: More SSL changes. Pike 8.0: Improved robustness when upgrading old certs. Pike 8.0: Upgrade old automatic X.509v1 certs to X.509v3. Pike 8.0: Fixed SSL port binding with new API. Pike 8.0: Take advantage of the improved SSL support. Pike 8.0: Add support for some new SSL features. Pike 8.0: #if efun() is obsolete since 10 years back. Pike 8.0: String.Buffer contains a sprintf(). Pike 8.0: Unset variables are UNDEFINED. Roxen 5.4.1. ABS: List the pending call_outs. Fix warnings generated by Pike 8.0. DB browser: add support for custom DB field formatters in owning modules. DBManager.module_table_info: Consider all module entries from the DB. Added transliteration module. ... Conflicts: server/base_server/roxen.pike
Merge commit '64ea9f116367427932716bbbb417bd3f20b99feb' into patches/pike8.0 * commit '64ea9f116367427932716bbbb417bd3f20b99feb': (904 commits) Roxen 5.4.1. ... Updates the base version for the Pike 8.0 patches to Roxen 5.4.1.
Merge branch 'patches/bug6572' into devel * patches/bug6572: FSGC: Disabled some debug.
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: FSGC: Disabled some debug.
FSGC: Disabled some debug.
Merge branch 'patches/bug6572' into devel * patches/bug6572: Start: Add some extra stuff to the module path if existing. FSGC: Fixed compatibility with Pike 7.8.
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: Start: Add some extra stuff to the module path if existing. FSGC: Fixed compatibility with Pike 7.8.
FSGC: Fixed compatibility with Pike 7.8. Fixes some of [bug 6572 (#6572)].
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: FSGC: Protect against some common misconfigurations.
Merge branch 'patches/bug6572' into devel * patches/bug6572: FSGC: Protect against some common misconfigurations.
FSGC: Protect against some common misconfigurations. We don't want to run an fsgc on the root or server directory, and not one that zaps all files immediately either. Fixes some more of [bug 6572 (#6572)].
Merge branch 'patches/bug6572' into devel * patches/bug6572: ConfigIF: Display the owner of FSGCs. FSGC: Moved API to base_server/module.pike.
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: ConfigIF: Display the owner of FSGCs. FSGC: Moved API to base_server/module.pike.
FSGC: Moved API to base_server/module.pike. This adds registration of modules that register fsgcs. Note that this API change is incompatible with the previous API. This shouldn't be a problem, since nothing that uses the old API should be out in the wild yet.
Merge branch 'patches/bug6572' into devel * patches/bug6572: FSGC: Fixed issue where the fsgc root could be lost.
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: FSGC: Fixed issue where the fsgc root could be lost.
FSGC: Fixed issue where the fsgc root could be lost. The filesystem gc now seems to nolonger lose track of the filesystem state. Fixes some more of [bug 6572 (#6572)].
Merge branch 'patches/bug6572' into 5.2 * patches/bug6572: FSGC: First go at a status display. ConfigInterface: Some code cleanup. FSGC: Added API for adding Filesystem Garbage Collectors.
Merge branch 'patches/bug6572' into devel * patches/bug6572: FSGC: First go at a status display. ConfigInterface: Some code cleanup. FSGC: Added API for adding Filesystem Garbage Collectors.
FSGC: Added API for adding Filesystem Garbage Collectors. Fixes some of [bug 6572 (#6572)].