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/locale' into devel * patches/locale: Locale: Default to using ../bin/roxen to extract the locales. Locale: Use proper dependencies in the Makefile.
Locale: Default to using ../bin/roxen to extract the locales.
Locale: Use proper dependencies in the Makefile. Ensure that the productions in the locale Makefile are executed in the correct order by using dependencies.
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
My name is no longer needed! Rev: server/translations/Makefile:1.10
Adjusted for Pike 7.8. Rev: server/translations/Makefile:1.9 Rev: server/translations/scripts/build_from_config:1.7(DEAD)
Updated paths. Rev: server/translations/Makefile:1.8 Rev: server/translations/scripts/build_from_config:1.6
Always sort the same way. Rev: server/translations/Makefile:1.7
Also look for modules in more_modules. Rev: server/translations/Makefile:1.6
Use pike -x extrace_locale Rev: server/translations/Makefile:1.6 Rev: server/translations/scripts/build_from_config:1.6
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
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
Just as wrong, but more working. Rev: server/translations/Makefile:1.5
Fix for gxml. Rev: server/translations/Makefile:1.4
Better, but not good Rev: server/translations/Makefile:1.3
Abstraction Rev: server/translations/Makefile:1.2
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