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 '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 commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc' into patches/ftp Synch with Roxen 6.0/6.1 split. * commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc': (428 commits)
Merge branch 'patches/mariadb' into 6.0 * patches/mariadb: Installer [Win32]: Prefer MariaDB 10.1 to MariaDB 10.0.
Merge branch 'patches/mariadb' into devel * patches/mariadb: Installer [Win32]: Prefer MariaDB 10.1 to MariaDB 10.0.
Merge branch 'patches/bug7705' into patches/mariadb * patches/bug7705: Installer [Win32]: Prefer MariaDB 10.1 to MariaDB 10.0.
Installer [Win32]: Prefer MariaDB 10.1 to MariaDB 10.0. Potential fix for [bug 7705 (#7705)] (and possibly [bug 7698 (#7698)]).
Merge commit '4e00bc2b471671eafe8b33d9e1c3c7b338e8f264' into patches/mariadb * commit '4e00bc2b471671eafe8b33d9e1c3c7b338e8f264': (37 commits)
Merge commit '8a2ce4a87' into patches/bug7582 * commit '8a2ce4a87': (7413 commits)
Installer [win32]: Mention MariaDB too where MySQL is mentioned.
Installer [win32]: Fixed remaining issues with MariaDB. The registry search rules should now be able to find both mysqladmin and myisamchk. They were not found earlier due to the registry key "Location" having been renamed "INSTALLDIR" in the MySQL to MariaDB transition.
Installer [win32]: Reversed registry search order. It seems that the last matching search term wins. Also prefer MariaDB 10.0 to MariaDB 10.1 for now.
Installer [win32]: More fixes to detect MariaDB. The main problem this time was that WIX-identifiers are case sensitive, and that both the identifiers "MariaDB100Location" and "Mariadb100Location" existed, with the latter not having the correct value.
Installer [win32]: Fixed some duplicate identifiers.
Installer: The WIN32 installer know knows about MariaDB. The installer now searches for MariaDB versions 5.5, 10.0 and 10.1. Also adds searching for MySQL versions 5.5, 5.6 and 5.7.
Let's try once more... Rev: server/etc/RoxenUI.wxs:1.93
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.92
Kludge to delay start of the Roxen Service until after COMMIT. Potential fix for [bug 4831 (#4831)]. Rev: server/etc/RoxenUI.wxs:1.91 Rev: server/etc/Win32Installer.vbs:1.26
Minor cleanups. Rev: server/etc/RoxenUI.wxs:1.90
More progressbar-related fixes. Rev: server/etc/RoxenUI.wxs:1.89
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.88
Added and adjusted lots of progress texts. Rev: server/etc/RoxenUI.wxs:1.87
Changed some custom actions to be on commit rather than deferred as a potential workaround for installation on Windows 6.0 systems without the VC CRT runtime. Rev: server/etc/RoxenUI.wxs:1.86
Added some more ProgressTexts. Rev: server/etc/RoxenUI.wxs:1.85
Minor change. Rev: server/etc/RoxenUI.wxs:1.84
Second attempt to show progress text. Rev: server/etc/RoxenUI.wxs:1.83
First attempt to show progress test. Rev: server/etc/RoxenUI.wxs:1.82
Added some ProgressTexts. Rev: server/etc/RoxenUI.wxs:1.81
Moved around CreateConfigInterface to a later section of the InstallExecuteSequence. Might fix issues with Windows 5.2. Rev: server/etc/RoxenUI.wxs:1.80
Don't start the server if mysqld.exe is missing. Rev: server/etc/RoxenUI.wxs:1.79
Use [ROXEN_TITLE] for the default path. Rev: server/etc/RoxenUI.wxs:1.78
AppSearch is now back to the default (50) position also for the InstallExecuteSequence, since it MUST be before LaunchConditions (at position 100). Potential fix for self-test install failing due to lacking WSH. Rev: server/etc/RoxenUI.wxs:1.77
Prefer Mysql 5.0 (supported) to Mysql 5.1 (unsupported). Added check for mysqladmin.exe. Rev: server/etc/RoxenUI.wxs:1.76
Hide the MySQL configuration dialog. Rev: server/etc/RoxenUI.wxs:1.75
The MySQL base directory is always enabled for edit. Rev: server/etc/RoxenUI.wxs:1.74
Some fixes for the MySQL Settings dialog. Rev: server/etc/RoxenUI.wxs:1.73
Added dialog with MySQL-related settings. Rev: server/etc/RoxenUI.wxs:1.72
MySQL 4.1 no longer supported. Rev: server/etc/RoxenUI.wxs:1.71
Fixed some typos. Rev: server/etc/RoxenUI.wxs:1.70
Some more rewrites... Rev: server/etc/RoxenUI.wxs:1.69
Now knows about MySQL 5.0's UUID. MySQL 5.0 has an appended "-nt" on the mysqld binary name. Rev: server/etc/RoxenUI.wxs:1.68
More MySQL stuff... Rev: server/etc/RoxenUI.wxs:1.67
Reversed the multi-search order. Rev: server/etc/RoxenUI.wxs:1.66
Added some debug. Rev: server/etc/RoxenUI.wxs:1.65
More MySQL-related fixes... Rev: server/etc/RoxenUI.wxs:1.64
More fixes... Rev: server/etc/RoxenUI.wxs:1.63
Reworked the mysql-location.txt generation once more. Rev: server/etc/RoxenUI.wxs:1.62
Cleaned up the MySQL searching somewhat. Rev: server/etc/RoxenUI.wxs:1.61
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.60
And again... Rev: server/etc/RoxenUI.wxs:1.59
Even more fixes... Rev: server/etc/RoxenUI.wxs:1.58
More searching for MySQL... Rev: server/etc/RoxenUI.wxs:1.57
More DirectorySearch tests... Rev: server/etc/RoxenUI.wxs:1.56
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.55
And yet again... Rev: server/etc/RoxenUI.wxs:1.54
And again... Rev: server/etc/RoxenUI.wxs:1.53
Let's try once more... Rev: server/etc/RoxenUI.wxs:1.52
Attempt to fix use of DirectorySearchRef. Rev: server/etc/RoxenUI.wxs:1.51
Fixed some typos. Rev: server/etc/RoxenUI.wxs:1.50
More directory search fixes... Rev: server/etc/RoxenUI.wxs:1.49
Avoid creation of mysql-location.txt if it already exists. Rev: server/etc/RoxenUI.wxs:1.48
Fixed typo in InstallExecuteSequence. Rev: server/etc/RoxenUI.wxs:1.47
Case-sensitivity in the Impersonate attribute... Rev: server/etc/RoxenUI.wxs:1.46
Added some support for creation of mysql-location.txt. Rev: server/etc/RoxenUI.wxs:1.45
..and the next round of schema corrections. Rev: server/etc/RoxenUI.wxs:1.44
Some fixes to comply with more modern WiX 2.0 schema. Rev: server/etc/RoxenUI.wxs:1.43
Create environment.ini. Rev: server/etc/RoxenUI.wxs:1.42 Rev: server/etc/Win32Installer.vbs:1.11
Testing to remove the StartBrowser action. Rev: server/etc/RoxenUI.wxs:1.41
Decouple service option from all users option. Rev: server/etc/RoxenUI.wxs:1.40
More AppSearch experiments. Rev: server/etc/RoxenUI.wxs:1.39
Reenabled all users selection. Rev: server/etc/RoxenUI.wxs:1.38
First try at detecting a prior installation. Rev: server/etc/RoxenUI.wxs:1.37
Oops, fixed quoting errors. Rev: server/etc/RoxenUI.wxs:1.36
Enable the Next button as soon as one of the password fields has been changed. The change is due to that the expressions aren't dynamically evaluated, which confuses the user, since he had to unfocus the password fields before the Next button was enabled. Rev: server/etc/RoxenUI.wxs:1.35
Fixed the condition for the StartBrowser action. Rev: server/etc/RoxenUI.wxs:1.34
Moved around some radio buttons. Rev: server/etc/RoxenUI.wxs:1.33
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.32
First try at adding options to disable installation of service. Rev: server/etc/RoxenUI.wxs:1.31
Oops, bugfix. Rev: server/etc/RoxenUI.wxs:1.30
Added use of RemoveOldService(). Rev: server/etc/RoxenUI.wxs:1.29
Added properties UPGRADE and OLDTARGETDIR. Rev: server/etc/RoxenUI.wxs:1.28
Removed stale code. Rev: server/etc/RoxenUI.wxs:1.27
Attempt 2... Rev: server/etc/RoxenUI.wxs:1.26
Appempt at using WshShell.Run to spawn the pike that creates the config interface. Rev: server/etc/RoxenUI.wxs:1.25
Now utilizes CustomActionData for CreatePikeLocation. Rev: server/etc/RoxenUI.wxs:1.24
The pike installation has been delayed from 4001/4002 to 5001/5002, so adjust the config interface actions from 4100/4101 to 5100/5101. Rev: server/etc/RoxenUI.wxs:1.23
CreatePikeLocation now uses Win32Installer.vbs. Rev: server/etc/RoxenUI.wxs:1.22
Check if vbscript likes cr-lf better than plain lf. Rev: server/etc/RoxenUI.wxs:1.21
Try using immediate for the new CreatePikeLocation custom action. Rev: server/etc/RoxenUI.wxs:1.20
Fixed typo. Rev: server/etc/RoxenUI.wxs:1.19
Try using vbscript to create pikelocation.txt. Rev: server/etc/RoxenUI.wxs:1.18
Increased verbosity. Rev: server/etc/RoxenUI.wxs:1.17
Switched custom actions from commit to deferred. Rev: server/etc/RoxenUI.wxs:1.16
Try using the MSI method of installing services. Rev: server/etc/RoxenUI.wxs:1.15
Removed the (redundant) splash dialog. Rev: server/etc/RoxenUI.wxs:1.14
The adminstrator user should be lower-case. Rev: server/etc/RoxenUI.wxs:1.13
Changed cleanup actions from commit to rollback. Rev: server/etc/RoxenUI.wxs:1.12
Added start/stop of server and launching of browser. Rev: server/etc/RoxenUI.wxs:1.11
Added registration of service. FIXME: Ought to use the MSI native method. Rev: server/etc/RoxenUI.wxs:1.10
Added action CreatePikeLocation. Rev: server/etc/RoxenUI.wxs:1.9
Fixed missing script name in CreateConfigInterface action. Rev: server/etc/RoxenUI.wxs:1.8
Changed the protocol selector from ListView to ComboBox in ComboList style. Rev: server/etc/RoxenUI.wxs:1.7
Oops, missed the not... Rev: server/etc/RoxenUI.wxs:1.6
Even better... Rev: server/etc/RoxenUI.wxs:1.5
Fixed syntax in condition. Rev: server/etc/RoxenUI.wxs:1.4
Fixed order of dialigs. Rev: server/etc/RoxenUI.wxs:1.3
Fixed duplicate lables. Rev: server/etc/RoxenUI.wxs:1.2
First version. Rev: server/etc/RoxenUI.wxs:1.1