diff options
| -rw-r--r-- | acconfig.h | 2 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | include/apr.h.in | 2 | ||||
| -rw-r--r-- | include/apr.hw | 1 | ||||
| -rw-r--r-- | include/apr_network_io.h | 6 | ||||
| -rw-r--r-- | network_io/unix/sockopt.c | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/acconfig.h b/acconfig.h index e63bac496..89909514e 100644 --- a/acconfig.h +++ b/acconfig.h @@ -13,7 +13,7 @@ #undef HAVE_TRUERAND #undef HAVE_POLLIN #undef HAVE_isascii -#undef HAVE_SO_ACCEPT_FILTER +#undef HAVE_SO_ACCEPTFILTER /* Cross process serialization techniques */ #undef USE_FLOCK_SERIALIZE diff --git a/configure.in b/configure.in index 958778601..1461d9050 100644 --- a/configure.in +++ b/configure.in @@ -1221,16 +1221,16 @@ if test "x$ac_cv_define_TCP_NOPUSH" = "xyes"; then have_corkable_tcp="1" fi -APR_CHECK_DEFINE(SO_ACCEPT_FILTER, sys/socket.h) -if test "x$ac_cv_define_SO_ACCEPT_FILTER" = "xyes"; then - accept_filter="1" +APR_CHECK_DEFINE(SO_ACCEPTFILTER, sys/socket.h) +if test "x$ac_cv_define_SO_ACCEPTFILTER" = "xyes"; then + acceptfilter="1" else - accept_filter="0" + acceptfilter="0" fi AC_SUBST(apr_tcp_nopush_flag) AC_SUBST(have_corkable_tcp) -AC_SUBST(accept_filter) +AC_SUBST(acceptfilter) AC_CHECK_FUNCS(set_h_errno) diff --git a/include/apr.h.in b/include/apr.h.in index ecea32d5a..4f0364adb 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -131,7 +131,7 @@ #define APR_HAS_XLATE @iconv@ #define APR_HAS_OTHER_CHILD @oc@ #define APR_HAS_DSO @aprdso@ -#define APR_HAS_SO_ACCEPT_FILTER @accept_filter@ +#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@ #define APR_HAS_UNICODE_FS 0 #define APR_HAS_USER 1 #define APR_HAS_LARGE_FILES 0 diff --git a/include/apr.hw b/include/apr.hw index 6c4848730..40488a884 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -208,6 +208,7 @@ #define APR_HAS_XLATE 0 #define APR_HAS_OTHER_CHILD 1 #define APR_HAS_DSO 1 +#define APR_HAS_SO_ACCEPTFILTER 0 #define APR_HAS_UNICODE_FS 1 #define APR_HAS_USER 1 #define APR_HAS_LARGE_FILES 1 diff --git a/include/apr_network_io.h b/include/apr_network_io.h index ea85e8e02..f85a3fda5 100644 --- a/include/apr_network_io.h +++ b/include/apr_network_io.h @@ -790,7 +790,7 @@ APR_DECLARE(apr_status_t) apr_ipsubnet_create(apr_ipsubnet_t **ipsub, const char */ APR_DECLARE(int) apr_ipsubnet_test(apr_ipsubnet_t *ipsub, apr_sockaddr_t *sa); -#ifdef APR_OS_ACCEPT_FILTER +#if APR_HAS_SO_ACCEPTFILTER /** * Set an OS level accept filter. * @param sock The socket to put the accept filter on. @@ -798,8 +798,8 @@ APR_DECLARE(int) apr_ipsubnet_test(apr_ipsubnet_t *ipsub, apr_sockaddr_t *sa); * @param args Any extra args to the accept filter. Passing NULL here removes * the accept filter. */ -apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char name[16], - char args[256 - 16]); +apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, + char *args); #endif /** diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c index 30dcdf2fe..fdf8b8b4e 100644 --- a/network_io/unix/sockopt.c +++ b/network_io/unix/sockopt.c @@ -290,7 +290,7 @@ apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont) return APR_SUCCESS; } -#ifdef SO_ACCEPTFILTER +#if APR_HAS_SO_ACCEPTFILTER apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, char *args) { |