diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-13 11:56:52 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-13 11:56:52 +0200 |
| commit | 9ac763a6407fa4b974fae4a2d60b9408660c3db6 (patch) | |
| tree | 4486e415056137afb5bc36421a16eab405e35416 | |
| parent | 0b64a0c369b5596ac5a228d7f3067fed49ddcc38 (diff) | |
| parent | c28e462583e9ef32266dfc1285b986c4d2673294 (diff) | |
| download | nextcloud-server-9ac763a6407fa4b974fae4a2d60b9408660c3db6.tar.gz nextcloud-server-9ac763a6407fa4b974fae4a2d60b9408660c3db6.zip | |
Merge pull request #24594 from owncloud/authtoken-name-column-size
Use CLOB for auth token names to allow long user agent strings
| -rw-r--r-- | db_structure.xml | 3 | ||||
| -rw-r--r-- | tests/lib/authentication/token/defaulttokenprovidertest.php | 5 | ||||
| -rw-r--r-- | version.php | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/db_structure.xml b/db_structure.xml index 7b4a3b53294..6e57b003fcf 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -1065,10 +1065,9 @@ <field> <name>name</name> - <type>text</type> + <type>clob</type> <default></default> <notnull>true</notnull> - <length>100</length> </field> <field> diff --git a/tests/lib/authentication/token/defaulttokenprovidertest.php b/tests/lib/authentication/token/defaulttokenprovidertest.php index 5ee33d0ec11..1902227a4fa 100644 --- a/tests/lib/authentication/token/defaulttokenprovidertest.php +++ b/tests/lib/authentication/token/defaulttokenprovidertest.php @@ -62,7 +62,10 @@ class DefaultTokenProviderTest extends TestCase { $token = 'token'; $uid = 'user'; $password = 'passme'; - $name = 'Some browser'; + $name = 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12' + . 'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'; $type = IToken::PERMANENT_TOKEN; $toInsert = new DefaultToken(); diff --git a/version.php b/version.php index 81e0bc1b067..d9e1ca1df1c 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 1, 0, 1); +$OC_Version = array(9, 1, 0, 2); // The human readable string $OC_VersionString = '9.1.0 pre alpha'; |