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
Merge branch 'patches/ws85' into devel * patches/ws85: Updated translations.
Updated translations.
base_server -> server_core Rev: server/plugins/protocols/http.pike:1.381 Rev: server/server_core/fonts.pike:1.87 Rev: server/server_core/roxen.pike:1.822 Rev: server/server_core/roxenloader.pike:1.343 Rev: server/tools/ntroxen/startdll/cmdline.cpp:1.21 Rev: server/translations/configs/roxen_message.xml:1.18 Rev: server/translations/deu/roxen_message.xml:1.13 Rev: server/translations/eng/roxen_message.xml:1.23 Rev: server/translations/swe/roxen_message.xml:1.22
Automated update Rev: server/translations/configs/roxen_message.xml:1.17 Rev: server/translations/deu/roxen_message.xml:1.11 Rev: server/translations/eng/mod_filesystem.xml:1.10 Rev: server/translations/eng/mod_fnord.xml:1.3 Rev: server/translations/eng/mod_sizer.xml:1.3 Rev: server/translations/eng/roxen_message.xml:1.22 Rev: server/translations/swe/roxen_message.xml:1.21
Automated update Rev: server/translations/Makefile:1.5 Rev: server/translations/ces/roxen_config.xml:1.32 Rev: server/translations/configs/roxen_config.xml:1.30 Rev: server/translations/configs/roxen_message.xml:1.16 Rev: server/translations/deu/roxen_config.xml:1.40 Rev: server/translations/deu/roxen_message.xml:1.10 Rev: server/translations/eng/mod_filesystem.xml:1.8 Rev: server/translations/eng/mod_webapp.xml:1.3(DEAD) Rev: server/translations/eng/roxen_config.xml:1.37 Rev: server/translations/eng/roxen_message.xml:1.21 Rev: server/translations/hun/roxen_config.xml:1.28 Rev: server/translations/jpn/roxen_config.xml:1.28 Rev: server/translations/nld/roxen_config.xml:1.32 Rev: server/translations/swe/roxen_config.xml:1.41 Rev: server/translations/swe/roxen_message.xml:1.20
Removed localized functions. Rev: server/translations/configs/roxen_message.xml:1.15
prot_fhttp is gone Rev: server/translations/configs/roxen_message.xml:1.14
Updated Rev: server/translations/ces/admin_tasks.xml:1.10 Rev: server/translations/ces/roxen_config.xml:1.19 Rev: server/translations/configs/admin_tasks.xml:1.9 Rev: server/translations/configs/roxen_config.xml:1.21 Rev: server/translations/configs/roxen_message.xml:1.13 Rev: server/translations/deu/admin_tasks.xml:1.8 Rev: server/translations/deu/roxen_config.xml:1.17 Rev: server/translations/eng/admin_tasks.xml:1.11 Rev: server/translations/eng/roxen_config.xml:1.25 Rev: server/translations/eng/roxen_message.xml:1.16 Rev: server/translations/hun/admin_tasks.xml:1.8 Rev: server/translations/hun/roxen_config.xml:1.16 Rev: server/translations/jpn/admin_tasks.xml:1.8 Rev: server/translations/jpn/roxen_config.xml:1.16 Rev: server/translations/nld/admin_tasks.xml:1.10 Rev: server/translations/nld/roxen_config.xml:1.19 Rev: server/translations/swe/admin_tasks.xml:1.9 Rev: server/translations/swe/roxen_config.xml:1.25 Rev: server/translations/swe/roxen_message.xml:1.12
New and modified translations Rev: server/config_interface/sites/add_module.pike:1.51 Rev: server/modules/configuration/config_filesystem.pike:1.74 Rev: server/modules/filesystems/incoming.pike:1.15 Rev: server/modules/filesystems/restrictedfs.pike:1.19 Rev: server/modules/filesystems/secure_fs.pike:1.26 Rev: server/modules/filesystems/userfs.pike:1.64 Rev: server/translations/ces/roxen_config.xml:1.18 Rev: server/translations/configs/roxen_config.xml:1.20 Rev: server/translations/configs/roxen_message.xml:1.12 Rev: server/translations/deu/roxen_config.xml:1.16 Rev: server/translations/eng/mod_incoming.xml:1.1 Rev: server/translations/eng/mod_restrictedfs.xml:1.1 Rev: server/translations/eng/mod_secure_fs.xml:1.1 Rev: server/translations/eng/mod_userfs.xml:1.1 Rev: server/translations/eng/roxen_config.xml:1.24 Rev: server/translations/eng/roxen_message.xml:1.15 Rev: server/translations/hun/roxen_config.xml:1.15 Rev: server/translations/jpn/roxen_config.xml:1.15 Rev: server/translations/nld/roxen_config.xml:1.18 Rev: server/translations/swe/roxen_config.xml:1.24 Rev: server/translations/swe/roxen_message.xml:1.11
Per must be running an extractor without explicit sort. Sort fix. Rev: server/translations/configs/roxen_config.xml:1.16 Rev: server/translations/configs/roxen_message.xml:1.11
Translations synchronized Rev: server/base_server/config_userdb.pike:1.16 Rev: server/config_interface/standard/topmenu.pike:1.15 Rev: server/modules/tags/sizer.pike:1.3 Rev: server/translations/configs/roxen_config.xml:1.15 Rev: server/translations/configs/roxen_message.xml:1.10 Rev: server/translations/eng/mod_sizer.xml:1.1
Localized update client Rev: server/translations/ces/roxen_config.xml:1.13 Rev: server/translations/configs/roxen_config.xml:1.14 Rev: server/translations/configs/roxen_message.xml:1.9 Rev: server/translations/configs/update_client.xml:1.1 Rev: server/translations/deu/roxen_config.xml:1.10 Rev: server/translations/eng/roxen_config.xml:1.19 Rev: server/translations/eng/roxen_message.xml:1.13 Rev: server/translations/eng/update_client.xml:1.1 Rev: server/translations/hun/roxen_config.xml:1.10 Rev: server/translations/jpn/roxen_config.xml:1.10 Rev: server/translations/nld/roxen_config.xml:1.13 Rev: server/translations/swe/roxen_config.xml:1.18 Rev: server/translations/swe/roxen_message.xml:1.9 Rev: server/translations/swe/update_client.xml:1.1
'normalize' the files Rev: server/translations/ces/admin_tasks.xml:1.7 Rev: server/translations/ces/roxen_config.xml:1.9 Rev: server/translations/configs/roxen_config.xml:1.11 Rev: server/translations/configs/roxen_message.xml:1.8 Rev: server/translations/deu/admin_tasks.xml:1.5 Rev: server/translations/deu/roxen_config.xml:1.6 Rev: server/translations/eng/admin_tasks.xml:1.8 Rev: server/translations/eng/mod_SQLuserdb.xml:1.4 Rev: server/translations/eng/mod_auth.xml:1.2 Rev: server/translations/eng/mod_common_api.xml:1.2 Rev: server/translations/eng/mod_compat.xml:1.4 Rev: server/translations/eng/mod_directories.xml:1.2 Rev: server/translations/eng/mod_filesystem.xml:1.2 Rev: server/translations/eng/mod_fnord.xml:1.2 Rev: server/translations/eng/mod_indexfiles.xml:1.2 Rev: server/translations/eng/mod_obox.xml:1.5 Rev: server/translations/eng/mod_sqldb.xml:1.4 Rev: server/translations/eng/mod_sqltag.xml:1.2 Rev: server/translations/eng/roxen_config.xml:1.15 Rev: server/translations/eng/roxen_message.xml:1.12 Rev: server/translations/eng/roxen_start.xml:1.12 Rev: server/translations/hun/admin_tasks.xml:1.5 Rev: server/translations/hun/roxen_config.xml:1.6 Rev: server/translations/jpn/admin_tasks.xml:1.5 Rev: server/translations/jpn/roxen_config.xml:1.6 Rev: server/translations/nld/admin_tasks.xml:1.5 Rev: server/translations/nld/roxen_config.xml:1.9 Rev: server/translations/swe/admin_tasks.xml:1.5 Rev: server/translations/swe/roxen_config.xml:1.13 Rev: server/translations/swe/roxen_message.xml:1.8 Rev: server/translations/swe/roxen_start.xml:1.9
More translations. And a suggestion: How about _not_ updating the .xml translation files when nothing is changed? It would make these checkins somewhat smaller. :-) Rev: server/modules/database/sqltag.pike:1.67 Rev: server/modules/directories/directories.pike:1.87 Rev: server/modules/directories/indexfiles.pike:1.18 Rev: server/modules/examples/auth.pike:1.4 Rev: server/modules/examples/common_api.pike:1.5 Rev: server/modules/examples/fnord.pike:1.13 Rev: server/modules/examples/newstyle_fnord.pike:1.10 Rev: server/modules/filesystems/filesystem.pike:1.91 Rev: server/translations/ces/admin_tasks.xml:1.6 Rev: server/translations/ces/roxen_config.xml:1.8 Rev: server/translations/configs/admin_tasks.xml:1.6 Rev: server/translations/configs/roxen_config.xml:1.10 Rev: server/translations/configs/roxen_message.xml:1.7 Rev: server/translations/deu/admin_tasks.xml:1.4 Rev: server/translations/deu/roxen_config.xml:1.5 Rev: server/translations/eng/admin_tasks.xml:1.7 Rev: server/translations/eng/mod_SQLuserdb.xml:1.3 Rev: server/translations/eng/mod_auth.xml:1.1 Rev: server/translations/eng/mod_common_api.xml:1.1 Rev: server/translations/eng/mod_compat.xml:1.3 Rev: server/translations/eng/mod_directories.xml:1.1 Rev: server/translations/eng/mod_filesystem.xml:1.1 Rev: server/translations/eng/mod_fnord.xml:1.1 Rev: server/translations/eng/mod_indexfiles.xml:1.1 Rev: server/translations/eng/mod_obox.xml:1.4 Rev: server/translations/eng/mod_sqldb.xml:1.3 Rev: server/translations/eng/mod_sqltag.xml:1.1 Rev: server/translations/eng/roxen_config.xml:1.14 Rev: server/translations/eng/roxen_message.xml:1.11 Rev: server/translations/eng/roxen_start.xml:1.11 Rev: server/translations/hun/admin_tasks.xml:1.4 Rev: server/translations/hun/roxen_config.xml:1.5 Rev: server/translations/jpn/admin_tasks.xml:1.4 Rev: server/translations/jpn/roxen_config.xml:1.5 Rev: server/translations/nld/admin_tasks.xml:1.4 Rev: server/translations/nld/roxen_config.xml:1.8 Rev: server/translations/swe/admin_tasks.xml:1.4 Rev: server/translations/swe/roxen_config.xml:1.12 Rev: server/translations/swe/roxen_message.xml:1.7 Rev: server/translations/swe/roxen_start.xml:1.8
Canonicalization Rev: server/translations/configs/roxen_config.xml:1.9 Rev: server/translations/configs/roxen_message.xml:1.6
Fixed bug caused by a bug in the Makefile. Rev: server/translations/configs/admin_tasks.xml:1.4 Rev: server/translations/configs/roxen_config.xml:1.8 Rev: server/translations/configs/roxen_message.xml:1.5 Rev: server/translations/configs/roxen_start.xml:1.5 Rev: server/translations/eng/admin_tasks.xml:1.5 Rev: server/translations/eng/roxen_config.xml:1.9 Rev: server/translations/eng/roxen_message.xml:1.8 Rev: server/translations/eng/roxen_start.xml:1.9
More to translate Rev: server/translations/configs/admin_tasks.xml:1.3 Rev: server/translations/configs/roxen_config.xml:1.7 Rev: server/translations/configs/roxen_message.xml:1.4 Rev: server/translations/configs/roxen_start.xml:1.4 Rev: server/translations/eng/admin_tasks.xml:1.4 Rev: server/translations/eng/mod_SQLuserdb.xml:1.1 Rev: server/translations/eng/mod_compat.xml:1.1 Rev: server/translations/eng/mod_obox.xml:1.2 Rev: server/translations/eng/mod_sqldb.xml:1.1 Rev: server/translations/eng/roxen_config.xml:1.8 Rev: server/translations/eng/roxen_message.xml:1.7 Rev: server/translations/eng/roxen_start.xml:1.8
Nice automatic generation of the files (type make), and also updated to match the source files Rev: server/translations/Makefile:1.1 Rev: server/translations/configs/.cvsignore:1.1 Rev: server/translations/configs/admin_tasks.xml:1.2 Rev: server/translations/configs/roxen_config.xml:1.6 Rev: server/translations/configs/roxen_message.xml:1.3 Rev: server/translations/configs/roxen_start.xml:1.3 Rev: server/translations/eng/admin_tasks.xml:1.3 Rev: server/translations/eng/mod_obox.xml:1.1 Rev: server/translations/eng/roxen_config.xml:1.7 Rev: server/translations/eng/roxen_message.xml:1.6 Rev: server/translations/eng/roxen_start.xml:1.7 Rev: server/translations/scripts/build_from_config:1.1 Rev: server/translations/scripts/make_config:1.1 Rev: server/translations/scripts/make_mod_config:1.1
updated configs Rev: server/translations/configs/roxen_config.xml:1.3 Rev: server/translations/configs/roxen_message.xml:1.2 Rev: server/translations/configs/roxen_start.xml:1.2 Rev: server/translations/eng/roxen_config.xml:1.4 Rev: server/translations/eng/roxen_message.xml:1.3 Rev: server/translations/eng/roxen_start.xml:1.3 Rev: server/translations/swe/roxen_config.xml:1.5 Rev: server/translations/swe/roxen_message.xml:1.3 Rev: server/translations/swe/roxen_start.xml:1.3
project: roxen_message Rev: server/translations/configs/roxen_message.xml:1.1 Rev: server/translations/eng/roxen_message.xml:1.1