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.
ConfigIF [FSGC]: Inform about the FSGC being halted/going to halt.
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: 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.
ConfigIF [FSGC]: Add title, and warn some more when disabled. Fixes remainder of [REP-713].
Merge branch 'patches/rep713' into patches/pi-172 * patches/rep713: Updated styling and sorting. ConfigIF [FSGC]: Warn about the FSGC being disabled. FSGC: Added option -DDISABLE_FSGC.
Merge branch 'patches/rep713' into 7.0 * patches/rep713: Updated styling and sorting.
Merge branch 'patches/rep713' into devel * patches/rep713: Updated styling and sorting.
Updated styling and sorting.
Merge branch 'patches/rep713' into 7.0 * patches/rep713: ConfigIF [FSGC]: Warn about the FSGC being disabled.
Merge branch 'patches/rep713' into devel * patches/rep713: ConfigIF [FSGC]: Warn about the FSGC being disabled.
ConfigIF [FSGC]: Warn about the FSGC being disabled. Fixes some more of [REP-713].
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 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 commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc' into patches/ftp Synch with Roxen 6.0/6.1 split. * commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc': (428 commits)
Updated locale ids
Merge branch 'patches/bug7617-2' into 6.0 * patches/bug7617-2: ConfigIF: Propagate wizard id in the fsgc.
Merge branch 'patches/bug7617-2' into devel * patches/bug7617-2: ConfigIF: Propagate wizard id in the fsgc.
ConfigIF: Propagate wizard id in the fsgc. Fixes remainder of [bug 7617 (#7617)].
Merge branch '5.4' into devel * 5.4: ConfigIF: Improved argument validation in drop_site. Version bumped to 5.4.44 by buildsystem. Version bumped to 5.4.1 by distmaker. ntstart: Bumped version to 5.4.0. DBManager: Disabled some debug. DBManager: Fixed some documentation typos. DBManager: Add some more perms to read-only users. DBManager: Added set_perms_in_user_table() Start: Improved robustness. Fixes [bug 6980 (#6980)]. HTTP: Added some DWIM for wide strings. Core: Added compat level for 5.4. ConfigIF: Display the git sha. D'oh, typo in last fix. Amend fix for [bug 6938 (#6938)] by fixing SQL LONGBLOB type. ImageCache: Do not mess with the global variable... Fixed another typo. ImageCache: Fixed typo. ImageCache: Allow for larger images. MySQL: Increase max_allowed_packet to 128 MB. FSGC: Added links to the owning config and module. FSGC: Added refresh button to the status display. FSGC: Moved the FSGC status to a task. FSGC; Group gcs by owning module. FSGC: Status display changes. FSGC: Improved styling and layout.
FSGC: Added links to the owning config and module.
FSGC: Added refresh button to the status display.
FSGC: Moved the FSGC status to a task. It makes more sense to group it together with the other status displays.