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 commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Renamed the Debug module RoxenDebug to resolve name conflict with Debug.pmod in Pike. Compatibility issue, but it shouldn't matter much since it's barely used. Rev: server/etc/modules/Debug.pmod:1.4(DEAD) Rev: server/etc/modules/RXML.pmod/module.pmod:1.242 Rev: server/etc/modules/RoxenDebug.pmod:1.4 Rev: server/protocols/http.pike:1.334
Some minimalistic autodoc. Rev: server/etc/modules/Debug.pmod:1.3 Rev: server/etc/modules/Dims.pmod:1.11
Added an _sprintf to ObjectMarker. Rev: server/etc/modules/Debug.pmod:1.2
A module to contain generally useful debug helpers. Rev: server/etc/modules/Debug.pmod:1.1