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. ...
WebSocket: Removed some obsolete code. MODULE_WEBSOCKET is no more.
Removed the module_deprecated constant and added the module type flags `MODULE_DEPRECATED` and `MODULE_DEPRECATED_SOFT` instead. Both hides the module from the Add Module listing and marks the module as deprecated when viewing it in the Admin Interface, but the latter does not show it as a deprecated module on the Admin IF start page.
Added WebSocket support to Roxen.
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Added MODULE_TYPE_MASK. Rev: server/etc/include/module_constants.h:1.6
Moved etc to data Rev: server/base_server/basic_defvar.pike:1.30 Rev: server/base_server/configuration.pike:1.518 Rev: server/base_server/global_variables.pike:1.89 Rev: server/base_server/roxen.pike:1.797 Rev: server/base_server/roxenloader.pike:1.329 Rev: server/bin/buildenv.pike:1.8 Rev: server/bin/create_configif.pike:1.41 Rev: server/bin/functions:1.11 Rev: server/data/.cvsignore:1.2 Rev: server/data/Makefile:1.3 Rev: server/data/Makefile.in:1.3 Rev: server/data/contenttypes:1.2 Rev: server/data/example_pages/eng/fonts.html:1.2 Rev: server/data/example_pages/eng/help.html:1.1 Rev: server/data/example_pages/eng/index.html:1.5 Rev: server/data/example_pages/index.html:1.2 Rev: server/data/example_pages/template:1.2 Rev: server/data/extensions:1.49 Rev: server/data/include/config.h:1.32 Rev: server/data/include/config_interface.h:1.10 Rev: server/data/include/module.h:1.55 Rev: server/data/include/module_constants.h:1.5 Rev: server/data/include/request_trace.h:1.10 Rev: server/data/include/roxen.h:1.23 Rev: server/data/include/security.h:1.1 Rev: server/data/include/stat.h:1.5 Rev: server/data/include/timers.h:1.1 Rev: server/data/include/udp.h:1.2 Rev: server/data/include/variables.h:1.12 Rev: server/data/include/version.h:1.538 Rev: server/data/maps/worldmap:1.1 Rev: server/data/modref.xml:1.1 Rev: server/data/more_extensions/apache:1.2 Rev: server/data/more_extensions/chemical:1.3 Rev: server/data/more_extensions/inlinetypes:1.2 Rev: server/data/mysql-template.tar:1.3 Rev: server/data/randomtext/README:1.1 Rev: server/data/randomtext/company:1.2 Rev: server/data/randomtext/poetry:1.2 Rev: server/data/roxen_master.pike:1.126 Rev: server/data/supports:1.91 Rev: server/data/test/config/Test_server_1:1.8 Rev: server/data/test/filesystem/10k.raw:1.1 Rev: server/data/test/filesystem/1k.raw:1.1 Rev: server/data/test/filesystem/hidden.inv:1.1 Rev: server/data/test/filesystem/index.html:1.1 Rev: server/data/test/filesystem/test1.html:1.1 Rev: server/data/test/filesystem/test_rxml_package:1.1 Rev: server/data/test/scripts/functions.pike:1.1 Rev: server/data/test/scripts/setup.pike:1.2 Rev: server/data/test/tests/RoxenTest_argcache.pike:1.4 Rev: server/data/test/tests/RoxenTest_base.pike:1.7 Rev: server/data/test/tests/RoxenTest_help.pike:1.4 Rev: server/data/test/tests/db/RoxenTest_dbbase.pike:1.1 Rev: server/data/test/tests/db/RoxenTest_dbmanager.pike:1.7 Rev: server/data/test/tests/echo.pike:1.2 Rev: server/data/test/tests/ftp/RoxenTest_ftp.pike:1.2 Rev: server/data/test/tests/ftp/ftp_test.pike:1.3 Rev: server/data/test/tests/http/RoxenTest_InternalImg.pike:1.1 Rev: server/data/test/tests/http/RoxenTest_http.pike:1.5 Rev: server/data/test/tests/http/http010.pike:1.2 Rev: server/data/test/tests/http/http09.pike:1.3 Rev: server/data/test/tests/http/http10.pike:1.8 Rev: server/data/test/tests/http/http_common.pike:1.7 Rev: server/data/test/tests/http/internal.pike:1.3 Rev: server/data/test/tests/http/ping.pike:1.2 Rev: server/data/test/tests/pike_async_process_test_common.pike:1.5 Rev: server/data/test/tests/pike_test_common.pike:1.10 Rev: server/data/test/tests/rxml/RoxenTest_BaseRXML.xml:1.48 Rev: server/data/test/tests/rxml/RoxenTest_Compat.xml:1.2 Rev: server/data/test/tests/rxml/RoxenTest_PikeTag.xml:1.1 Rev: server/data/test/tests/rxml/RoxenTest_RXMLTags.xml:1.28 Rev: server/data/test/tests/rxml/RoxenTest_SQLtag.xml:1.3 Rev: server/data/test/tests/rxml/RoxenTest_SessionTag.xml:1.2 Rev: server/data/test/tests/rxml/RoxenTest_Tablify.xml:1.1 Rev: server/data/test/tests/rxml/RoxenTest_WashHtmlTag.xml:1.2 Rev: server/data/test/tests/rxml/RoxenTest_Wiretap.xml:1.1 Rev: server/data/test/tests/userdbmodules/RoxenTest_userdbs.pike:1.6 Rev: server/etc/.cvsignore:1.2(DEAD) Rev: server/etc/Makefile:1.3(DEAD) Rev: server/etc/Makefile.in:1.3(DEAD) Rev: server/etc/contenttypes:1.2(DEAD) Rev: server/etc/example_pages/eng/fonts.html:1.2(DEAD) Rev: server/etc/example_pages/eng/help.html:1.1(DEAD) Rev: server/etc/example_pages/eng/index.html:1.5(DEAD) Rev: server/etc/example_pages/index.html:1.2(DEAD) Rev: server/etc/example_pages/template:1.2(DEAD) Rev: server/etc/extensions:1.49(DEAD) Rev: server/etc/include/config.h:1.32(DEAD) Rev: server/etc/include/config_interface.h:1.10(DEAD) Rev: server/etc/include/module.h:1.55(DEAD) Rev: server/etc/include/module_constants.h:1.5(DEAD) Rev: server/etc/include/request_trace.h:1.10(DEAD) Rev: server/etc/include/roxen.h:1.23(DEAD) Rev: server/etc/include/security.h:1.1(DEAD) Rev: server/etc/include/stat.h:1.5(DEAD) Rev: server/etc/include/timers.h:1.1(DEAD) Rev: server/etc/include/udp.h:1.2(DEAD) Rev: server/etc/include/variables.h:1.12(DEAD) Rev: server/etc/include/version.h:1.538(DEAD) Rev: server/etc/maps/worldmap:1.1(DEAD) Rev: server/etc/modref.xml:1.1(DEAD) Rev: server/etc/more_extensions/apache:1.2(DEAD) Rev: server/etc/more_extensions/chemical:1.3(DEAD) Rev: server/etc/more_extensions/inlinetypes:1.2(DEAD) Rev: server/etc/mysql-template.tar:1.3(DEAD) Rev: server/etc/randomtext/README:1.1(DEAD) Rev: server/etc/randomtext/company:1.2(DEAD) Rev: server/etc/randomtext/poetry:1.2(DEAD) Rev: server/etc/roxen_master.pike:1.126(DEAD) Rev: server/etc/supports:1.91(DEAD) Rev: server/etc/test/config/Test_server_1:1.8(DEAD) Rev: server/etc/test/filesystem/10k.raw:1.1(DEAD) Rev: server/etc/test/filesystem/1k.raw:1.1(DEAD) Rev: server/etc/test/filesystem/hidden.inv:1.1(DEAD) Rev: server/etc/test/filesystem/index.html:1.1(DEAD) Rev: server/etc/test/filesystem/test1.html:1.1(DEAD) Rev: server/etc/test/filesystem/test_rxml_package:1.1(DEAD) Rev: server/etc/test/scripts/functions.pike:1.1(DEAD) Rev: server/etc/test/scripts/setup.pike:1.2(DEAD) Rev: server/etc/test/tests/RoxenTest_argcache.pike:1.4(DEAD) Rev: server/etc/test/tests/RoxenTest_base.pike:1.7(DEAD) Rev: server/etc/test/tests/RoxenTest_help.pike:1.4(DEAD) Rev: server/etc/test/tests/db/RoxenTest_dbbase.pike:1.1(DEAD) Rev: server/etc/test/tests/db/RoxenTest_dbmanager.pike:1.7(DEAD) Rev: server/etc/test/tests/echo.pike:1.2(DEAD) Rev: server/etc/test/tests/ftp/RoxenTest_ftp.pike:1.2(DEAD) Rev: server/etc/test/tests/ftp/ftp_test.pike:1.3(DEAD) Rev: server/etc/test/tests/http/RoxenTest_InternalImg.pike:1.1(DEAD) Rev: server/etc/test/tests/http/RoxenTest_http.pike:1.5(DEAD) Rev: server/etc/test/tests/http/http010.pike:1.2(DEAD) Rev: server/etc/test/tests/http/http09.pike:1.3(DEAD) Rev: server/etc/test/tests/http/http10.pike:1.8(DEAD) Rev: server/etc/test/tests/http/http_common.pike:1.7(DEAD) Rev: server/etc/test/tests/http/internal.pike:1.3(DEAD) Rev: server/etc/test/tests/http/ping.pike:1.2(DEAD) Rev: server/etc/test/tests/pike_async_process_test_common.pike:1.5(DEAD) Rev: server/etc/test/tests/pike_test_common.pike:1.10(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_BaseRXML.xml:1.48(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_Compat.xml:1.2(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_PikeTag.xml:1.1(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_RXMLTags.xml:1.28(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_SQLtag.xml:1.3(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_SessionTag.xml:1.2(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_Tablify.xml:1.1(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_WashHtmlTag.xml:1.2(DEAD) Rev: server/etc/test/tests/rxml/RoxenTest_Wiretap.xml:1.1(DEAD) Rev: server/etc/test/tests/userdbmodules/RoxenTest_userdbs.pike:1.6(DEAD) Rev: server/modules/configuration/config_filesystem.pike:1.110 Rev: server/modules/configuration/roxen_test.pike:1.53 Rev: server/modules/examples/common_api.pike:1.9 Rev: server/modules/misc/contenttypes.pike:1.24 Rev: server/modules/misc/randomtext.pike:1.8 Rev: server/modules/tags/rxmltags.pike:1.373 Rev: server/pike_modules/DBManager.pmod:1.55 Rev: server/pike_modules/Map.pmod:1.5 Rev: server/start:1.197
Various changes, object -> typed object, the start of a new user database system, and a few other minor fixes Rev: server/base_server/basic_defvar.pike:1.23 Rev: server/base_server/config_userdb.pike:1.19 Rev: server/base_server/configuration.pike:1.409 Rev: server/base_server/disk_cache.pike:1.58 Rev: server/base_server/fonts.pike:1.68 Rev: server/base_server/global_variables.pike:1.60 Rev: server/base_server/hosts.pike:1.29 Rev: server/base_server/javamodule.pike:1.4 Rev: server/base_server/language.pike:1.35 Rev: server/base_server/module_support.pike:1.85 Rev: server/base_server/newdecode.pike:1.29 Rev: server/base_server/prototypes.pike:1.5 Rev: server/base_server/read_config.pike:1.54 Rev: server/base_server/roxen.pike:1.610 Rev: server/base_server/roxenloader.pike:1.230 Rev: server/bin/buildenv.pike:1.6 Rev: server/bin/distclean.pike:1.2 Rev: server/bin/garbagecollector.pike:1.20 Rev: server/bin/lsquota.pike:1.2 Rev: server/bin/unpack_cif.pike:1.4 Rev: server/config_interface/standard/boxes/slashdot.pike:1.3 Rev: server/config_interface/standard/inheritinfo.pike:1.17 Rev: server/config_interface/standard/logutil.pike:1.14 Rev: server/config_interface/standard/sites/create_site_with_template.pike:1.13 Rev: server/config_interface/standard/sites/drop_module.pike:1.11 Rev: server/config_interface/standard/sites/module_info.pike:1.5 Rev: server/config_interface/standard/sites/site_content.pike:1.103 Rev: server/config_interface/standard/sites/site_header.pike:1.17 Rev: server/config_interface/standard/sites/verify_site_name.pike:1.6 Rev: server/etc/include/module_constants.h:1.5 Rev: server/etc/modules/Dims.pmod:1.10 Rev: server/etc/modules/ExtScript.pmod:1.12 Rev: server/etc/modules/GText.pmod:1.12 Rev: server/etc/modules/Roxen.pmod:1.66 Rev: server/modules/security/INFO:1.1 Rev: server/modules/security/httpbasic.pike:1.1 Rev: server/ntroxenloader.pike:1.7
MODULE_PARSER is now MODULE_TAG Rev: server/etc/include/module_constants.h:1.4 Rev: server/modules/configuration/config_tags.pike:1.111 Rev: server/modules/configuration/update.pike:1.23 Rev: server/modules/database/sqltag.pike:1.60 Rev: server/modules/directories/directories.pike:1.79 Rev: server/modules/examples/fnord.pike:1.11 Rev: server/modules/examples/newstyle_fnord.pike:1.8 Rev: server/modules/graphics/atlas/atlas.pike:1.7 Rev: server/modules/graphics/business_graphics/business.pike:1.133 Rev: server/modules/graphics/cimg.pike:1.29 Rev: server/modules/graphics/counter.pike:1.38 Rev: server/modules/graphics/gbutton.pike:1.60 Rev: server/modules/graphics/graphic_text.pike:1.235 Rev: server/modules/graphics/pimage.pike:1.23 Rev: server/modules/graphics/rimage/rimage.pike:1.18 Rev: server/modules/graphics/tablist.pike:1.47 Rev: server/modules/graphics/wiretap.pike:1.19 Rev: server/modules/ldap/ldaptag.pike:2.2 Rev: server/modules/misc/language.pike:1.31 Rev: server/modules/misc/language2.pike:1.10 Rev: server/modules/misc/preferred_language.pike:1.13 Rev: server/modules/misc/randomtext.pike:1.5 Rev: server/modules/scripting/cgi.pike:2.46 Rev: server/modules/scripting/perl.pike:2.7 Rev: server/modules/scripting/piketag.pike:2.21 Rev: server/modules/tags/accessed.pike:1.36 Rev: server/modules/tags/additional_rxml.pike:1.5 Rev: server/modules/tags/awizard.pike:1.20 Rev: server/modules/tags/check_spelling.pike:1.13 Rev: server/modules/tags/countdown.pike:1.38 Rev: server/modules/tags/foldlist.pike:1.23 Rev: server/modules/tags/html_wash.pike:1.7 Rev: server/modules/tags/indirect_href.pike:1.24 Rev: server/modules/tags/killframe.pike:1.31 Rev: server/modules/tags/obox.pike:1.30 Rev: server/modules/tags/rxmltags.pike:1.171 Rev: server/modules/tags/sed.pike:1.10 Rev: server/modules/tags/session_scope.pike:1.2 Rev: server/modules/tags/ssi.pike:1.33 Rev: server/modules/tags/tablify.pike:1.55 Rev: server/modules/tags/translation_mod.pike:1.7 Rev: server/modules/tags/vform.pike:1.9 Rev: server/modules/tags/wizard_tag.pike:1.28 Rev: server/modules/tags/wml.pike:1.11 Rev: server/modules/throttling/throttletags.pike:1.10
Added the VAR_* and TYPE_* macros to this file again, there is not really any need to have them as constants (especially now that we are moving from the old to the new variable system) Rev: server/etc/include/module.h:1.38 Rev: server/etc/include/module_constants.h:1.3
New types Rev: server/etc/include/module_constants.h:1.2
All MODULE_WHATEVER macros are now constants. This makes it possible to skip the #include <module.h> line in most modules. That is now only needed when you use QUERY() or TAGDOCS. Rev: server/etc/include/module.h:1.33 Rev: server/etc/include/module_constants.h:1.1