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. ...
Plenty
Merge branch 'patches/bug7617' into 6.0 * patches/bug7617: ConfigIF: Propagate and validate the wizard id.
Merge branch 'patches/bug7617' into devel * patches/bug7617: ConfigIF: Propagate and validate the wizard id.
ConfigIF: Propagate and validate the wizard id. Fixes most of [bug 7617 (#7617)].
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.
Report the logical server dir. Rev: server/config_interface/actions/debug_summary.pike:1.16
Avoid backtrace seen in RT#15249 when module->module_identifier() is NULL. Rev: server/config_interface/actions/debug_summary.pike:1.15
Include local/environment2 file in the report (environment2.ini on Windows). Rev: server/config_interface/actions/debug_summary.pike:1.14
Fixed [Bug 4230 (#4230)]. Implemented support for multiple instances in the Download Debug Log Button. Rev: server/base_server/roxenloader.pike:1.378 Rev: server/config_interface/actions/debug_summary.pike:1.13 Rev: server/start:1.226
Include the working directory in the report. Rev: server/config_interface/actions/debug_summary.pike:1.12
Updated locale ids. Rev: server/config_interface/actions/debug_summary.pike:1.11 Rev: server/config_interface/actions/pike_profiling.pike:1.6 Rev: server/translations/ces/admin_tasks.xml:1.26 Rev: server/translations/configs/admin_tasks.xml:1.14 Rev: server/translations/deu/admin_tasks.xml:1.26 Rev: server/translations/eng/admin_tasks.xml:1.27 Rev: server/translations/hun/admin_tasks.xml:1.20 Rev: server/translations/jpn/admin_tasks.xml:1.20 Rev: server/translations/nld/admin_tasks.xml:1.25 Rev: server/translations/swe/admin_tasks.xml:1.23
Case fix. Rev: server/config_interface/actions/debug_summary.pike:1.10 Rev: server/config_interface/actions/tablist.pike:1.8
New theme and generally brushed up config interface. Rev: server/base_server/config_userdb.pike:1.48 Rev: server/base_server/module.pike:1.147 Rev: server/config_interface/actions/cachestatus.pike:1.10 Rev: server/config_interface/actions/change_version.pike:1.12 Rev: server/config_interface/actions/connections.pike:1.4 Rev: server/config_interface/actions/debug_info.pike:1.32 Rev: server/config_interface/actions/debug_summary.pike:1.9 Rev: server/config_interface/actions/feature_list.pike:1.13 Rev: server/config_interface/actions/flush.pike:1.10 Rev: server/config_interface/actions/index.html:1.15 Rev: server/config_interface/actions/licensestatus.pike:1.14 Rev: server/config_interface/actions/listfonts.pike:1.22 Rev: server/config_interface/actions/locks.pike:1.9 Rev: server/config_interface/actions/make_site_template.pike:1.7 Rev: server/config_interface/actions/openfiles.pike:1.10 Rev: server/config_interface/actions/reloadconfigurations.pike:1.5 Rev: server/config_interface/actions/resolv.pike:1.28 Rev: server/config_interface/actions/restart.pike:1.14 Rev: server/config_interface/actions/threads.pike:1.6 Rev: server/config_interface/actions/upload_license.pike:1.10 Rev: server/config_interface/dbs/browser.pike:1.44 Rev: server/config_interface/dbs/restore_db.pike:1.6 Rev: server/config_interface/sites/add_module.pike:1.76 Rev: server/config_interface/sites/config_left_item.pike:1.65 Rev: server/config_interface/sites/create_site_with_template.pike:1.29 Rev: server/config_interface/sites/drop_site.html:1.13 Rev: server/config_interface/sites/index.html:1.39 Rev: server/config_interface/sites/new_site.html:1.19 Rev: server/config_interface/sites/site_content.pike:1.137 Rev: server/config_interface/statusinfo.pike:1.6 Rev: server/config_interface/template:1.117 Rev: server/config_interface/themes/README:1.13 Rev: server/config_interface/themes/default/bullet-black.gif:1.1 Rev: server/config_interface/themes/default/bullet.gif:1.3 Rev: server/config_interface/themes/default/closed-folder.gif:1.1 Rev: server/config_interface/themes/default/cms-logo.gif:1.3 Rev: server/config_interface/themes/default/err_1.gif:1.1 Rev: server/config_interface/themes/default/err_2.gif:1.1 Rev: server/config_interface/themes/default/err_3.gif:1.1 Rev: server/config_interface/themes/default/favicon.ico:1.3 Rev: server/config_interface/themes/default/gbutton-disabled.xcf:1.1 Rev: server/config_interface/themes/default/gbutton.xcf:1.8 Rev: server/config_interface/themes/default/image.pike:1.7 Rev: server/config_interface/themes/default/left-images/access.gif:1.1 Rev: server/config_interface/themes/default/left-images/admin.gif:1.1 Rev: server/config_interface/themes/default/left-images/edit.gif:1.1 Rev: server/config_interface/themes/default/logo.gif:1.6 Rev: server/config_interface/themes/default/name:1.5 Rev: server/config_interface/themes/default/next.gif:1.4 Rev: server/config_interface/themes/default/open-folder.gif:1.1 Rev: server/config_interface/themes/default/padlock.gif:1.1 Rev: server/config_interface/themes/default/stylesheet.css:1.1 Rev: server/config_interface/themes/default/tabframe-sub.xcf:1.1 Rev: server/config_interface/themes/default/tabframe.xcf:1.9 Rev: server/config_interface/themes/default/theme:1.21 Rev: server/config_interface/themes/default/user.gif:1.1 Rev: server/config_interface/update.html:1.21 Rev: server/config_interface/users.html:1.26 Rev: server/etc/modules/Variable.pmod/module.pmod:1.83 Rev: server/modules/configuration/config_tags.pike:1.182
Show global variables in debug summary. Rev: server/config_interface/actions/debug_summary.pike:1.8
Report the pike version too. Rev: server/config_interface/actions/debug_summary.pike:1.7
Updated locale stuff. Rev: server/config_interface/actions/connections.pike:1.3 Rev: server/config_interface/actions/debug_summary.pike:1.6 Rev: server/config_interface/actions/licensestatus.pike:1.11 Rev: server/config_interface/actions/upload_license.pike:1.4 Rev: server/modules/filesystems/filesystem.pike:1.118 Rev: server/modules/scripting/webapp.pike:2.21 Rev: server/translations/Makefile:1.5 Rev: server/translations/ces/admin_tasks.xml:1.20 Rev: server/translations/ces/roxen_config.xml:1.33 Rev: server/translations/configs/admin_tasks.xml:1.13 Rev: server/translations/deu/admin_tasks.xml:1.19 Rev: server/translations/deu/roxen_config.xml:1.42 Rev: server/translations/eng/admin_tasks.xml:1.21 Rev: server/translations/eng/mod_filesystem.xml:1.8 Rev: server/translations/eng/mod_webapp.xml:1.3 Rev: server/translations/eng/roxen_config.xml:1.38 Rev: server/translations/hun/admin_tasks.xml:1.14 Rev: server/translations/hun/roxen_config.xml:1.29 Rev: server/translations/jpn/admin_tasks.xml:1.14 Rev: server/translations/jpn/roxen_config.xml:1.29 Rev: server/translations/nld/admin_tasks.xml:1.19 Rev: server/translations/nld/roxen_config.xml:1.33 Rev: server/translations/swe/admin_tasks.xml:1.17 Rev: server/translations/swe/roxen_config.xml:1.42
Action -> Task Rev: server/config_interface/actions/cachestatus.pike:1.12(DEAD) Rev: server/config_interface/actions/change_version.pike:1.11(DEAD) Rev: server/config_interface/actions/connections.pike:1.4(DEAD) Rev: server/config_interface/actions/debug_info.pike:1.24(DEAD) Rev: server/config_interface/actions/debug_summary.pike:1.9(DEAD) Rev: server/config_interface/actions/feature_list.pike:1.14(DEAD) Rev: server/config_interface/actions/flush.pike:1.11(DEAD) Rev: server/config_interface/actions/ftpstatus.pike:1.5(DEAD) Rev: server/config_interface/actions/generate_rsa.pike:1.7(DEAD) Rev: server/config_interface/actions/index.html:1.14(DEAD) Rev: server/config_interface/actions/licensestatus.pike:1.12(DEAD) Rev: server/config_interface/actions/list_actions.pike:1.8(DEAD) Rev: server/config_interface/actions/listfonts.pike:1.23(DEAD) Rev: server/config_interface/actions/locks.pike:1.10(DEAD) Rev: server/config_interface/actions/make_rsa_csr.pike:1.9(DEAD) Rev: server/config_interface/actions/make_selfsigned_dsa.pike:1.8(DEAD) Rev: server/config_interface/actions/make_selfsigned_rsa.pike:1.8(DEAD) Rev: server/config_interface/actions/make_site_template.pike:1.8(DEAD) Rev: server/config_interface/actions/openfiles.pike:1.11(DEAD) Rev: server/config_interface/actions/proc.pike:1.11(DEAD) Rev: server/config_interface/actions/reloadconfigurations.pike:1.6(DEAD) Rev: server/config_interface/actions/resolv.pike:1.25(DEAD) Rev: server/config_interface/actions/restart.pike:1.14(DEAD) Rev: server/config_interface/actions/ssl_common.pike:1.6(DEAD) Rev: server/config_interface/actions/tablist.pike:1.8(DEAD) Rev: server/config_interface/actions/threads.pike:1.7(DEAD) Rev: server/config_interface/actions/upload_license.pike:1.5(DEAD) Rev: server/config_interface/sites/site_content.pike:1.134 Rev: server/config_interface/tasks/cachestatus.pike:1.12 Rev: server/config_interface/tasks/change_version.pike:1.11 Rev: server/config_interface/tasks/connections.pike:1.4 Rev: server/config_interface/tasks/debug_info.pike:1.24 Rev: server/config_interface/tasks/debug_summary.pike:1.9 Rev: server/config_interface/tasks/feature_list.pike:1.14 Rev: server/config_interface/tasks/flush.pike:1.11 Rev: server/config_interface/tasks/ftpstatus.pike:1.5 Rev: server/config_interface/tasks/generate_rsa.pike:1.7 Rev: server/config_interface/tasks/index.html:1.14 Rev: server/config_interface/tasks/licensestatus.pike:1.12 Rev: server/config_interface/tasks/list_tasks.pike:1.8 Rev: server/config_interface/tasks/listfonts.pike:1.23 Rev: server/config_interface/tasks/locks.pike:1.10 Rev: server/config_interface/tasks/make_rsa_csr.pike:1.9 Rev: server/config_interface/tasks/make_selfsigned_dsa.pike:1.8 Rev: server/config_interface/tasks/make_selfsigned_rsa.pike:1.8 Rev: server/config_interface/tasks/make_site_template.pike:1.8 Rev: server/config_interface/tasks/openfiles.pike:1.11 Rev: server/config_interface/tasks/proc.pike:1.11 Rev: server/config_interface/tasks/reloadconfigurations.pike:1.6 Rev: server/config_interface/tasks/resolv.pike:1.25 Rev: server/config_interface/tasks/restart.pike:1.14 Rev: server/config_interface/tasks/ssl_common.pike:1.6 Rev: server/config_interface/tasks/tablist.pike:1.8 Rev: server/config_interface/tasks/threads.pike:1.7 Rev: server/config_interface/tasks/upload_license.pike:1.5 Rev: server/config_interface/template:1.111 Rev: server/config_interface/themes/powerpuff/theme:1.7 Rev: server/config_interface/topmenu.pike:1.24 Rev: server/config_interface/whatsnew-pike.html:1.3
Removed localization. Rev: server/config_interface/actions/cachestatus.pike:1.11 Rev: server/config_interface/actions/change_version.pike:1.10 Rev: server/config_interface/actions/connections.pike:1.3 Rev: server/config_interface/actions/debug_info.pike:1.23 Rev: server/config_interface/actions/debug_summary.pike:1.8 Rev: server/config_interface/actions/feature_list.pike:1.13 Rev: server/config_interface/actions/flush.pike:1.10 Rev: server/config_interface/actions/ftpstatus.pike:1.4 Rev: server/config_interface/actions/generate_rsa.pike:1.6 Rev: server/config_interface/actions/licensestatus.pike:1.11 Rev: server/config_interface/actions/listfonts.pike:1.22 Rev: server/config_interface/actions/locks.pike:1.9 Rev: server/config_interface/actions/make_rsa_csr.pike:1.8 Rev: server/config_interface/actions/make_selfsigned_dsa.pike:1.7 Rev: server/config_interface/actions/make_selfsigned_rsa.pike:1.7 Rev: server/config_interface/actions/make_site_template.pike:1.7 Rev: server/config_interface/actions/openfiles.pike:1.10 Rev: server/config_interface/actions/proc.pike:1.10 Rev: server/config_interface/actions/reloadconfigurations.pike:1.5 Rev: server/config_interface/actions/resolv.pike:1.24 Rev: server/config_interface/actions/restart.pike:1.13 Rev: server/config_interface/actions/ssl_common.pike:1.6 Rev: server/config_interface/actions/tablist.pike:1.8 Rev: server/config_interface/actions/threads.pike:1.6 Rev: server/config_interface/actions/upload_license.pike:1.4
Added Pike version. Rev: server/config_interface/actions/debug_summary.pike:1.7
Remove comments from local environment file. Rev: server/config_interface/actions/debug_summary.pike:1.6
local/environment is called local/environment.ini on NT. Rev: server/config_interface/actions/debug_summary.pike:1.5
Added debug log download. Rev: server/config_interface/actions/debug_summary.pike:1.4
Added download button. Rev: server/config_interface/actions/debug_summary.pike:1.3
Censor Password and VerifiedPassword variables. Rev: server/config_interface/actions/debug_summary.pike:1.2
Added debug summary action Rev: server/config_interface/actions/debug_summary.pike:1.1