run DAV's type_checker first so that it can grab the non-GET methods (it

    will pass thru GET for normal processing)
fix the DBGn() macros for Apache 2.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85748 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 4853c4039162b6e57ad1264020ff59dbfdc97994..0b9b45aefc4f3628ff60892e4b4869a8da72e140 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -3220,8 +3220,9 @@ static int dav_type_checker(request_rec *r)
        ** ### this isn't quite right... taking over the response can break
        ** ### things like mod_negotiation. need to look into this some more.
        */
-       if (!conf->handle_get)
+       if (!conf->handle_get) {
            return DECLINED;
+        }
     }
 
     /* ### we should (instead) trap the ones that we DO understand */
@@ -3247,7 +3248,7 @@ static int dav_type_checker(request_rec *r)
 static void register_hooks(void)
 {
     ap_hook_post_config(dav_init_handler, NULL, NULL, AP_HOOK_MIDDLE);
-    ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_MIDDLE);
+    ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_FIRST);
 }
 
 /*---------------------------------------------------------------------------

diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index bbcb93b92da9075daeb56dbab69021f7439b9a8c..746f5a0abdcde700fc559645804c679f0a31116c 100644 (file)
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -91,13 +91,13 @@ typedef int ssize_t;
 #define DAV_DEBUG 1
 #define DEBUG_CR       "\n"
 #define DBG0(f)                ap_log_error(APLOG_MARK, \
-                               APLOG_ERR|APLOG_NOERRNO, NULL, (f))
+                               APLOG_ERR|APLOG_NOERRNO, 0, NULL, (f))
 #define DBG1(f,a1)     ap_log_error(APLOG_MARK, \
-                               APLOG_ERR|APLOG_NOERRNO, NULL, f, a1)
+                               APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1)
 #define DBG2(f,a1,a2)  ap_log_error(APLOG_MARK, \
-                               APLOG_ERR|APLOG_NOERRNO, NULL, f, a1, a2)
+                               APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2)
 #define DBG3(f,a1,a2,a3) ap_log_error(APLOG_MARK, \
-                               APLOG_ERR|APLOG_NOERRNO, NULL, f, a1, a2, a3)
+                              APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2, a3)
 #else
 #undef DAV_DEBUG
 #define DEBUG_CR       ""