Merge branch 'patches/bug7602' into grubba/patchsystem Note: This makes this branch no longer compatible with Roxen 5.2 and earlier. * patches/bug7602: (117 commits) RoxenPatch: Complain but proceed when the CA list is empty. RoxenPatch: The patch cluster is fetched over HTTPS... RoxenPatch: Support relative URLs from the HTTPS action. Config IF: Reordered settings somewhat. Config IF: Join the tabs "Auto {Restart,Patching}" to "Auto Maintenance". RoxenPatch: Revert the patch installation on manual restart option. RoxenPatch: Don't apply pending patches on signal exit. RoxenPatch: More permission filtering. RoxenPatch: Fixed some NULL-dereferences and calls. RoxenPatch: Complain if not running a dist. RoxenPatch: Use HTTPS to fetch the patch cluster. RoxenPatch: Added control of patch installation to the restart action. RoxenPatch: Added option to automatically install patches on restart. RoxenPatch: Throw proper errors instead of arrays with a single string. RoxenPatch: Clean up the debug log output somewhat. RoxenPatch: The refresh fetch now also tries If-Modified-Since. RoxenPatch: The ETag refresh fetch now actually works. RoxenPatch: Added support for automatic fetch of patch clusters. RoxenPatch: Perform refresh fetch of the patch cluster. RoxenPatch: Inhibit "Import from Roxen" without VERSION.DIST. ...
Merge commit '5ee4d2b88e3e12d1622f9a161e9a29484cbf6e4c' into patches/bug7602 Bump base version to Roxen 5.2.335.
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Merge branch 'patches/poodle' into 5.2 * patches/poodle: SSL: Disable support for SSL 3.0 by default. Pike 8.0: Add support for some new SSL features. Pike 8.0: #if efun() is obsolete since 10 years back. Pike 8.0: String.Buffer contains a sprintf(). Pike 8.0: Unset variables are UNDEFINED.
Merge branch 'patches/pike8.0' into patches/bug4594 * patches/pike8.0: (230 commits) Pike 8.0: More SSL/TLS API changes. FTPS: Fixed support for Pike 8.0. Roxen: Use the current names for the ASN1 classes. SNMP: The LDAP private ASN.1 classes aren't available in Pike 8.0. SNMP: The fields tag and cls are variables in Pike 8.0. Pike 8.0: More SSL changes. Pike 8.0: Improved robustness when upgrading old certs. Pike 8.0: Upgrade old automatic X.509v1 certs to X.509v3. Pike 8.0: Fixed SSL port binding with new API. Pike 8.0: Take advantage of the improved SSL support. Pike 8.0: Add support for some new SSL features. Pike 8.0: #if efun() is obsolete since 10 years back. Pike 8.0: String.Buffer contains a sprintf(). Pike 8.0: Unset variables are UNDEFINED. Roxen 5.4.1. ABS: List the pending call_outs. Fix warnings generated by Pike 8.0. DB browser: add support for custom DB field formatters in owning modules. DBManager.module_table_info: Consider all module entries from the DB. Added transliteration module. ... Conflicts: server/base_server/roxen.pike
Merge branch 'patches/pike8.0' into devel * patches/pike8.0: Pike 8.0: Add support for some new SSL features. Pike 8.0: #if efun() is obsolete since 10 years back. Pike 8.0: String.Buffer contains a sprintf(). Pike 8.0: Unset variables are UNDEFINED.
Pike 8.0: #if efun() is obsolete since 10 years back. Reduce warnings from cpp().
Use #if constant() instead of #if efun(). will warn about its use.
No more foreign_idents. More pain than they are worth.
There's no need to completely disable the trace_overhead accounting. Rev: server/etc/include/request_trace.h:1.20
Don't call gethrvtime() unless tracing is enabled since it's expensive on e.g. Mac OS X. Rev: server/etc/include/request_trace.h:1.19
Added time stamping to be able to (mostly) cancel out the overhead for the trace functions themselves. Rev: server/etc/include/request_trace.h:1.18
Added trace macros that allow the id object to be given explicitly. Rev: server/etc/include/request_trace.h:1.17
Some clarifications. Rev: server/etc/include/request_trace.h:1.16
Updated some comments to reflect the fact that html messages are gone. Rev: server/etc/include/request_trace.h:1.15
Clean up request tracing regarding HTML quoting. Tracing may be sent to the log, to a web page or both so the tracing module cannot expect to pass HTML data. This change is incompatible in the sense that old calls may render with double quoting but that's arguably better than leaking unquoted tags to the Resolve Path web page. The Resolve Path wizard now identifies messages containing linefeeds and present them in <pre> style to maintain columns etc. Rev: server/base_server/configuration.pike:1.656 Rev: server/config_interface/actions/resolv.pike:1.34 Rev: server/etc/include/request_trace.h:1.14 Rev: server/etc/modules/RXML.pmod/module.pmod:1.368
Do html quoting in SIMPLE_TRACE_LEAVE as advertised. Rev: server/etc/include/request_trace.h:1.13
Turns out that TRACE_ENTER should have an html encoded message, while TRACE_LEAVE does the encoding itself. Rev: server/etc/include/request_trace.h:1.12
The Resolv Path wizard has not taken html encoded descriptions as input in quite some time. Rev: server/etc/include/request_trace.h:1.11
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
Added some comments to document the TRACE_* macros. Added SIMPLE_TRACE_* variants which are more convenient than the traditional ones. Rev: server/etc/include/request_trace.h:1.10
Fixed consistent encoding in TAG_TRACE_ENTER and TAG_TRACE_LEAVE. Rev: server/etc/include/request_trace.h:1.9
Added TAG_TRACE_ENTER and TAG_TRACE_LEAVE which are variants of TRACE_ENTER and TRACE_LEAVE for use in tag callbacks. Rev: server/etc/include/request_trace.h:1.8
Bugfix. Rev: server/etc/include/request_trace.h:1.7
Potential fix for [bug 2476]. Rev: server/etc/include/request_trace.h:1.6
-DAVERAGE_PROFLING added. I needed a new macro, TRACE_ENTER and TRACE_LEAVE were very unsuited for the job. Currently just dumps the info to stdout now and then. Will be improved significantly later on. Rev: server/base_server/configuration.pike:1.429 Rev: server/base_server/roxen.pike:1.664 Rev: server/etc/include/request_trace.h:1.5
Added request tracing to the debug log. Use the REQUEST_TRACE define for it. Rev: server/etc/include/request_trace.h:1.4
Now resolv path works again. :-) Rev: server/base_server/configuration.pike:1.289 Rev: server/config_interface/standard/actions/resolv.pike:1.6 Rev: server/etc/include/request_trace.h:1.3
Stricter types and faster when not running REQUEST_DEBUG Rev: server/etc/include/request_trace.h:1.2
Traces requests Rev: server/etc/include/request_trace.h:1.1