BUG REPORT: modperl(dev) make fails at "`APR_SO_TIMEOUT' undeclared" w/ latest httpd(dev)

-------------8<---------- Start Bug Report ------------8<----------
1. Problem Description:

hi,

apache2 + modperl has been working beautifully for ages.

as of a system-wide update today, modperl build is failing at MAKE.

details are:

11/26/03 15:26:46
cvs -d :pserver:anoncvs@xxxxxxxxxxxxxx:/home/cvspublic co modperl-2.0

unsetenv CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS LDDLFLAGS LD_PREBIND;\
setenv LDFLAGS "-L/usr/include/apache2 -ldl"

cd modperl-2.0

perl Makefile.PL MP_APXS=/usr/sbin/apxs MP_INST_APACHE2=1

make  FAILS with:

       modperl_constants.c: In function `modperl_constants_lookup_apr':
       modperl_constants.c:755: error: `APR_SO_TIMEOUT' undeclared (first use 
in this function)
       modperl_constants.c:755: error: (Each undeclared identifier is reported 
only once
       modperl_constants.c:755: error: for each function it appears in.)
       make[1]: *** [modperl_constants.lo] Error 1
       make: *** [modperl_lib] Error 2

in httpd-2.0/srclib/apr/CHANGES, i note:
 *) Removed apr_socket_opt_{get|set}(..., APR_SO_TIMEOUT) which
    was deprecated in favor of apr_socket_timeout_{get|set}().

checking in modperl dir i note:

[root]/usr/ports/modperl-2.0> grep -rln APR_SO_TIMEOUT .
./src/modules/perl/modperl_constants.c
./xs/tables/current/Apache/ConstantsTable.pm

[root]/usr/ports/modperl-2.0> grep -rln apr_socket_timeout .
./WrapXS/APR/Socket/Socket.xs
./xs/APR/Socket/APR__Socket.h
./xs/maps/apr_functions.map
./xs/tables/current/Apache/FunctionTable.pm
./xs/tables/current/ModPerl/FunctionTable.pm

[root]/usr/ports/modperl-2.0>


i suspect that the APR_SO_TIMEOUT references need to be removed from the modperl code, and replaces with the 
apr_socket_timeout_{get|set}() calls, but simply not sure.

2. Used Components and their Configuration:

*** mod_perl version 1.9912

*** using lib/Apache/BuildConfig.pm
*** Makefile.PL options:
 MP_APXS         => /usr/sbin/apxs
 MP_COMPAT_1X    => 1
 MP_GENERATE_XS  => 1
 MP_INST_APACHE2 => 1
 MP_LIBNAME      => mod_perl
 MP_USE_DSO      => 1
 MP_USE_STATIC   => 1


*** /usr/sbin/httpd -V
Server version: Apache/2.1.0-dev
Server built:   Nov 26 2003 14:58:49
Server's Module Magic Number: 20030821:2
Architecture:   32-bit
Server compiled with....
-D APACHE_MPM_DIR="server/mpm/worker"
-D APR_HAS_MMAP
-D APR_HAVE_IPV6 (IPv4-mapped addresses enabled)
-D APR_USE_POSIXSEM_SERIALIZE
-D APR_USE_PTHREAD_SERIALIZE
-D SINGLE_LISTEN_UNSERIALIZED_ACCEPT
-D APR_HAS_OTHER_CHILD
-D AP_HAVE_RELIABLE_PIPED_LOGS
-D HTTPD_ROOT="/usr"
-D SUEXEC_BIN="/usr/bin/suexec"
-D DEFAULT_SCOREBOARD="logs/apache_runtime_status"
-D DEFAULT_ERRORLOG="logs/error_log"
-D AP_TYPES_CONFIG_FILE="/etc/apache2/mime.types"
-D SERVER_CONFIG_FILE="/etc/apache2/httpd.conf"


*** /usr/bin/perl -V
Summary of my perl5 (revision 5.0 version 8 subversion 2) configuration:
 Platform:
   osname=darwin, osvers=6.8, archname=darwin-thread-multi
   uname='darwin my.internal.domain.com 6.8 darwin kernel version 6.8: wed sep 10 15:20:55 pdt 2003; 
root:xnuxnu-344.49.obj~2release_ppc power macintosh powerpc '
   config_args='-Dfirstmakefile=GNUmakefile -Duseshrplib -Duseperlio -Duseithreads -Dinstallusrbinperl -Dprefix=/usr 
-Dperladmin=postmaster@xxxxxxxxxxxx -Dcf_email=postmaster@xxxxxxxxxxxx -Dperllibs=-ldb -lc -lm -dl -Dlibs=-ldb -lc -lm 
-ldl'
   hint=recommended, useposix=true, d_sigaction=define
   usethreads=define use5005threads=undef useithreads=define 
usemultiplicity=define
   useperlio=define d_sfio=undef uselargefiles=define usesocks=undef
   use64bitint=undef use64bitall=undef uselongdouble=undef
   usemymalloc=n, bincompat5005=undef
 Compiler:
   cc='cc', ccflags ='-pipe -fno-common -DPERL_DARWIN -no-cpp-precomp 
-fno-strict-aliasing -I/usr/local/include',
   optimize='-Os',
   cppflags='-no-cpp-precomp -pipe -fno-common -DPERL_DARWIN -no-cpp-precomp 
-fno-strict-aliasing -I/usr/local/include'
   ccversion='', gccversion='3.3 20030304 (Apple Computer, Inc. build 1435)', 
gccosandvers=''
   intsize=4, longsize=4, ptrsize=4, doublesize=8, byteorder=4321
   d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=8
   ivtype='long', ivsize=4, nvtype='double', nvsize=8, Off_t='off_t', 
lseeksize=8
   alignbytes=8, prototype=define
 Linker and Libraries:
   ld='cc', ldflags =' -flat_namespace -L/usr/local/lib'
   libpth=/usr/local/lib /usr/lib
   libs=-ldb -lc -lm -ldl
   perllibs=-lc -lm -ldl
   libc=/usr/lib/libc.dylib, so=dylib, useshrplib=true, libperl=libperl.dylib
   gnulibc_version=''
 Dynamic Linking:
   dlsrc=dl_dyld.xs, dlext=bundle, d_dlsymun=undef, ccdlflags=' '
   cccdlflags=' ', lddlflags=' -flat_namespace -bundle -undefined suppress 
-L/usr/local/lib'


Characteristics of this binary (from libperl):
 Compile-time options: MULTIPLICITY USE_ITHREADS USE_LARGE_FILES 
PERL_IMPLICIT_CONTEXT
 Built under darwin
 Compiled at Nov 25 2003 18:21:05
 %ENV:
   PERL_LWP_USE_HTTP_10="1"
 @INC:
   /System/Library/Perl/5.8.2/darwin-thread-multi
   /System/Library/Perl/5.8.2
   /Library/Perl/5.8.2/darwin-thread-multi
   /Library/Perl/5.8.2
   /Library/Perl
   /Network/Library/Perl/5.8.2/darwin-thread-multi
   /Network/Library/Perl/5.8.2
   /Network/Library/Perl
   .


3. This is the core dump trace: (if you get a core dump):

 [CORE TRACE COMES HERE]

This report was generated by t/REPORT on Wed Nov 26 23:54:12 2003 GMT.

-------------8<---------- End Bug Report --------------8<----------

Note: Complete the rest of the details and post this bug report to
dev <at> perl.apache.org. To subscribe to the list send an empty
email to dev-subscribe@xxxxxxxxxxxxxxxx