Re: svn commit: r1497101 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS modules/dav/main/mod_dav.c

[William A. Rowe Jr.]

On Thu, 27 Jun 2013 07:13:09 +0200
Rainer Jung rainer.j...@kippdata.de wrote:

  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=1497101r1=1497100r2=1497101view=diff
  +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 :(

Aught to have distrusted svn merge to just 'do the right thing' :)

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

I think so - but here's a +1 to your fix commit if anyone is counting.

Re: svn commit: r1497101 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS modules/dav/main/mod_dav.c

[Rainer Jung]

On 26.06.2013 23:16, wr...@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=1497101r1=1497100r2=1497101view=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