You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2021/06/21 16:10:36 UTC
svn commit: r1890943 - in /httpd/httpd/patches/2.4.x:
httpd-2.4-dav-functions2.patch httpd-2.4-dav-functions3.patch
Author: minfrin
Date: Mon Jun 21 16:10:36 2021
New Revision: 1890943
URL: http://svn.apache.org/viewvc?rev=1890943&view=rev
Log:
As a general rule, patches are significantly more available when you check
them in.
Added:
httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch
Added: httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
URL: http://svn.apache.org/viewvc/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch?rev=1890943&view=auto
==============================================================================
--- httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch (added)
+++ httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch Mon Jun 21 16:10:36 2021
@@ -0,0 +1,135 @@
+Index: CHANGES
+===================================================================
+--- CHANGES (revision 1879895)
++++ CHANGES (working copy)
+@@ -1,6 +1,9 @@
+ -*- coding: utf-8 -*-
+ Changes with Apache 2.4.44
+
++ *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
++ dav_get_resource() to mod_dav.h. [Graham Leggett]
++
+ *) mod_http2:
+ Fixes <https://github.com/icing/mod_h2/issues/200>:
+ "LimitRequestFields 0" now disables the limit, as documented.
+Index: include/ap_mmn.h
+===================================================================
+--- include/ap_mmn.h (revision 1879895)
++++ include/ap_mmn.h (working copy)
+@@ -535,6 +535,9 @@
+ * 20120211.91 (2.4.42-dev) Add ap_is_chunked() in httpd.h
+ * 20120211.92 (2.4.42-dev) AP_REG_NO_DEFAULT macro in ap_regex.h
+ * 20120211.93 (2.4.44-dev) Add ap_parse_strict_length()
++ * 20120211.94 (2.4.44-dev) Add dav_get_provider(), dav_open_lockdb(),
++ * dav_close_lockdb() and dav_get_resource() to
++ * mod_dav.h.
+ */
+
+ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
+@@ -542,7 +545,7 @@
+ #ifndef MODULE_MAGIC_NUMBER_MAJOR
+ #define MODULE_MAGIC_NUMBER_MAJOR 20120211
+ #endif
+-#define MODULE_MAGIC_NUMBER_MINOR 93 /* 0...n */
++#define MODULE_MAGIC_NUMBER_MINOR 94 /* 0...n */
+
+ /**
+ * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
+Index: modules/dav/main/mod_dav.c
+===================================================================
+--- modules/dav/main/mod_dav.c (revision 1879895)
++++ modules/dav/main/mod_dav.c (working copy)
+@@ -207,7 +207,7 @@
+ return conf ? conf->provider_name : NULL;
+ }
+
+-static const dav_provider *dav_get_provider(request_rec *r)
++DAV_DECLARE(const dav_provider *) dav_get_provider(request_rec *r)
+ {
+ dav_dir_conf *conf;
+
+@@ -726,7 +726,7 @@
+ * the resource identified by the DAV:checked-in property of the resource
+ * identified by the Request-URI.
+ */
+-static dav_error *dav_get_resource(request_rec *r, int label_allowed,
++DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
+ int use_checked_in, dav_resource **res_p)
+ {
+ dav_dir_conf *conf;
+@@ -775,7 +775,9 @@
+ return NULL;
+ }
+
+-static dav_error * dav_open_lockdb(request_rec *r, int ro, dav_lockdb **lockdb)
++DAV_DECLARE(dav_error *) dav_open_lockdb(request_rec *r,
++ int ro,
++ dav_lockdb **lockdb)
+ {
+ const dav_hooks_locks *hooks = DAV_GET_HOOKS_LOCKS(r);
+
+@@ -788,6 +790,11 @@
+ return (*hooks->open_lockdb)(r, ro, 0, lockdb);
+ }
+
++DAV_DECLARE(void) dav_close_lockdb(dav_lockdb *lockdb)
++{
++ (lockdb->hooks->close_lockdb)(lockdb);
++}
++
+ /**
+ * @return 1 if valid content-range,
+ * 0 if no content-range,
+Index: modules/dav/main/mod_dav.h
+===================================================================
+--- modules/dav/main/mod_dav.h (revision 1879895)
++++ modules/dav/main/mod_dav.h (working copy)
+@@ -50,7 +50,7 @@
+
+ #define DAV_READ_BLOCKSIZE 2048 /* used for reading input blocks */
+
+-#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>"
++#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n<html>\n<head>\n<title>"
+ #define DAV_RESPONSE_BODY_2 "</title>\n</head><body>\n<h1>"
+ #define DAV_RESPONSE_BODY_3 "</h1>\n<p>"
+ #define DAV_RESPONSE_BODY_4 "</p>\n"
+@@ -427,7 +427,10 @@
+ */
+ typedef struct dav_locktoken dav_locktoken;
+
++DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
++ int use_checked_in, dav_resource **res_p);
+
++
+ /* --------------------------------------------------------------------
+ **
+ ** BUFFER HANDLING
+@@ -721,6 +724,7 @@
+ const dav_provider *hooks);
+ DAV_DECLARE(const dav_provider *) dav_lookup_provider(const char *name);
+ DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r);
++DAV_DECLARE(const dav_provider *) dav_get_provider(request_rec *r);
+
+
+ /* ### deprecated */
+@@ -1314,6 +1318,10 @@
+ dav_buffer *pbuf);
+
+ /* LockDB-related public lock functions */
++DAV_DECLARE(dav_error *) dav_open_lockdb(request_rec *r,
++ int ro,
++ dav_lockdb **lockdb);
++DAV_DECLARE(void) dav_close_lockdb(dav_lockdb *lockdb);
+ DAV_DECLARE(dav_error *) dav_lock_parse_lockinfo(request_rec *r,
+ const dav_resource *resrouce,
+ dav_lockdb *lockdb,
+Index: .
+===================================================================
+--- . (revision 1879895)
++++ . (working copy)
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+ Merged /httpd/httpd/trunk:r1879305,1879466
Added: httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch
URL: http://svn.apache.org/viewvc/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch?rev=1890943&view=auto
==============================================================================
--- httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch (added)
+++ httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions3.patch Mon Jun 21 16:10:36 2021
@@ -0,0 +1,125 @@
+Index: CHANGES
+===================================================================
+--- CHANGES (revision 1890942)
++++ CHANGES (working copy)
+@@ -1,6 +1,9 @@
+ -*- coding: utf-8 -*-
+ Changes with Apache 2.4.49
+
++ *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
++ dav_get_resource() to mod_dav.h. [Graham Leggett]
++
+ *) core: Split ap_create_request() from ap_read_request(). [Graham Leggett]
+
+ *) core, h2: common ap_parse_request_line() and ap_check_request_header()
+Index: include/ap_mmn.h
+===================================================================
+--- include/ap_mmn.h (revision 1890942)
++++ include/ap_mmn.h (working copy)
+@@ -562,6 +562,9 @@
+ * 20120211.106 (2.4.49-dev) Add ap_create_request().
+ * 20120211.107 (2.4.49-dev) Add ap_parse_request_line() and
+ * ap_check_request_header()
++ * 20120211.108 (2.4.44-dev) Add dav_get_provider(), dav_open_lockdb(),
++ * dav_close_lockdb() and dav_get_resource() to
++ * mod_dav.h.
+ */
+
+ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
+@@ -569,7 +572,7 @@
+ #ifndef MODULE_MAGIC_NUMBER_MAJOR
+ #define MODULE_MAGIC_NUMBER_MAJOR 20120211
+ #endif
+-#define MODULE_MAGIC_NUMBER_MINOR 107 /* 0...n */
++#define MODULE_MAGIC_NUMBER_MINOR 108 /* 0...n */
+
+ /**
+ * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
+Index: modules/dav/main/mod_dav.c
+===================================================================
+--- modules/dav/main/mod_dav.c (revision 1890942)
++++ modules/dav/main/mod_dav.c (working copy)
+@@ -207,7 +207,7 @@
+ return conf ? conf->provider_name : NULL;
+ }
+
+-static const dav_provider *dav_get_provider(request_rec *r)
++DAV_DECLARE(const dav_provider *) dav_get_provider(request_rec *r)
+ {
+ dav_dir_conf *conf;
+
+@@ -726,7 +726,7 @@
+ * the resource identified by the DAV:checked-in property of the resource
+ * identified by the Request-URI.
+ */
+-static dav_error *dav_get_resource(request_rec *r, int label_allowed,
++DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
+ int use_checked_in, dav_resource **res_p)
+ {
+ dav_dir_conf *conf;
+@@ -775,7 +775,9 @@
+ return NULL;
+ }
+
+-static dav_error * dav_open_lockdb(request_rec *r, int ro, dav_lockdb **lockdb)
++DAV_DECLARE(dav_error *) dav_open_lockdb(request_rec *r,
++ int ro,
++ dav_lockdb **lockdb)
+ {
+ const dav_hooks_locks *hooks = DAV_GET_HOOKS_LOCKS(r);
+
+@@ -788,6 +790,11 @@
+ return (*hooks->open_lockdb)(r, ro, 0, lockdb);
+ }
+
++DAV_DECLARE(void) dav_close_lockdb(dav_lockdb *lockdb)
++{
++ (lockdb->hooks->close_lockdb)(lockdb);
++}
++
+ /**
+ * @return 1 if valid content-range,
+ * 0 if no content-range,
+Index: modules/dav/main/mod_dav.h
+===================================================================
+--- modules/dav/main/mod_dav.h (revision 1890942)
++++ modules/dav/main/mod_dav.h (working copy)
+@@ -50,7 +50,7 @@
+
+ #define DAV_READ_BLOCKSIZE 2048 /* used for reading input blocks */
+
+-#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>"
++#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n<html>\n<head>\n<title>"
+ #define DAV_RESPONSE_BODY_2 "</title>\n</head><body>\n<h1>"
+ #define DAV_RESPONSE_BODY_3 "</h1>\n<p>"
+ #define DAV_RESPONSE_BODY_4 "</p>\n"
+@@ -427,7 +427,10 @@
+ */
+ typedef struct dav_locktoken dav_locktoken;
+
++DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
++ int use_checked_in, dav_resource **res_p);
+
++
+ /* --------------------------------------------------------------------
+ **
+ ** BUFFER HANDLING
+@@ -721,6 +724,7 @@
+ const dav_provider *hooks);
+ DAV_DECLARE(const dav_provider *) dav_lookup_provider(const char *name);
+ DAV_DECLARE(const char *) dav_get_provider_name(request_rec *r);
++DAV_DECLARE(const dav_provider *) dav_get_provider(request_rec *r);
+
+
+ /* ### deprecated */
+@@ -1314,6 +1318,10 @@
+ dav_buffer *pbuf);
+
+ /* LockDB-related public lock functions */
++DAV_DECLARE(dav_error *) dav_open_lockdb(request_rec *r,
++ int ro,
++ dav_lockdb **lockdb);
++DAV_DECLARE(void) dav_close_lockdb(dav_lockdb *lockdb);
+ DAV_DECLARE(dav_error *) dav_lock_parse_lockinfo(request_rec *r,
+ const dav_resource *resrouce,
+ dav_lockdb *lockdb,