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

XFF ip list #2

Merged
merged 2 commits into from
Oct 6, 2015
Merged

XFF ip list #2

merged 2 commits into from
Oct 6, 2015

Conversation

cilphex
Copy link
Contributor

@cilphex cilphex commented Oct 5, 2015

No description provided.

@defunctzombie
Copy link
Owner

What's with the merge commit?

… value

index.js: split comma-delimited ip lists to get first value, use try block to not fail on unexpected values
tests/index: add tests for comma-delimited ip list and other unexpected xff values
@cilphex
Copy link
Contributor Author

cilphex commented Oct 5, 2015

When you accepted the first PR, locally I just merged my branch into my forked master. Now on this PR, it seems to want to add that back in, since the progress was still built on the forked repo. I don't know. I just rebased on this master (even though it's the same code) and it seems to have fixed it.

…t happens outside the loop for each override key
defunctzombie added a commit that referenced this pull request Oct 6, 2015
@defunctzombie defunctzombie merged commit 27229f4 into defunctzombie:master Oct 6, 2015
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.

2 participants