httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: svn commit: r1497101 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS modules/dav/main/mod_dav.c
Date Thu, 27 Jun 2013 05:13:09 GMT
On 26.06.2013 23:16, wrowe@apache.org wrote:
> Author: wrowe
> Date: Wed Jun 26 21:16:53 2013
> New Revision: 1497101
> 
> URL: http://svn.apache.org/r1497101
> Log:
> mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
> the source href (sent as part of the request body as XML) pointing to a
> URI that is not configured for DAV will trigger a segfault.
> 
> Backports: r1485668
> Reviewed by: minfrin, trawick, wrowe
> Submitted by: Ben Reser <ben reser.org>
> 
> 
> Modified:
>     httpd/httpd/branches/2.2.x/   (props changed)
>     httpd/httpd/branches/2.2.x/CHANGES
>     httpd/httpd/branches/2.2.x/STATUS
>     httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c
> 
> Propchange: httpd/httpd/branches/2.2.x/
> ------------------------------------------------------------------------------
>   Merged /httpd/httpd/trunk:r1485668
> 

> 
> Modified: httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c?rev=1497101&r1=1497100&r2=1497101&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c (original)
> +++ httpd/httpd/branches/2.2.x/modules/dav/main/mod_dav.c Wed Jun 26 21:16:53 2013
> @@ -719,6 +719,12 @@ static dav_error *dav_get_resource(reque
>  
>      conf = ap_get_module_config(r->per_dir_config, &dav_module);
>      /* assert: conf->provider != NULL */
> +    if (conf->provider == NULL) {
> +        return dav_new_error(r->pool, HTTP_METHOD_NOT_ALLOWED, 0, 0,
> +                             apr_psprintf(r->pool,
> +				          "DAV not enabled for %s",
> +					  ap_escape_html(r->pool, r->uri)));
> +    }

This hunk doesn't compile :(

I fixed it in r1497212 instead of reverting, because the fix is obvious
and trivial. Hope that's OK as a CTR exception.

Regards,

Rainer


Mime
View raw message