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 'patches/ws482' into 6.1 * patches/ws482: Testsuite [RXML]: Adjusted remaining failing test. Testsuite [RXML]: Adjusted remaining failing test. Testsuite [RXML]: Adjusted tests some more. Testsuite [RXML]: Fixed typo in error message pattern. Testsuite [RXML]: Updated error-handling tests to [WS-475].
Merge branch 'patches/ws482' into 6.2 * patches/ws482: Testsuite [RXML]: Adjusted remaining failing test. Testsuite [RXML]: Adjusted remaining failing test. Testsuite [RXML]: Adjusted tests some more. Testsuite [RXML]: Fixed typo in error message pattern. Testsuite [RXML]: Updated error-handling tests to [WS-475].
Merge branch 'patches/ws482' into devel * patches/ws482: Testsuite [RXML]: Fixed typo in error message pattern.
Testsuite [RXML]: Fixed typo in error message pattern. Second go at fixing [WS-482].
Merge branch 'patches/ws482' into devel * patches/ws482: Testsuite [RXML]: Updated error-handling tests to [WS-475].
Testsuite [RXML]: Updated error-handling tests to [WS-475]. Fixes [WS-482].
Merge branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 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.
Added <json-format> and <json-parse>. The docs could do with some examples, though. Rev: server/etc/test/tests/rxml/RoxenTest_json.xml:1.1 Rev: server/modules/tags/rxmltags.pike:1.656