Skip to content

[stable13] Allow IPv6 database host - #9432

Merged
MorrisJobke merged 5 commits into
stable13from
backport/9225/ipv6-database-host
May 14, 2018
Merged

[stable13] Allow IPv6 database host#9432
MorrisJobke merged 5 commits into
stable13from
backport/9225/ipv6-database-host

Conversation

@nickvergessen

@nickvergessennickvergessen commented May 9, 2018

Copy link
Copy Markdown
Member

Backport #9225

nickvergessenand others added 4 commits May 9, 2018 10:50
@nickvergessen
Allow IPv6 database hosts
02388a3
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Move regex to a function and add tests
7bb4421
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke@nickvergessen
Add tests for domains
229667c
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke@nickvergessen
Add tests for special domain name
eb429e7
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@nickvergessennickvergessen added bug 3. to review Waiting for reviews labels May 9, 2018
@nickvergessennickvergessen added this to the Nextcloud 13.0.3 milestone May 9, 2018
MorrisJobke
MorrisJobke reviewed May 9, 2018
View reviewed changes
Comment threadlib/private/DB/ConnectionFactory.php Outdated
* @param string $host
* @return array
*/
protected function splitHostFromPortAndSocket($host): array {

@MorrisJobkeMorrisJobkeMay 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

13 is on PHP 5.6 🙈

@nickvergessennickvergessenMay 9, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I knew there was a trap

@nickvergessen
php 5.6 compatibility
ea834da
Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov

codecovBot commented May 9, 2018•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #9432 into stable13 will increase coverage by <.01%.
The diff coverage is 90%.

@@ Coverage Diff @@## stable13 #9432 +/- ##
==============================================
+ Coverage 51.36% 51.36% +<.01% - Complexity 25051 25052 +1 
==============================================
Files 1609 1609 Lines 95342 95346 +4 Branches 1376 1376 ==============================================
+ Hits 48973 48976 +3 - Misses 46369 46370 +1
Impacted FilesCoverage ΔComplexity Δ
lib/private/DB/ConnectionFactory.php67.07% <90%> (+8.09%)24 <3> (+1)⬆️
apps/files_trashbin/lib/Expiration.php90.32% <0%> (-1.62%)29% <0%> (ø)
core/js/js.js65.74% <0%> (-0.56%)0% <0%> (ø)

MorrisJobke
MorrisJobke approved these changes May 14, 2018
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@MorrisJobke
MorrisJobke merged commit 003cc5a into stable13May 14, 2018
@MorrisJobke
MorrisJobke deleted the backport/9225/ipv6-database-host branch May 14, 2018 11:36
@MorrisJobkeMorrisJobke mentioned this pull request May 31, 2018
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 13.0.3

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@rullzer@MorrisJobke