Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 115
    • Merge Requests 115
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !1159

Closed
Opened Jun 16, 2020 by Kazuhiko Shiozaki@kazuhiko
  • Report abuse
Report abuse

WIP: ERP5Type/patches: use the first entry of HTTP_X_FORWARDED_FOR as the source IP address.

Thanks to slapos!769 (merged), we can just use the first entry of HTTP_X_FORWARDED_FOR as the source IP address.

/cc @luke @vpelletier @tomo

Edited Jun 17, 2020 by Jérome Perrin

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b trustable-x-forwarded-for origin/trustable-x-forwarded-for

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff trustable-x-forwarded-for

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 18
  • Commits 1
  • Changes 3
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1159
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号