Re: mod_svn 1.7.3 fails to build apache 2.4.1

Mario Brandt wrote on Wed, Feb 22, 2012 at 19:32:03 +0100:
> Hi Daniel,
> > (At the time of this writing, httpd-2.4.1 is not blessed as GA.)
>
> It was, but the announcement was out that time. However not it is released ;-)
>

It wasn't on the download page yet. I'm not going to split hairs as to
whether or not that constitutes GA.

>
>
> > Are you sure your compiler's include path (-I flags) is correct, and not
> > picking up any httpd-2.x headers?
>
> I'm sure I picked up the right headers. The configure.js does a good
> job on windows.

What's configure.js?

> C:\python27\python gen-make.py -t vcproj --vsnet-version=2008
> --with-httpd=C:\build\httpd-2.4.1-x86
> --with-openssl=C:\build\httpd-2.4.1-x86\srclib\openssl
> --with-zlib=C:\build\subversion-1.7.3-ap24-x86\zlib
> --with-apr=C:\build\httpd-2.4.1-x86\srclib\apr
>
> > I tried building with 2.3.16-beta a few weeks ago and it worked.

I also tried 2.4.1 yesterday, built and tests passed.

> I know it is a bit wired, since I also compiled all versions of apache
> before with svn without any issue.
>
> Well, I added a patch making it work.
>

Please use text/* MIME type for patches.

>
> Cheers
> Mario

> --- subversion/mod_dav_svn/util.c.orig 2012-02-19 15:57:10.245000000 -0800
> +++ subversion/mod_dav_svn/util.c 2012-02-19 16:10:39.726000000 -0800
> @@ -627,8 +627,8 @@
> if (errscan->desc == NULL)
> continue;
>
> - if (errscan->save_errno != 0) {
> - errno = errscan->save_errno;
> + if (errscan->aprerr != 0) {
> + errno = errscan->aprerr;

That's a wrong change -- it will break the build against 2.2.

Current trunk uses this:

    #if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
            status = errscan->aprerr;
    #else
            status = errscan->save_errno;
    #endif

I'd be happy to backport the revisions implementing this change, and any
other AP_MODULE_MAGIC_AT_LEAST() necessary for 2.4.1, to the 1.7.x
branch. Could you come up with a list of revisions to backport from
trunk to 1.7.4 that addresses your issue?

Thanks --

Daniel

> ap_log_rerror(APLOG_MARK, level, errno, r, "%s [%d, #%d]",
> errscan->desc, errscan->status, errscan->error_id);
> }
Received on 2012-02-22 19:45:35 CET