Fixing port logic #5576
Merged
Fixing port logic #5576
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
the
cla signed
theopolis
previously approved these changes
Jun 21, 2019
|
@Will-Low Osquery work has been moved over to this repo, if you can fix the merge conflict we can get this merged and track our releases from here. |
|
Heads up, looks like this still is not rebased against the current master. |
|
Oh no, I don’t think the merge worked. Let me see if I can help. |
|
@theopolis What seems to be the issue? |
|
I made a mistake, when I was inspecting the changed-lines last night using the GH UI it seemed this branch pulled in overlapping changes. |
theopolis
approved these changes
Jun 28, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per https://github.com/osql/osql/pull/7, this else if statement contains a bug where port should be appended to the Host header if not a standard port.