]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: Fix civetweb IPv6 10580/head
authorRobin H. Johnson <robin.johnson@dreamhost.com>
Fri, 5 Aug 2016 00:15:18 +0000 (17:15 -0700)
committerRobin H. Johnson <robin.johnson@dreamhost.com>
Fri, 5 Aug 2016 00:24:53 +0000 (17:24 -0700)
commit8b9954d0ccab9694c7519002209be8cb9dc03362
tree9d25c6b7c8a494107e161908efd828e37485684d
parent6996b76d35b20a558d13d35fafaaad47fe331434
rgw: Fix civetweb IPv6

Commit c38e3cbb6f7c6221209f2b512cba18c564c895a4 introduced a second
compiled version of src/civetweb/src/civetweb.c, but did not pass the
configuration header (civetweb/include/civetweb_conf.h).

As a result, USE_IPV6 was not defined when it was compiled, and that
copy was included into the radosgw binary. This caused breakage for the
civetweb frontend when used with IPv6:
  rgw frontends = civetweb port=[::]:7480

Reintroduce the header so that civetweb is compiled correctly again.

Fixes: http://tracker.ceph.com/issues/16928
Backport: jewel
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 921c556b65eafe2136f2afcc8234681711aa7348)
src/rgw/Makefile.am