diff options
Diffstat (limited to 'www/apache22/files')
| -rw-r--r-- | www/apache22/files/README_modules.d | 14 | ||||
| -rw-r--r-- | www/apache22/files/patch-bug-55306 | 50 | ||||
| -rw-r--r-- | www/apache22/files/patch-docs__conf__httpd.conf.in | 10 |
3 files changed, 24 insertions, 50 deletions
diff --git a/www/apache22/files/README_modules.d b/www/apache22/files/README_modules.d new file mode 100644 index 000000000000..2d50ce539aeb --- /dev/null +++ b/www/apache22/files/README_modules.d @@ -0,0 +1,14 @@ +# =================================================== +# Directory for third party module config files. +# +# Modules can be disabled by adding a '#' in front +# of the "LoadModule" line e.g. "#LoadModule" +# +# Files are automatically included if the name +# begins with a three digit number followed by '_' +# and ending in '.conf' e.g. '080_mod_php.conf' +# +# Maintainers can also include instructions how to +# use the module (instead pkg-message). +# + diff --git a/www/apache22/files/patch-bug-55306 b/www/apache22/files/patch-bug-55306 deleted file mode 100644 index 22ec8f55b105..000000000000 --- a/www/apache22/files/patch-bug-55306 +++ /dev/null @@ -1,50 +0,0 @@ -PR: ports/183685 -[1] http://svn.apache.org/viewvc?view=revision&revision=1528718 -[2] https://issues.apache.org/bugzilla/show_bug.cgi?id=55306 -=========================================================================== ---- modules/dav/main/mod_dav.c.orig 2013-06-27 18:54:14.000000000 +0200 -+++ modules/dav/main/mod_dav.c 2013-11-05 16:31:51.000000000 +0100 -@@ -2733,7 +2733,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, ---- modules/dav/main/mod_dav.h.orig 2013/10/03 05:06:08 1528717 -+++ modules/dav/main/mod_dav.h 2013/10/03 05:29:35 1528718 -@@ -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/util.c.orig 2013/10/03 05:06:08 1528717 -+++ modules/dav/main/util.c 2013/10/03 05:29:35 1528718 -@@ -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); - } - - /* diff --git a/www/apache22/files/patch-docs__conf__httpd.conf.in b/www/apache22/files/patch-docs__conf__httpd.conf.in index e53d974aa7c0..0ab0dbe6aae3 100644 --- a/www/apache22/files/patch-docs__conf__httpd.conf.in +++ b/www/apache22/files/patch-docs__conf__httpd.conf.in @@ -1,5 +1,15 @@ --- ./docs/conf/httpd.conf.in.orig 2007-12-21 06:43:00.000000000 -0500 +++ ./docs/conf/httpd.conf.in 2010-05-06 19:37:54.224731824 -0400 +@@ -54,6 +54,9 @@ + # + @@LoadModule@@ + ++# Third party modules ++Include @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf ++ + <IfModule !mpm_netware_module> + <IfModule !mpm_winnt_module> + # @@ -63,8 +63,8 @@ # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. |