diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:02:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:02:30 +0200 |
| commit | 346c784bf3e25ce72ecf30c0436f114599944932 (patch) | |
| tree | 9224601b047964b720608386196af10678149d8a /phpBB/phpbb | |
| parent | a282eb1328d74da46aba6daff5d306efb6204f9e (diff) | |
| parent | a6939fcb8ec09b98a4593bb472499bbc5c20d12e (diff) | |
| download | forums-346c784bf3e25ce72ecf30c0436f114599944932.tar forums-346c784bf3e25ce72ecf30c0436f114599944932.tar.gz forums-346c784bf3e25ce72ecf30c0436f114599944932.tar.bz2 forums-346c784bf3e25ce72ecf30c0436f114599944932.tar.xz forums-346c784bf3e25ce72ecf30c0436f114599944932.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/add_jabber_ssl_context_config_options.php | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/add_jabber_ssl_context_config_options.php b/phpBB/phpbb/db/migration/data/v31x/add_jabber_ssl_context_config_options.php new file mode 100644 index 0000000000..9f416fe069 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/add_jabber_ssl_context_config_options.php @@ -0,0 +1,32 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class add_jabber_ssl_context_config_options extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array('\phpbb\db\migration\data\v31x\v3110'); + } + + public function update_data() + { + return array( + // See http://php.net/manual/en/context.ssl.php + array('config.add', array('jab_verify_peer', 1)), + array('config.add', array('jab_verify_peer_name', 1)), + array('config.add', array('jab_allow_self_signed', 0)), + ); + } +} |