[Httpbl-beta] APR 0.9 v. 1.2: apr_socket_create and APR_BRIGADE_FOREACH

[James B. <jmb...@ha...>]

> /opt/mod_httpbl.c: In function 'make_simple_http_request':
> /opt/mod_httpbl.c:5201: warning: passing argument 4 of
> 'apr_socket_create' makes integer from pointer without a cast
> /opt/mod_httpbl.c:5201: error: too few arguments to function 'apr_socket_create'
> /opt/mod_httpbl.c: In function 'replace_email_filter':
> /opt/mod_httpbl.c:7311: error: expected ';' before '{' token

I've also seen this on FC6.

If you're using APR 1.2, you'll need to change the invocation of
apr_socket_create and use alternatives to APR_BRIGADE_FOREACH:

diff -r1.1.1.1 mod_httpbl.c
5201c5201
<         rv = apr_socket_create(&s, sa->family, SOCK_STREAM, /*APR_PROTO_TCP, */mp); // it appears my version of APR has different parameters than my template code
---
>         rv = apr_socket_create(&s, sa->family, SOCK_STREAM, APR_PROTO_TCP, mp);
7310c7310,7311
<     APR_BRIGADE_FOREACH(e, bb)
---
>     for(e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb);
>       e = APR_BUCKET_NEXT(e))

0.9 has apr_socket_create and apr_socket_create_ex, the latter taking the extra param;
1.2 has apr_socket_create which is the 5-param version.

APR_BRIGADE_FOREACH is deprecated in 0.9 and gone in 1.2.

regards,
James
-- 
James Beckett <jm...@ha...> <http://www.hackery.net/jmb/>
F601 C085 1482 B92A C812  556C A985 1497 209B 4E65