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

rgw: remove trailing :port from host for purposes of subdomain matching #6042

Merged
merged 2 commits into from Oct 12, 2015

Conversation

Projects
None yet
4 participants
@robbat2
Contributor

robbat2 commented Sep 22, 2015

@yehudasa yehudasa added this to the hammer milestone Sep 22, 2015

@ghost ghost self-assigned this Sep 24, 2015

@ghost

This comment has been minimized.

ghost commented Sep 24, 2015

@robbat2 could you please

git cherry-pick -x abe4ec293d08b0314bf5c081ace2456073f3a22c

note the -x that will include a reference to the original commit, which is convenient to figure out where the backport comes from.

Thanks !

@ghost ghost changed the title from rgw: remove trailing :port from host for purposes of subdomain matching to DNM: rgw: remove trailing :port from host for purposes of subdomain matching Sep 24, 2015

@ghost ghost changed the title from DNM: rgw: remove trailing :port from host for purposes of subdomain matching to rgw: remove trailing :port from host for purposes of subdomain matching Sep 24, 2015

rgw: remove trailing :port from host for purposes of subdomain matching
Some clients (ahem, CrossFTP) include the :port in the HTTP_HOST header.
Strip it out.

Switch req_info field to a std::string and avoid copying it in preprocess.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit abe4ec2)
@robbat2

This comment has been minimized.

Contributor

robbat2 commented Sep 24, 2015

@dachary done

@yehudasa

This comment has been minimized.

Member

yehudasa commented Sep 25, 2015

@robbat2 @dachary there's a regression due to this commit, we'll need also to pull in the fix to issue 13239.

@ghost

This comment has been minimized.

ghost commented Sep 25, 2015

@yehudasa ack, setting DNM for now

@ghost ghost changed the title from rgw: remove trailing :port from host for purposes of subdomain matching to DNM: rgw: remove trailing :port from host for purposes of subdomain matching Sep 25, 2015

rgw: set default value for env->get() call
Fixes: #13239

This fixes a regression introduced at commit abe4ec2.
The host var is a string, env->get() returns a char pointer, shouldn't
pass in NULL.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0d5730e)
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
@robbat2

This comment has been minimized.

Contributor

robbat2 commented Sep 28, 2015

@yehudasa I added your commit to fix it per issue 13239.

@ghost ghost changed the title from DNM: rgw: remove trailing :port from host for purposes of subdomain matching to rgw: remove trailing :port from host for purposes of subdomain matching Oct 2, 2015

ghost pushed a commit that referenced this pull request Oct 2, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 3, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 3, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 3, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 7, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 8, 2015

Merge pull request #6042: rgw: remove trailing :port from host for pu…
…rposes of subdomain matching

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost

This comment has been minimized.

ghost commented Oct 10, 2015

@yehudasa does this backport look good to merge ? It passed a run of the hammer rgw suite ( see http://tracker.ceph.com/issues/13356#note-5 for details ).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment