Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture macosx_arm64.
RoxenPatch: Added architecture macosx_arm64.
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: Testsuite: RXPs need to be gzipped.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite: RXPs need to be gzipped.
Testsuite: RXPs need to be gzipped.
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added architecture rhel8_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture rhel8_x86_64.
RoxenPatch: Added architecture rhel8_x86_64.
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: (60 commits) Version bumped to 6.3.7 by buildsystem. DBManager: Added --defaults-file directive in lots of places. DBManager: Added some line-breaks. DBs: Use query_mysql_config_file(). DBs: Added roxenloader.query_mysql_config_file(). MariaDB/MySQL: Support blacklisting of versions. MariaDB: Bump supported version to 10.3.*. DBManager: Added some (disabled) diagnostics. DBManager: Support upgrading to MariaDB 10.3.x. Adding .vscode to .gitignore Testsuite [WebDAV]: Test some kanji symbols. Testsuite [WebDAV]: Label the symbol test filenames. Testsuite [WebDAV]: Fix test_x_ls() some more for NT. Testsuite [WebDAV] [NT]: Potential fix for test_x_ls() failing on NT. Testsuite [WebDAV]: Added some diagnostics. Testsuite [WebDAV]: Added filesystem_behavior(). Discern between "failed on X" and "zero failures" for easier searching in the output log. WebDAV testsuite: use 127.0.0.1 as default IP, which works better on NT. Added an "Elasticsearch client" to test modules. Will be used by Archive and Print test (setup) code. [EP-809] Added etc/test/modules to path when running test setup scripts. [EP-809] ...
Merge branch 'grubba/patchsystem' into 6.2 * grubba/patchsystem: RoxenPatch: Added architecture ubuntu1804_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: RoxenPatch: Added architecture ubuntu1804_x86_64.
RoxenPatch: Added architecture ubuntu1804_x86_64.
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 commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc' into patches/ftp Synch with Roxen 6.0/6.1 split. * commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc': (428 commits)
Merge branch 'grubba/patchsystem' into 6.0 * grubba/patchsystem: Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64. RoxenPatch: Added architecture ubuntu1604_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64.
Testsuite [RoxenPatch]: Updated the test patch with ubuntu1604_x86_64. Fixes testsuite failures on Ubuntu 16.04/x86_64.
Merge branch 'grubba/patchsystem' into 6.0 * grubba/patchsystem: Testsuite [RoxenPatch]: Added new sol11_x86_64 to 2009-02-25T1124.rxp. RoxenPatch: Add platform sol11_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite [RoxenPatch]: Added new sol11_x86_64 to 2009-02-25T1124.rxp. RoxenPatch: Add platform sol11_x86_64.
Testsuite [RoxenPatch]: Added new sol11_x86_64 to 2009-02-25T1124.rxp. Fixes testsuite failure on sol11_x86_64.
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Merge branch 'grubba/patchsystem' into 5.4 * grubba/patchsystem: Testsuite [RoxenPatch]: Added some more platforms to 2009-02-25T1124.rxp. RoxenPatch: Add platforms rhel7_x86_64 and win32_x86_64.
Merge branch 'grubba/patchsystem' into devel * grubba/patchsystem: Testsuite [RoxenPatch]: Added some more platforms to 2009-02-25T1124.rxp.
Testsuite [RoxenPatch]: Added some more platforms to 2009-02-25T1124.rxp. Fixes testsuite failures on rhel7_x86_64 (and win32_x86_64). Also alters the title and description somewhat.
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.
Added rhel6_x86_64 as valid platform for rxp test file. Rev: server/etc/test/tests/patcher/2009-02-25T1124.rxp:1.2
Self test for patch system Rev: server/etc/test/tests/patcher/2009-02-25T1124.rxp:1.1 Rev: server/etc/test/tests/patcher/RoxenTest_patcher.pike:1.1 Rev: server/etc/test/tests/patcher/testfile.patch:1.1 Rev: server/etc/test/tests/patcher/testfile.txt:1.1