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

[ticket/11613] Allow cookies for domains without dots #3188

Merged
merged 1 commit into from Nov 27, 2014

Conversation

marc1706
Copy link
Member

Unfortunately, I missed that the fix version for the related ticket is also 3.0.13-RC1.

This will probably cause a merge conflict upon merging into dev-asc and dev that needs to be resolved.

Ticket: https://tracker.phpbb.com/browse/PHPBB3-11613

@marc1706 marc1706 added this to the 3.0.13 milestone Nov 26, 2014
@nickvergessen
Copy link
Contributor

If you cherry-pick the original commit, it should merge forward just fine.

@marc1706
Copy link
Member Author

Will try to do that in a second.

@marc1706
Copy link
Member Author

Cherry-picked and removed change to end of line

@Nicofuma Nicofuma merged commit b67b67f into phpbb:develop-olympus Nov 27, 2014
Nicofuma added a commit that referenced this pull request Nov 27, 2014
[ticket/11613] Allow cookies for domains without dots

* marc1706/ticket/11613:
  [ticket/11613] Allow cookies to work on netbios domains
@marc1706 marc1706 deleted the ticket/11613 branch November 27, 2014 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants