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 branch 'patches/ws400' into 6.2 * patches/ws400: Dims: Improved backward compatibility for get().
Merge branch 'patches/ws400' into devel * patches/ws400: Dims: Improved backward compatibility for get().
Dims: Improved backward compatibility for get(). Return an array of size 2 to maintain compatibility with code that uses multi-assign: [int width, int height] = Dims.dims()->get(foo); Fixes [WS-400].
Merge branch 'devel' into kg/WS-168-webdav * devel: (1803 commits) Loader [MariaDB]: Set sql_mode in my.cnf. DBManager: Use CREATE USER with MariaDB 10.2 and later. WebDAV: Use urn:uuid: namespace for locks. Version bumped to 6.2.94 by buildsystem. APIs: Roxen.lookup_real_path_case_insens() now assumes utf-8 fs. APIs: Improved ambiguity recovery in lookup_real_path_case_insens(). APIs: Roxen.lookup_real_path_case_insens() now survives NFD. FTP: Normalize filenames to NFC. APIs: find_dir() now normalizes paths to NFC. HTTP: Normalize paths to Unicode NFC. Fixes bug [WS-172] where an empty initial prestate issued an internal server error. Loader: Remove the global __pragma_save_parent__. Version bumped to 6.2.93 by buildsystem. Use string_to_utf8 rather than Charset.Encoder when possible. Added more verifications in test base class. [WS-168] Adding support for copy and move between different mount points. [WS-168] Broke out parent class from RoxenTest_webdav.pike [WS-168] Version bumped to 6.2.92 by buildsystem. Fixed FIXME comment in RoxenTest_webdav.pike. [WS-168] Version bumped to 6.2.91 by buildsystem. ...
Merge branch 'devel' into ponost/admin-if-17
Pike 8.1: Make built-in Dims wrapper backwards compatible with 8.0 convention.
Merge branch 'feature/pike81' into devel * feature/pike81: Pike 8.1: Ad-hoc class syntax fix. Pike 8.1: Locale.Charset -> Charset. Pike 8.1: Make built-in Dims wrapper backwards compatible with 8.0 convention. Pike 8.1: Ad-hoc class syntax fix. Pike 8.1: Locale.Charset -> Charset. Pike 8.1: Make built-in Dims wrapper backwards compatible with 8.0 convention.
Merge branch 'feature/CMS-297-secure-sitebuilder-cookie' into patches/ws-135 * feature/CMS-297-secure-sitebuilder-cookie: (804 commits) ...
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 commit '64ea9f116367427932716bbbb417bd3f20b99feb' into patches/pike8.0 * commit '64ea9f116367427932716bbbb417bd3f20b99feb': (904 commits) Roxen 5.4.1. ... Updates the base version for the Pike 8.0 patches to Roxen 5.4.1.
No more foreign_idents. More pain than they are worth.
Pike 7.8 provides a more capable Dims implementation (supporting e.g. TIFF and Photoshop) with a compatible API so we can eliminate this version. Rev: server/etc/modules/Dims.pmod:1.13
Fixed 7.7 warnings, mostly about unused local variables. Rev: server/base_server/fonts.pike:1.86 Rev: server/base_server/highlight_pike.pike:1.7 Rev: server/base_server/roxen.pike:1.975 Rev: server/base_server/roxenlib.pike:1.223 Rev: server/base_server/roxenloader.pike:1.394 Rev: server/base_server/rxmlhelp.pike:1.64 Rev: server/etc/modules/DBManager.pmod:1.74 Rev: server/etc/modules/Dims.pmod:1.12 Rev: server/font_handlers/compactimgfile.pike:1.8 Rev: server/protocols/ftp.pike:2.121 Rev: server/protocols/http.pike:1.556
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
Some minimalistic autodoc. Rev: server/etc/modules/Debug.pmod:1.3 Rev: server/etc/modules/Dims.pmod:1.11
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
Better types Rev: server/etc/modules/Dims.pmod:1.9
idonex.se -> roxen.com Rev: server/etc/modules/Dims.pmod:1.8
ximg failed when the image was a directory. Dims now checks the object for the function 'tell()' to verify that it's actually a file object Rev: server/etc/modules/Dims.pmod:1.7
Fixed file offset buf Rev: server/etc/modules/Dims.pmod:1.6
*** empty log message *** Rev: server/etc/modules/Dims.pmod:1.5
*** empty log message *** Rev: server/etc/modules/Dims.pmod:1.4
*** empty log message *** Rev: server/etc/modules/Dims.pmod:1.3
dims.get() can now take either a string or a file object. Rev: server/etc/modules/Dims.pmod:1.2
Added module for reading image dimensions. Rev: server/etc/modules/Dims.pmod:1.1