Skip to content

Fix: config param 'overwritecondaddr' not working - #42930

Merged
blizzz merged 3 commits into
masterfrom
fix/6914/overwritecond
Jan 29, 2024
Merged

Fix: config param 'overwritecondaddr' not working#42930
blizzz merged 3 commits into
masterfrom
fix/6914/overwritecond

Conversation

@blizzz

@blizzzblizzz commented Jan 18, 2024

Copy link
Copy Markdown
Member

new PR of #30654 (author was not responsive)
fixes#6914

@blizzzblizzz added bug 3. to review Waiting for reviews labels Jan 18, 2024
@blizzzblizzz added this to the Nextcloud 29 milestone Jan 18, 2024
@blizzzblizzz mentioned this pull request Jan 18, 2024
Closed
@blizzzblizzz changed the title Fix/6914/overwritecondFix: config param 'overwritecondaddr' not workingJan 18, 2024
@blizzz
blizzz requested review from a team, ArtificialOwl, ChristophWurst, nfebe, nickvergessen and skjnldsv and removed request for a teamJanuary 18, 2024 11:18
@blizzz

blizzz commented Jan 18, 2024

Copy link
Copy Markdown
MemberAuthor

/skjnldsv-backport to stable28

@blizzz

blizzz commented Jan 18, 2024

Copy link
Copy Markdown
MemberAuthor

/skjnldsv-backport to stable27

@blizzz

blizzz commented Jan 18, 2024

Copy link
Copy Markdown
MemberAuthor

/skjnldsv-backport to stable26

@susnux

susnux commented Jan 22, 2024

Copy link
Copy Markdown
Contributor

@blizzz drone failure seems related:

1) Test\AppFramework\Http\RequestTest::testGetRequestUriWithOverwrite with data set #1 ('/scriptname.php/some/PathInfo', '/owncloud/', '123')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/scriptname.php/some/PathInfo'
+'/test.php/some/PathInfo'
/drone/src/tests/lib/AppFramework/Http/RequestTest.php:1861

@blizzz

blizzz commented Jan 23, 2024

Copy link
Copy Markdown
MemberAuthor

Yes, I need to adjust the tests next time I can take time for it :)

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 26, 2024
pavelkryland others added 3 commits January 27, 2024 15:11
@pavelkryl@blizzz
fixing bug#6914: Config Param 'overwritecondaddr' not working
446ecbc
- just ignoring/removing extra parameter 'protocol' as suggested by
blizzz
Signed-off-by: Pavel Kryl <pavel@kryl.eu>
@pavelkryl@blizzz
code style: ommited space, reverted [code review]
30ad530
@blizzz
test(unit): fix RequestTest
216b95f
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/6914/overwritecond branch from ac12178 to 216b95fCompareJanuary 27, 2024 14:11
@blizzz
blizzz merged commit 3749c2c into masterJan 29, 2024
@blizzz
blizzz deleted the fix/6914/overwritecond branch January 29, 2024 08:56
@blizzz

blizzz commented Jan 29, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable28

@blizzz

blizzz commented Jan 29, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable27

@blizzz

blizzz commented Jan 29, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable26

@backportbotbackportbotBot mentioned this pull request Jan 29, 2024
Merged
This was referenced Jan 29, 2024
Merged
Closed
@blizzzblizzz mentioned this pull request Mar 5, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwlArtificialOwl is a code owner automatically assigned from nextcloud/server-backend
@nfebenfebeAwaiting requested review from nfebenfebe is a code owner automatically assigned from nextcloud/server-backend
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 29

Development

Successfully merging this pull request may close these issues.

Config Param 'overwritecondaddr' not working

5 participants

@blizzz@susnux@ChristophWurst@skjnldsv@pavelkryl