svn commit: r334790 - in head/www/apache24: . files

[Olli Hauer]

Author: ohauer
Date: Sun Nov 24 20:51:20 2013
New Revision: 334790
URL: http://svnweb.freebsd.org/changeset/ports/334790

Log:
  - add patch for apache bug-id 55306
  - bump PORTREVISION
  
  There is an subversion update on the way and we will see the new
  subversion before apache24-2.4.7 so adopt the mod_dav patches
  from upstrem.

Added:
  head/www/apache24/files/patch-bug55306   (contents, props changed)
Modified:
  head/www/apache24/Makefile

Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile	Sun Nov 24 20:36:40 2013	(r334789)
+++ head/www/apache24/Makefile	Sun Nov 24 20:51:20 2013	(r334790)
@@ -2,6 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.6
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}

Added: head/www/apache24/files/patch-bug55306
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/apache24/files/patch-bug55306	Sun Nov 24 20:51:20 2013	(r334790)
@@ -0,0 +1,46 @@
+--- ./modules/dav/main/util.c.orig	2013-11-24 21:27:34.000000000 +0100
++++ ./modules/dav/main/util.c	2013-11-24 21:28:13.000000000 +0100
+@@ -954,13 +954,16 @@
+         /*
+         ** For methods other than LOCK:
+         **
+-        ** If we have no locks, then <seen_locktoken> can be set to true --
++        ** If we have no locks or if the resource is not being modified
++        ** (per RFC 4918 the lock token is not required on resources
++        ** we are not changing), then <seen_locktoken> can be set to true --
+         ** pretending that we've already met the requirement of seeing one
+         ** of the resource's locks in the If: header.
+         **
+         ** Otherwise, it must be cleared and we'll look for one.
+         */
+-        seen_locktoken = (lock_list == NULL);
++        seen_locktoken = (lock_list == NULL
++                          || flags & DAV_VALIDATE_NO_MODIFY);
+     }
+ 
+     /*
+--- ./modules/dav/main/mod_dav.h.orig	2013-11-24 21:28:30.000000000 +0100
++++ ./modules/dav/main/mod_dav.h	2013-11-24 21:29:00.000000000 +0100
+@@ -1297,6 +1297,9 @@
+                                            the 424 DAV:response */
+ #define DAV_VALIDATE_USE_424    0x0080  /* return 424 status, not 207 */
+ #define DAV_VALIDATE_IS_PARENT  0x0100  /* for internal use */
++#define DAV_VALIDATE_NO_MODIFY  0x0200  /* resource is not being modified
++                                           so allow even if lock token
++                                           is not provided */
+ 
+ /* Lock-null related public lock functions */
+ DAV_DECLARE(int) dav_get_resource_state(request_rec *r,
+--- ./modules/dav/main/mod_dav.c.orig	2013-11-24 21:29:13.000000000 +0100
++++ ./modules/dav/main/mod_dav.c	2013-11-24 21:37:17.000000000 +0100
+@@ -2765,7 +2765,9 @@
+      */
+     if ((err = dav_validate_request(r, resource, depth, NULL,
+                                     &multi_response,
+-                                    DAV_VALIDATE_PARENT
++                                    (is_move ? DAV_VALIDATE_PARENT
++                                             : DAV_VALIDATE_RESOURCE
++                                               | DAV_VALIDATE_NO_MODIFY)
+                                     | DAV_VALIDATE_USE_424,
+                                     NULL)) != NULL) {
+         err = dav_push_error(r->pool, err->status, 0,