diff options
| author | czaks <marcin@6irc.net> | 2013-09-01 11:25:19 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-09-01 11:25:19 -0400 |
| commit | 069f1def9bf8c8d769afdc5740e9ff13271065bd (patch) | |
| tree | d60db9e7126ecb0e046b34c3faa3b49ca7bfd32e /inc/config.php | |
| parent | c2400568656e6bb8e629704d312322937d24fb2d (diff) | |
| parent | 22fcca343f8d4e820745a673972286b47a6a17ba (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
install.php
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/config.php b/inc/config.php index 1d3321ce..fddeae9a 100644 --- a/inc/config.php +++ b/inc/config.php @@ -88,12 +88,12 @@ $config['db']['database'] = ''; // Table prefix (optional) $config['db']['prefix'] = ''; - // Use a persistent connection (experimental; benefits unknown) + // Use a persistent database connection when possible $config['db']['persistent'] = false; // Anything more to add to the DSN string (eg. port=xxx;foo=bar) $config['db']['dsn'] = ''; - // Timeout duration in seconds (not all drivers support this) - $config['db']['timeout'] = 5; + // Connection timeout duration in seconds + $config['db']['timeout'] = 30; /* * ==================== |