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 branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 commits) ...
Merge branch 'patches/bug7602' into grubba/patchsystem Note: This makes this branch no longer compatible with Roxen 5.2 and earlier. * patches/bug7602: (117 commits) RoxenPatch: Complain but proceed when the CA list is empty. RoxenPatch: The patch cluster is fetched over HTTPS... RoxenPatch: Support relative URLs from the HTTPS action. Config IF: Reordered settings somewhat. Config IF: Join the tabs "Auto {Restart,Patching}" to "Auto Maintenance". RoxenPatch: Revert the patch installation on manual restart option. RoxenPatch: Don't apply pending patches on signal exit. RoxenPatch: More permission filtering. RoxenPatch: Fixed some NULL-dereferences and calls. RoxenPatch: Complain if not running a dist. RoxenPatch: Use HTTPS to fetch the patch cluster. RoxenPatch: Added control of patch installation to the restart action. RoxenPatch: Added option to automatically install patches on restart. RoxenPatch: Throw proper errors instead of arrays with a single string. RoxenPatch: Clean up the debug log output somewhat. RoxenPatch: The refresh fetch now also tries If-Modified-Since. RoxenPatch: The ETag refresh fetch now actually works. RoxenPatch: Added support for automatic fetch of patch clusters. RoxenPatch: Perform refresh fetch of the patch cluster. RoxenPatch: Inhibit "Import from Roxen" without VERSION.DIST. ...
Merge commit '5ee4d2b88e3e12d1622f9a161e9a29484cbf6e4c' into patches/bug7602 Bump base version to Roxen 5.2.335.
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
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.
No more foreign_idents. More pain than they are worth.
We need a DiskId for any files (ie configurations/server_version) added directly. Requires bleeding edge Pike 7.8! Rev: server/bin/mk_wxs.pike:1.22
Added missing ComponentRef. Rev: server/bin/mk_wxs.pike:1.21
Fixed some bugs in the product menu. Rev: server/bin/mk_wxs.pike:1.20
Ported some fixes from the Distmaker 5.0 version. Rev: server/bin/mk_wxs.pike:1.19
Added configurations/server_version. Rev: server/bin/mk_wxs.pike:1.18
Now adds the version number to the product name. Rev: server/bin/mk_wxs.pike:1.17
Changed __roxen_version__ to roxen_ver and __roxen_build__ to roxen_build to work with pike 7.7. Note compat issues, not least in build systems which might extract these. Rev: server/base_server/configuration.pike:1.652 Rev: server/base_server/roxen.pike:1.977 Rev: server/base_server/roxenloader.pike:1.395 Rev: server/bin/functions:1.18 Rev: server/bin/mk_wxs.pike:1.16 Rev: server/config_interface/actions/change_version.pike:1.14 Rev: server/etc/include/version.h:1.978 Rev: server/etc/modules/Roxen.pmod:1.243 Rev: server/modules/configuration/config_filesystem.pike:1.116 Rev: server/modules/logging/roxen_network.pike:1.15 Rev: server/protocols/ftp.pike:2.123 Rev: server/tools/ntroxen/startdll/roxen.cpp:1.18
Shortcut modifications. Rev: server/bin/mk_wxs.pike:1.15
Added some more start menu items. Rev: server/bin/mk_wxs.pike:1.14
Fixed typo. Rev: server/bin/mk_wxs.pike:1.13
First try at adding shortcuts to the start menu. Rev: server/bin/mk_wxs.pike:1.12
Disabled the Upgrade section, since it seems candle doesn't like it. Rev: server/bin/mk_wxs.pike:1.11
Fixed typo. Rev: server/bin/mk_wxs.pike:1.10
Bugfix. Rev: server/bin/mk_wxs.pike:1.9
Added Upgrade information. Rev: server/bin/mk_wxs.pike:1.8
Cleanup code should now actually work. Rev: server/bin/mk_wxs.pike:1.7
Some cleanups. Rev: server/bin/mk_wxs.pike:1.6
Added support for UNIX ==> NT prefix conversion. Rev: server/bin/mk_wxs.pike:1.5
Added method to disable include of etc/include/version.h. Rev: server/bin/mk_wxs.pike:1.4
Added some cleanup code. Rev: server/bin/mk_wxs.pike:1.3
Some symbolic names. Rev: server/bin/mk_wxs.pike:1.2
First version. Rev: server/bin/mk_wxs.pike:1.1