Skip to content

Correctly handle emtpy string in proxyuserpwd config - #16721

Merged
rullzer merged 1 commit into
masterfrom
fix/16644
Aug 11, 2019
Merged

Correctly handle emtpy string in proxyuserpwd config#16721
rullzer merged 1 commit into
masterfrom
fix/16644

Conversation

@rullzer

Copy link
Copy Markdown
Member

As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
"cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.

Follow up to #16644 with adjusted tests.

As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
"cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.
Signed-off-by: Scott Shambarger <devel@shambarger.net>
@rullzerrullzer added the 4. to release Ready to be released and/or waiting for tests to finish label Aug 11, 2019
@rullzerrullzer added this to the Nextcloud 17 milestone Aug 11, 2019
@rullzer
rullzer merged commit f465f9d into masterAug 11, 2019
@rullzer
rullzer deleted the fix/16644 branch August 11, 2019 20:46
@rullzer

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable16 failed. Please do this backport manually.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rullzer@sshambar