Improve interaction with caches in mod_dav.

* modules/dav/main/mod_dav.c

  (dav_method_get): Check for conditionals.

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

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 71bdaea53d77d77200d96fd2432b22afdf2a4292..59bada16ed0ee5491fecc5e9fd9b0cd7215de681 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -813,6 +813,7 @@ static int dav_method_get(request_rec *r)
 {
     dav_resource *resource;
     dav_error *err;
+    int status;
 
     /* This method should only be called when the resource is not
      * visible to Apache. We will fetch the resource from the repository,
@@ -836,6 +837,12 @@ static int dav_method_get(request_rec *r)
         return dav_handle_err(r, err, NULL);
     }
 
+    /* Handle conditional requests */
+    status = ap_meets_conditions(r);
+    if (status) {
+      return status;
+    }
+
     if (r->header_only) {
         return DONE;
     }