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

add port to HTTPServerRequest.fullURL #365

Closed
wants to merge 3 commits into from
Closed

add port to HTTPServerRequest.fullURL #365

wants to merge 3 commits into from

Conversation

extrawurst
Copy link
Contributor

No description provided.

@s-ludwig
Copy link
Member

Can you do a rebase of your branch against the main master branch and drop the first two commits? Especially the merge commit contains a lot of changes that otherwise pollute the history. If you want, I can of course also quickly replicate your change locally (I don't want to cause time-wasting git work).

@extrawurst
Copy link
Contributor Author

I did rebase with you master branch, but i have no idea how to drop the two commits :( (i am kinda new to git)

@s-ludwig
Copy link
Member

if you do git rebase -i remotes/upstream/master, where upstream is the rejectedsoftware/vibe.d remote, you can leave out any commit by not marking it as picked. The same works with TortoiseGIT's rebase dialog if you are on Windows. Take that with a grain of salt, though, as I'm not really a git wizard either.

@extrawurst
Copy link
Contributor Author

I don't get it... i am about to wipe my fork and redo it :D

@s-ludwig
Copy link
Member

Hm.. that should work, too, actually ;) Do a "git pull remotes/upstream/master && git reset remotes/upstream/master" and you should have the all commits wiped (again, considering that "upstream" is the proper remote name), but the changes still left in the working tree. Those then just need to be committed again.

But before you do everything from scratch, I'd say I'll just do the commit locally.

@s-ludwig
Copy link
Member

But wait a minute, the code is actually not correct. It should be the server port instead of the client port (the one from HTTPServerSettings), but only be set if "X-Forwarded-Host" is not set. The client port is the usually automatically assigned port on the browser side of the connection, which is not really useful in most cases.

s-ludwig added a commit that referenced this pull request Oct 27, 2013
… use the right protocol when behind a proxy. See #365.
@s-ludwig s-ludwig closed this Nov 4, 2013
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