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 'devel' into ponost/admin-if-17
Wizards: Different name for RoxenWizardId cookie on http vs https. If client scheme is https, cookie RoxenHttpsWizardId will be used, else RoxenHttpWizardId will be used. This fixes a bug that appeared in WS-135. [WS-143 / WS-135]
Use actual form field types.
Merge branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 commits) ...
Removed some redundant HTML attributes and added a css class to Variable.Mapping.
Removed font tag and set input width to 0. Let CSS handle the inputs.
Make various input fields bigger.
Merge branch 'patches/bug7617' into 6.0 * patches/bug7617: ConfigIF: Fixed wizard id propagation on variable edit redirect.
Merge branch 'patches/bug7617' into devel * patches/bug7617: ConfigIF: Fixed wizard id propagation on variable edit redirect.
ConfigIF: Fixed wizard id propagation on variable edit redirect. This affected eg the "New" and "Delete" buttons in various configuration variables that list multiple values. Fixes [bug 7617 (#7617)] some more.
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.
ConfigIF: Improved robustness against multiple variable submits. Rev: server/etc/modules/Variable.pmod/MapLocation.pike:1.7 Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.10 Rev: server/etc/modules/Variable.pmod/module.pmod:1.118
Moving to pike 7.8 and dropping compatibility with earlier pikes. Rev: server/arg_cache_plugins/replicate.pike:1.27 Rev: server/base_server/__default.pmod:1.2 Rev: server/base_server/cache.pike:1.90 Rev: server/base_server/config_userdb.pike:1.53 Rev: server/base_server/configuration.pike:1.653 Rev: server/base_server/emit_object.pike:1.7 Rev: server/base_server/fonts.pike:1.87 Rev: server/base_server/global_variables.pike:1.110 Rev: server/base_server/javamodule.pike:1.7 Rev: server/base_server/language.pike:1.43 Rev: server/base_server/module.pike:1.231 Rev: server/base_server/module_support.pike:1.135 Rev: server/base_server/prototypes.pike:1.219 Rev: server/base_server/roxen.pike:1.981 Rev: server/base_server/roxenlib.pike:1.224 Rev: server/base_server/roxenloader.pike:1.397 Rev: server/base_server/rxmlhelp.pike:1.65 Rev: server/base_server/smtprelay.pike:3.2 Rev: server/base_server/snmpagent.pike:1.24 Rev: server/bin/buildenv.pike:1.10 Rev: server/bin/create_testcert.pike:1.2 Rev: server/bin/functions:1.19 Rev: server/bin/garbagecollector.pike:1.23 Rev: server/bin/setup_nsr.pike:1.4 Rev: server/bin/sqlhelper.pike:1.4 Rev: server/config_interface/actions/change_version.pike:1.15 Rev: server/config_interface/actions/debug_info.pike:1.40 Rev: server/config_interface/actions/feature_list.pike:1.14 Rev: server/config_interface/actions/ftpstatus.pike:1.4 Rev: server/config_interface/actions/generate_rsa.pike:1.7 Rev: server/config_interface/actions/make_rsa_csr.pike:1.11 Rev: server/config_interface/actions/make_selfsigned_dsa.pike:1.11 Rev: server/config_interface/actions/make_selfsigned_rsa.pike:1.10 Rev: server/config_interface/actions/ssl_common.pike:1.8 Rev: server/config_interface/actions/tablist.pike:1.10 Rev: server/config_interface/actions/threads.pike:1.8 Rev: server/etc/env.d/java.pike:1.19 Rev: server/etc/include/variables.h:1.18 Rev: server/etc/modules/DBManager.pmod:1.76 Rev: server/etc/modules/ExtSQL.pmod:1.4 Rev: server/etc/modules/ExtScript.pmod:1.22 Rev: server/etc/modules/GText.pmod:1.20 Rev: server/etc/modules/HTML.pmod:1.8 Rev: server/etc/modules/JavaModule.pmod:1.25 Rev: server/etc/modules/LazyImage.pmod/CoordinateSystem.pike:1.4 Rev: server/etc/modules/LazyImage.pmod/Legend.pike:1.5 Rev: server/etc/modules/LazyImage.pmod/module.pmod:1.19 Rev: server/etc/modules/License.pmod:1.27 Rev: server/etc/modules/Map.pmod:1.7 Rev: server/etc/modules/PropertySet.pike:1.12 Rev: server/etc/modules/RXML.pmod/PEnt.pike:1.24 Rev: server/etc/modules/RXML.pmod/PXml.pike:1.65 Rev: server/etc/modules/RXML.pmod/module.pmod:1.367 Rev: server/etc/modules/Roxen.pmod:1.246 Rev: server/etc/modules/RoxenDebug.pmod:1.12 Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Client.pike:1.10 Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Server.pike:1.6 Rev: server/etc/modules/RoxenSSLFile.pike:1.27(DEAD) Rev: server/etc/modules/SNMP.pmod:1.10 Rev: server/etc/modules/Servlet.pmod:1.31 Rev: server/etc/modules/SloppyDOM.pmod:1.16 Rev: server/etc/modules/StateHandler.pmod:1.13 Rev: server/etc/modules/VFS.pmod:1.7 Rev: server/etc/modules/Variable.pmod/Date.pike:1.9 Rev: server/etc/modules/Variable.pmod/Email.pike:1.15 Rev: server/etc/modules/Variable.pmod/Image.pike:1.5 Rev: server/etc/modules/Variable.pmod/Language.pike:1.2 Rev: server/etc/modules/Variable.pmod/MapLocation.pike:1.6 Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.9 Rev: server/etc/modules/Variable.pmod/Upload.pike:1.5 Rev: server/etc/modules/Variable.pmod/module.pmod:1.108 Rev: server/etc/modules/_NewLDAP.pmod/client.pike:1.11(DEAD) Rev: server/etc/modules/_NewLDAP.pmod/ldap_globals.h:1.1(DEAD) Rev: server/etc/modules/_NewLDAP.pmod/ldap_privates.pmod:1.1(DEAD) Rev: server/etc/modules/_NewLDAP.pmod/module.pmod:1.4(DEAD) Rev: server/etc/modules/_NewLDAP.pmod/protocol.pike:1.1(DEAD) Rev: server/etc/roxen_master.pike:1.150 Rev: server/etc/test/tests/ftp/ftp_test.pike:1.4 Rev: server/font_handlers/freetype.pike:1.30 Rev: server/font_handlers/imagedir.pike:1.15 Rev: server/font_handlers/imagetar.pike:1.10 Rev: server/font_handlers/ttf.pike:1.18 Rev: server/languages/catala.pike:1.11 Rev: server/languages/chinese.pike:1.2 Rev: server/languages/croatian.pike:1.11 Rev: server/languages/czech.pike:1.18 Rev: server/languages/dutch.pike:1.11 Rev: server/languages/finnish.pike:1.10 Rev: server/languages/french.pike:1.13 Rev: server/languages/german.pike:1.11 Rev: server/languages/hungarian.pike:1.7 Rev: server/languages/italian.pike:1.13 Rev: server/languages/japanese.pike:1.22 Rev: server/languages/maori.pike:1.9 Rev: server/languages/norwegian.pike:1.12 Rev: server/languages/polish.pike:1.8 Rev: server/languages/portuguese.pike:1.11 Rev: server/languages/russian.pike:1.10 Rev: server/languages/serbian.pike:1.10 Rev: server/languages/slovenian.pike:1.17 Rev: server/languages/spanish.pike:1.12 Rev: server/languages/swedish.pike:1.20 Rev: server/modules/configuration/config_tags.pike:1.197 Rev: server/modules/configuration/roxen_test.pike:1.68 Rev: server/modules/configuration/update.pike:1.40 Rev: server/modules/examples/userdb_ex.pike:1.8 Rev: server/modules/filesystems/filesystem.pike:1.157 Rev: server/modules/filesystems/incoming.pike:1.19 Rev: server/modules/filesystems/restrictedfs.pike:1.24 Rev: server/modules/filesystems/sqlfs.pike:1.9 Rev: server/modules/filesystems/userfs.pike:1.71 Rev: server/modules/filters/tableborder.pike:1.13 Rev: server/modules/filters/whitespace_remover.pike:1.4 Rev: server/modules/graphics/business.pike:1.152 Rev: server/modules/graphics/gxml.pike:1.38 Rev: server/modules/graphics/pimage.pike:1.31 Rev: server/modules/graphics/rimage/rimage.pike:1.23 Rev: server/modules/icecast/icecast.pike:1.12 Rev: server/modules/icecast/pl_common.pike:1.9 Rev: server/modules/js-support/javascript_support.pike:1.68 Rev: server/modules/ldap/ldaptag.pike:2.38 Rev: server/modules/ldap/userdb_ldap.pike:1.14 Rev: server/modules/logging/home_logger.pike:1.35 Rev: server/modules/misc/preferred_language.pike:1.32 Rev: server/modules/misc/randomtext.pike:1.10 Rev: server/modules/misc/wapadapter.pike:1.13 Rev: server/modules/misc/webdav.pike:1.38 Rev: server/modules/proxies/connect.pike:1.20 Rev: server/modules/proxies/proxy.pike:1.57 Rev: server/modules/proxies/wais.pike:1.28 Rev: server/modules/scripting/cgi.pike:2.65 Rev: server/modules/scripting/fastcgi.pike:2.13 Rev: server/modules/scripting/perl.pike:2.26 Rev: server/modules/scripting/php.pike:2.5 Rev: server/modules/scripting/piketag.pike:2.38 Rev: server/modules/scripting/servlet.pike:2.24 Rev: server/modules/scripting/webapp.pike:2.32 Rev: server/modules/security/auth_httpbasic.pike:1.12 Rev: server/modules/security/auth_httpcookie.pike:1.12 Rev: server/modules/security/htaccess.pike:1.106 Rev: server/modules/security/userdb_sql.pike:1.10 Rev: server/modules/security/userdb_system.pike:1.12 Rev: server/modules/tags/accessed.pike:1.57 Rev: server/modules/tags/email.pike:1.43 Rev: server/modules/tags/emit_exec.pike:1.4 Rev: server/modules/tags/emit_timerange.pike:1.29 Rev: server/modules/tags/insert_cached_href.pike:1.22 Rev: server/modules/tags/obox.pike:1.41 Rev: server/modules/tags/rxmltags.pike:1.553 Rev: server/modules/tags/wizz.pike:1.10 Rev: server/modules/tags/writefile.pike:1.20 Rev: server/modules/throttling/throttling_byaddress.pike:1.6 Rev: server/modules/throttling/throttling_bytime.pike:1.8 Rev: server/ntroxenloader.pike:1.9 Rev: server/protocols/ftp.pike:2.125 Rev: server/protocols/http.pike:1.561 Rev: server/protocols/prot_hilfe.pike:2.15 Rev: server/protocols/prot_snmp.pike:2.8 Rev: server/sbin/roxen-create-server:1.5 Rev: server/tools/ntroxen/startdll/cmdline.cpp:1.21
Made it possible to override the column titles. Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.8
Fix for [bug 2147 (#2147)] where submit buttons in the Ports widget (and possibly others) generate empty pages in the administration interface. Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.7 Rev: server/etc/modules/Variable.pmod/module.pmod:1.82
Set up module, program and include paths correctly. Rev: server/etc/modules/.autodoc:1.1(DEAD) Rev: server/etc/modules/DBManager.pmod:1.54(DEAD) Rev: server/etc/modules/Dims.pmod:1.11(DEAD) Rev: server/etc/modules/ExtScript.pmod:1.15(DEAD) Rev: server/etc/modules/GText.pmod:1.14(DEAD) Rev: server/etc/modules/HTML.pmod:1.5(DEAD) Rev: server/etc/modules/JavaModule.pmod:1.23(DEAD) Rev: server/etc/modules/LazyImage.pmod/CoordinateSystem.pike:1.1(DEAD) Rev: server/etc/modules/LazyImage.pmod/Legend.pike:1.1(DEAD) Rev: server/etc/modules/LazyImage.pmod/module.pmod:1.6(DEAD) Rev: server/etc/modules/License.pmod:1.17(DEAD) Rev: server/etc/modules/Map.pmod:1.4(DEAD) Rev: server/etc/modules/RXML.pmod/PEnt.pike:1.23(DEAD) Rev: server/etc/modules/RXML.pmod/PExpr.pike:1.2(DEAD) Rev: server/etc/modules/RXML.pmod/PXml.pike:1.63(DEAD) Rev: server/etc/modules/RXML.pmod/module.pmod:1.285(DEAD) Rev: server/etc/modules/RXML.pmod/refs.pmod:1.12(DEAD) Rev: server/etc/modules/RXML.pmod/utils.pmod:1.29(DEAD) Rev: server/etc/modules/Roxen.pmod:1.142(DEAD) Rev: server/etc/modules/RoxenDebug.pmod:1.4(DEAD) Rev: server/etc/modules/RoxenRPC.pmod/Client.pike:1.15(DEAD) Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Client.pike:1.8(DEAD) Rev: server/etc/modules/RoxenRPC.pmod/HTTP.pmod/Server.pike:1.4(DEAD) Rev: server/etc/modules/RoxenRPC.pmod/Server.pike:1.18(DEAD) Rev: server/etc/modules/Servlet.pmod:1.26(DEAD) Rev: server/etc/modules/SloppyDOM.pmod:1.5(DEAD) Rev: server/etc/modules/StateHandler.pmod:1.9(DEAD) Rev: server/etc/modules/VFS.pmod:1.4(DEAD) Rev: server/etc/modules/Variable.pmod/Date.pike:1.7(DEAD) Rev: server/etc/modules/Variable.pmod/Email.pike:1.11(DEAD) Rev: server/etc/modules/Variable.pmod/Image.pike:1.4(DEAD) Rev: server/etc/modules/Variable.pmod/Language.pike:1.1(DEAD) Rev: server/etc/modules/Variable.pmod/MapLocation.pike:1.3(DEAD) Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.6(DEAD) Rev: server/etc/modules/Variable.pmod/Schedule.pike:1.5(DEAD) Rev: server/etc/modules/Variable.pmod/Upload.pike:1.4(DEAD) Rev: server/etc/modules/Variable.pmod/VerifiedPassword.pike:1.2(DEAD) Rev: server/etc/modules/Variable.pmod/VerifiedString.pike:1.5(DEAD) Rev: server/etc/modules/Variable.pmod/VerifiedText.pike:1.1(DEAD) Rev: server/etc/modules/Variable.pmod/module.pmod:1.77(DEAD) Rev: server/pike_modules/.autodoc:1.1 Rev: server/pike_modules/DBManager.pmod:1.54 Rev: server/pike_modules/Dims.pmod:1.11 Rev: server/pike_modules/ExtScript.pmod:1.15 Rev: server/pike_modules/GText.pmod:1.14 Rev: server/pike_modules/HTML.pmod:1.5 Rev: server/pike_modules/JavaModule.pmod:1.23 Rev: server/pike_modules/LazyImage.pmod/CoordinateSystem.pike:1.1 Rev: server/pike_modules/LazyImage.pmod/Legend.pike:1.1 Rev: server/pike_modules/LazyImage.pmod/module.pmod:1.6 Rev: server/pike_modules/License.pmod:1.17 Rev: server/pike_modules/Map.pmod:1.4 Rev: server/pike_modules/RXML.pmod/PEnt.pike:1.23 Rev: server/pike_modules/RXML.pmod/PExpr.pike:1.2 Rev: server/pike_modules/RXML.pmod/PXml.pike:1.63 Rev: server/pike_modules/RXML.pmod/module.pmod:1.285 Rev: server/pike_modules/RXML.pmod/refs.pmod:1.12 Rev: server/pike_modules/RXML.pmod/utils.pmod:1.29 Rev: server/pike_modules/Roxen.pmod:1.142 Rev: server/pike_modules/RoxenDebug.pmod:1.4 Rev: server/pike_modules/RoxenRPC.pmod/Client.pike:1.15 Rev: server/pike_modules/RoxenRPC.pmod/HTTP.pmod/Client.pike:1.8 Rev: server/pike_modules/RoxenRPC.pmod/HTTP.pmod/Server.pike:1.4 Rev: server/pike_modules/RoxenRPC.pmod/Server.pike:1.18 Rev: server/pike_modules/Servlet.pmod:1.26 Rev: server/pike_modules/SloppyDOM.pmod:1.5 Rev: server/pike_modules/StateHandler.pmod:1.9 Rev: server/pike_modules/VFS.pmod:1.4 Rev: server/pike_modules/Variable.pmod/Date.pike:1.7 Rev: server/pike_modules/Variable.pmod/Email.pike:1.11 Rev: server/pike_modules/Variable.pmod/Image.pike:1.4 Rev: server/pike_modules/Variable.pmod/Language.pike:1.1 Rev: server/pike_modules/Variable.pmod/MapLocation.pike:1.3 Rev: server/pike_modules/Variable.pmod/Mapping.pike:1.6 Rev: server/pike_modules/Variable.pmod/Schedule.pike:1.5 Rev: server/pike_modules/Variable.pmod/Upload.pike:1.4 Rev: server/pike_modules/Variable.pmod/VerifiedPassword.pike:1.2 Rev: server/pike_modules/Variable.pmod/VerifiedString.pike:1.5 Rev: server/pike_modules/Variable.pmod/VerifiedText.pike:1.1 Rev: server/pike_modules/Variable.pmod/module.pmod:1.77 Rev: server/start:1.196
Updated locales Rev: server/base_server/configuration.pike:1.472 Rev: server/base_server/global_variables.pike:1.80 Rev: server/config_interface/boxes/Box.pmod:1.6 Rev: server/config_interface/boxes/doclinks.pike:1.7 Rev: server/config_interface/boxes/megatokyo.pike:1.3 Rev: server/config_interface/cv_startpage_tabs.pike:1.22 Rev: server/config_interface/dbs/browser.pike:1.21 Rev: server/config_interface/dbs/db_matrix.pike:1.17 Rev: server/config_interface/dbs/edit_group.pike:1.2 Rev: server/config_interface/dbs/import_dbs.pike:1.2 Rev: server/config_interface/dbs/index.html:1.8 Rev: server/config_interface/dbs/new_db.pike:1.6 Rev: server/config_interface/dbs/new_group.pike:1.3 Rev: server/config_interface/dbs/restore_db.pike:1.3 Rev: server/config_interface/dbs/status.pike:1.5 Rev: server/config_interface/dbs/subtabs.pike:1.11 Rev: server/config_interface/diff.pike:1.3 Rev: server/config_interface/event_log/log.pike:1.11 Rev: server/config_interface/sites/drop_site.pike:1.15 Rev: server/config_interface/sites/log.pike:1.11 Rev: server/config_interface/sites/site_content.pike:1.124 Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.6 Rev: server/etc/modules/Variable.pmod/Schedule.pike:1.3 Rev: server/etc/modules/Variable.pmod/VerifiedString.pike:1.5 Rev: server/etc/modules/Variable.pmod/module.pmod:1.64 Rev: server/modules/configuration/config_tags.pike:1.158 Rev: server/modules/filesystems/tarfs.pike:1.8 Rev: server/translations/ces/admin_tasks.xml:1.16 Rev: server/translations/ces/roxen_config.xml:1.23 Rev: server/translations/configs/admin_tasks.xml:1.11 Rev: server/translations/configs/roxen_config.xml:1.28 Rev: server/translations/deu/roxen_config.xml:1.26 Rev: server/translations/deu/update_client.xml:1.5 Rev: server/translations/eng/admin_tasks.xml:1.16 Rev: server/translations/eng/mod_tarfs.xml:1.1 Rev: server/translations/eng/roxen_config.xml:1.28 Rev: server/translations/eng/update_client.xml:1.5 Rev: server/translations/hun/roxen_config.xml:1.19 Rev: server/translations/jpn/roxen_config.xml:1.19 Rev: server/translations/nld/roxen_config.xml:1.23 Rev: server/translations/swe/roxen_config.xml:1.30 Rev: server/translations/swe/update_client.xml:1.5
Support view-only mode Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.5
Fixed a few layoutbugs due to incorrect HTML. Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.4
Added table headers Name and Value Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.3
Removed debug Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.2
New widget. Rev: server/etc/modules/Variable.pmod/Mapping.pike:1.1