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. ...
Added macro CFIF_THROW which logs by default but throws if ADMIN_IF_DEBUG is set.
Most of the UI is now rewritten.
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
Implemented the first suggestion in [Bug 1565 (#1565)], moved the site_templates directory the the server directory. Also implemented the searching in the local directory. Rev: server/config_interface/sites/create_site_with_template.pike:1.18 Rev: server/etc/include/config_interface.h:1.10
Fixed [Bug 1069 (#1069)] (port view broken) Rev: server/base_server/basic_defvar.pike:1.24 Rev: server/base_server/global_variables.pike:1.62 Rev: server/config_interface/global_settings/index.html:1.20 Rev: server/etc/include/config_interface.h:1.9
TYPE_THEME is not used any more... Rev: server/etc/include/config_interface.h:1.8
use query(X,1) to get rid of the error messages Rev: server/etc/include/config_interface.h:1.7
get_var is now available at the top level in RXML. Rev: server/etc/include/config_interface.h:1.6
More paranoia Rev: server/etc/include/config_interface.h:1.5
Added SITE_TEMPLATES and ACTIONS defines, they point to the directories where the .pike scripts can be found (relative the 'server' directory) Rev: server/etc/include/config_interface.h:1.4
Theme support Rev: server/config_interface/standard/actions/index.html:1.4 Rev: server/config_interface/standard/event_log/index.html:1.7 Rev: server/config_interface/standard/global_settings/index.html:1.7 Rev: server/config_interface/standard/index.html:1.21 Rev: server/config_interface/standard/logutil.pike:1.4 Rev: server/config_interface/standard/ports/index.html:1.3 Rev: server/config_interface/standard/sites/config_left_item.pike:1.14 Rev: server/config_interface/standard/sites/index.html:1.12 Rev: server/config_interface/standard/sites/site.html:1.9 Rev: server/config_interface/standard/template:1.34 Rev: server/config_interface/standard/upgrade.html:1.3 Rev: server/etc/include/config_interface.h:1.3 Rev: server/modules/configuration/config_tags.pike:1.37 Rev: server/modules/configuration/config_userdb.pike:1.21
New config_setting macro Rev: server/etc/include/config_interface.h:1.2
For the add module page Rev: server/etc/include/config_interface.h:1.1