Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

2016-09-27 09:23:54 +02:00 · 2016-09-27 09:23:54 +02:00 · 5511b39e16
commit 5511b39e16
parent f99aa69784 2d316e47e1
1 changed files with 1 additions and 1 deletions
--- a/doc/config.rst
+++ b/doc/config.rst
@ -1558,7 +1558,7 @@ Cookie authentication options
        $cfg['ArbitraryServerRegexp'] = '/^(server|another|yetdifferent)$/'; 

        // Allow connection to range of IP addresses:
-        $cfg['ArbitraryServerRegexp'] = '@^192.168.0.[0-9]{1,}$@';
+        $cfg['ArbitraryServerRegexp'] = '@^192\.168\.0\.[0-9]{1,}$@';

        // Allow connection to server name ending with -mysql:
        $cfg['ArbitraryServerRegexp'] = '@^[^:]\-mysql$@';