Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved some config options from httpd to chttpd #3574

Merged
merged 1 commit into from May 24, 2021
Merged

Moved some config options from httpd to chttpd #3574

merged 1 commit into from May 24, 2021

Conversation

jiahuili430
Copy link
Contributor

@jiahuili430 jiahuili430 commented May 21, 2021

Overview

Solved conflicts from "cherry-pick" 3.x commit with kdiff3 merge tool.

Testing recommendations

make eunit apps=chttpd suites=chttpd_util_test

Related Issues or Pull Requests

This fixes #3472

Checklist

  • Code is written and works correctly
  • Changes are covered by tests
  • Any new configurable parameters are documented in rel/overlay/etc/default.ini
  • A PR for documentation changes has been made in https://github.com/apache/couchdb-documentation

@jiahuili430 jiahuili430 changed the title Moved some config options from httpd to chttpd [WIP] Moved some config options from httpd to chttpd May 24, 2021
@jiahuili430 jiahuili430 marked this pull request as ready for review May 24, 2021 15:53
Solved conflicts from "cherry-pick" 3.x commit
@tonysun83
Copy link
Contributor

tonysun83 commented May 24, 2021

Based on my reading of the code, we have 3 scenarios:

  1. If both chttpd and httpd config values exist, chttpd takes priority.
  2. If chttpd does not exist, but old httpd value exists, then we use httpd value
  3. If neither exists, we take in the passed default.

If this is the logic then it LGTM, and +1

Copy link
Contributor

@nickva nickva left a comment

Choose a reason for hiding this comment

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

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move all config options out of couch_httpd_auth and httpd
3 participants