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)
Use the roxen:: namespace for AutoDoc. Rev: server/base_server/.autodoc:1.1 Rev: server/etc/modules/.autodoc:1.2
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
Top level marker. Rev: server/etc/modules/.autodoc:1.1