Mercurial > hg > nginx
annotate src/http/modules/ngx_http_dav_module.c @ 3032:524ba56ba9f7
fix copy destination name length, introduced in r3025
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 20 Aug 2009 13:37:26 +0000 |
| parents | 8101d9101ed8 |
| children | d430c6ab1c99 |
| rev | line source |
|---|---|
| 633 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 | |
| 1116 | 12 #define NGX_HTTP_DAV_COPY_BLOCK 65536 |
| 13 | |
| 14 #define NGX_HTTP_DAV_OFF 2 | |
| 15 | |
| 16 | |
| 17 #define NGX_HTTP_DAV_NO_DEPTH -3 | |
| 18 #define NGX_HTTP_DAV_INVALID_DEPTH -2 | |
| 19 #define NGX_HTTP_DAV_INFINITY_DEPTH -1 | |
| 20 | |
| 633 | 21 |
| 22 typedef struct { | |
| 23 ngx_uint_t methods; | |
| 1816 | 24 ngx_uint_t access; |
| 25 ngx_uint_t min_delete_depth; | |
| 637 | 26 ngx_flag_t create_full_put_path; |
| 633 | 27 } ngx_http_dav_loc_conf_t; |
| 28 | |
| 29 | |
| 1116 | 30 typedef struct { |
| 31 ngx_str_t path; | |
| 32 size_t len; | |
| 33 } ngx_http_dav_copy_ctx_t; | |
| 34 | |
| 35 | |
| 633 | 36 static ngx_int_t ngx_http_dav_handler(ngx_http_request_t *r); |
| 1116 | 37 |
| 38 static void ngx_http_dav_put_handler(ngx_http_request_t *r); | |
| 39 | |
| 40 static ngx_int_t ngx_http_dav_delete_handler(ngx_http_request_t *r); | |
| 1820 | 41 static ngx_int_t ngx_http_dav_delete_path(ngx_http_request_t *r, |
| 42 ngx_str_t *path, ngx_uint_t dir); | |
| 957 | 43 static ngx_int_t ngx_http_dav_delete_dir(ngx_tree_ctx_t *ctx, ngx_str_t *path); |
| 44 static ngx_int_t ngx_http_dav_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path); | |
| 1820 | 45 static ngx_int_t ngx_http_dav_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path); |
| 1116 | 46 |
| 47 static ngx_int_t ngx_http_dav_mkcol_handler(ngx_http_request_t *r, | |
| 48 ngx_http_dav_loc_conf_t *dlcf); | |
| 49 | |
| 50 static ngx_int_t ngx_http_dav_copy_move_handler(ngx_http_request_t *r); | |
| 51 static ngx_int_t ngx_http_dav_copy_dir(ngx_tree_ctx_t *ctx, ngx_str_t *path); | |
| 52 static ngx_int_t ngx_http_dav_copy_dir_time(ngx_tree_ctx_t *ctx, | |
| 53 ngx_str_t *path); | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
54 static ngx_int_t ngx_http_dav_copy_tree_file(ngx_tree_ctx_t *ctx, |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
55 ngx_str_t *path); |
| 1116 | 56 |
| 57 static ngx_int_t ngx_http_dav_depth(ngx_http_request_t *r, ngx_int_t dflt); | |
| 58 static ngx_int_t ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, | |
| 637 | 59 ngx_int_t not_found, char *failed, u_char *path); |
| 60 static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r, u_char *path); | |
| 633 | 61 static void *ngx_http_dav_create_loc_conf(ngx_conf_t *cf); |
| 62 static char *ngx_http_dav_merge_loc_conf(ngx_conf_t *cf, | |
| 63 void *parent, void *child); | |
| 681 | 64 static ngx_int_t ngx_http_dav_init(ngx_conf_t *cf); |
| 633 | 65 |
| 66 | |
| 67 static ngx_conf_bitmask_t ngx_http_dav_methods_mask[] = { | |
| 68 { ngx_string("off"), NGX_HTTP_DAV_OFF }, | |
| 69 { ngx_string("put"), NGX_HTTP_PUT }, | |
| 70 { ngx_string("delete"), NGX_HTTP_DELETE }, | |
| 637 | 71 { ngx_string("mkcol"), NGX_HTTP_MKCOL }, |
| 1116 | 72 { ngx_string("copy"), NGX_HTTP_COPY }, |
| 73 { ngx_string("move"), NGX_HTTP_MOVE }, | |
| 633 | 74 { ngx_null_string, 0 } |
| 75 }; | |
| 76 | |
| 77 | |
| 78 static ngx_command_t ngx_http_dav_commands[] = { | |
| 79 | |
| 80 { ngx_string("dav_methods"), | |
| 81 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 82 ngx_conf_set_bitmask_slot, | |
| 83 NGX_HTTP_LOC_CONF_OFFSET, | |
| 84 offsetof(ngx_http_dav_loc_conf_t, methods), | |
| 85 &ngx_http_dav_methods_mask }, | |
| 86 | |
| 637 | 87 { ngx_string("create_full_put_path"), |
| 88 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 89 ngx_conf_set_flag_slot, | |
| 90 NGX_HTTP_LOC_CONF_OFFSET, | |
| 91 offsetof(ngx_http_dav_loc_conf_t, create_full_put_path), | |
| 92 NULL }, | |
| 93 | |
| 1816 | 94 { ngx_string("min_delete_depth"), |
| 95 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 96 ngx_conf_set_num_slot, | |
| 97 NGX_HTTP_LOC_CONF_OFFSET, | |
| 98 offsetof(ngx_http_dav_loc_conf_t, min_delete_depth), | |
| 99 NULL }, | |
| 100 | |
| 669 | 101 { ngx_string("dav_access"), |
| 675 | 102 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, |
|
1296
9fcfca54b208
dav_access uses ngx_conf_set_access_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
1289
diff
changeset
|
103 ngx_conf_set_access_slot, |
| 669 | 104 NGX_HTTP_LOC_CONF_OFFSET, |
|
1296
9fcfca54b208
dav_access uses ngx_conf_set_access_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
1289
diff
changeset
|
105 offsetof(ngx_http_dav_loc_conf_t, access), |
| 669 | 106 NULL }, |
| 107 | |
| 633 | 108 ngx_null_command |
| 109 }; | |
| 110 | |
| 111 | |
| 667 | 112 static ngx_http_module_t ngx_http_dav_module_ctx = { |
| 633 | 113 NULL, /* preconfiguration */ |
| 681 | 114 ngx_http_dav_init, /* postconfiguration */ |
| 633 | 115 |
| 116 NULL, /* create main configuration */ | |
| 117 NULL, /* init main configuration */ | |
| 118 | |
| 119 NULL, /* create server configuration */ | |
| 120 NULL, /* merge server configuration */ | |
| 121 | |
| 122 ngx_http_dav_create_loc_conf, /* create location configuration */ | |
| 123 ngx_http_dav_merge_loc_conf /* merge location configuration */ | |
| 124 }; | |
| 125 | |
| 126 | |
| 127 ngx_module_t ngx_http_dav_module = { | |
| 128 NGX_MODULE_V1, | |
| 129 &ngx_http_dav_module_ctx, /* module context */ | |
| 130 ngx_http_dav_commands, /* module directives */ | |
| 131 NGX_HTTP_MODULE, /* module type */ | |
| 132 NULL, /* init master */ | |
| 681 | 133 NULL, /* init module */ |
| 633 | 134 NULL, /* init process */ |
| 135 NULL, /* init thread */ | |
| 136 NULL, /* exit thread */ | |
| 137 NULL, /* exit process */ | |
| 138 NULL, /* exit master */ | |
| 139 NGX_MODULE_V1_PADDING | |
| 140 }; | |
| 141 | |
| 142 | |
| 143 static ngx_int_t | |
| 144 ngx_http_dav_handler(ngx_http_request_t *r) | |
| 145 { | |
| 146 ngx_int_t rc; | |
| 147 ngx_http_dav_loc_conf_t *dlcf; | |
| 148 | |
| 149 if (r->zero_in_uri) { | |
| 150 return NGX_DECLINED; | |
| 151 } | |
| 152 | |
| 153 dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); | |
| 154 | |
| 155 if (!(r->method & dlcf->methods)) { | |
| 156 return NGX_DECLINED; | |
| 157 } | |
| 158 | |
| 159 switch (r->method) { | |
| 160 | |
| 161 case NGX_HTTP_PUT: | |
| 162 | |
| 163 if (r->uri.data[r->uri.len - 1] == '/') { | |
|
1813
d3f80e0be8fa
change status code and add log message
Igor Sysoev <igor@sysoev.ru>
parents:
1804
diff
changeset
|
164 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
d3f80e0be8fa
change status code and add log message
Igor Sysoev <igor@sysoev.ru>
parents:
1804
diff
changeset
|
165 "can not PUT to a collection"); |
|
d3f80e0be8fa
change status code and add log message
Igor Sysoev <igor@sysoev.ru>
parents:
1804
diff
changeset
|
166 return NGX_HTTP_CONFLICT; |
| 633 | 167 } |
| 168 | |
| 169 r->request_body_in_file_only = 1; | |
| 170 r->request_body_in_persistent_file = 1; | |
|
1075
4d203f76b757
undo "client_body_in_file_only any"
Igor Sysoev <igor@sysoev.ru>
parents:
1060
diff
changeset
|
171 r->request_body_in_clean_file = 1; |
| 633 | 172 r->request_body_file_group_access = 1; |
| 637 | 173 r->request_body_file_log_level = 0; |
| 633 | 174 |
| 175 rc = ngx_http_read_client_request_body(r, ngx_http_dav_put_handler); | |
| 176 | |
| 177 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { | |
| 178 return rc; | |
| 179 } | |
| 180 | |
| 181 return NGX_DONE; | |
| 182 | |
| 183 case NGX_HTTP_DELETE: | |
| 184 | |
| 1116 | 185 return ngx_http_dav_delete_handler(r); |
| 637 | 186 |
| 187 case NGX_HTTP_MKCOL: | |
| 188 | |
| 1116 | 189 return ngx_http_dav_mkcol_handler(r, dlcf); |
| 637 | 190 |
| 1116 | 191 case NGX_HTTP_COPY: |
| 637 | 192 |
| 1116 | 193 return ngx_http_dav_copy_move_handler(r); |
| 637 | 194 |
| 1116 | 195 case NGX_HTTP_MOVE: |
| 637 | 196 |
| 1116 | 197 return ngx_http_dav_copy_move_handler(r); |
| 633 | 198 } |
| 199 | |
| 200 return NGX_DECLINED; | |
| 201 } | |
| 202 | |
| 203 | |
| 204 static void | |
| 205 ngx_http_dav_put_handler(ngx_http_request_t *r) | |
| 206 { | |
| 773 | 207 size_t root; |
| 681 | 208 time_t date; |
| 637 | 209 ngx_str_t *temp, path; |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
210 ngx_uint_t status; |
| 637 | 211 ngx_file_info_t fi; |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
212 ngx_ext_rename_file_t ext; |
| 637 | 213 ngx_http_dav_loc_conf_t *dlcf; |
| 633 | 214 |
| 773 | 215 ngx_http_map_uri_to_path(r, &path, &root, 0); |
| 633 | 216 |
|
3032
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
217 path.len--; |
|
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
218 |
| 633 | 219 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 220 "http put filename: \"%s\"", path.data); | |
| 221 | |
| 222 temp = &r->request_body->temp_file->file.name; | |
| 223 | |
|
2782
4bd7825fab80
uniform ngx_file_info() interface with ngx_fd_info()
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
224 if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) { |
| 633 | 225 status = NGX_HTTP_CREATED; |
| 226 | |
| 227 } else { | |
| 228 status = NGX_HTTP_NO_CONTENT; | |
| 663 | 229 |
| 230 if (ngx_is_dir(&fi)) { | |
| 231 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_EISDIR, | |
| 232 "\"%s\" could not be created", path.data); | |
| 633 | 233 |
| 663 | 234 if (ngx_delete_file(temp->data) == NGX_FILE_ERROR) { |
| 235 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, | |
| 236 ngx_delete_file_n " \"%s\" failed", | |
| 237 temp->data); | |
| 238 } | |
| 239 | |
| 240 ngx_http_finalize_request(r, NGX_HTTP_CONFLICT); | |
| 241 return; | |
| 661 | 242 } |
| 637 | 243 } |
| 244 | |
| 669 | 245 dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); |
| 246 | |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
247 ext.access = dlcf->access; |
|
2394
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
248 ext.path_access = dlcf->access; |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
249 ext.time = -1; |
|
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
250 ext.create_path = dlcf->create_full_put_path; |
| 1909 | 251 ext.delete_file = 1; |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
252 ext.log = r->connection->log; |
| 669 | 253 |
| 681 | 254 if (r->headers_in.date) { |
| 255 date = ngx_http_parse_time(r->headers_in.date->value.data, | |
| 256 r->headers_in.date->value.len); | |
| 257 | |
| 258 if (date != NGX_ERROR) { | |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
259 ext.time = date; |
|
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
260 ext.fd = r->request_body->temp_file->file.fd; |
| 681 | 261 } |
| 262 } | |
| 263 | |
|
1828
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
264 if (ngx_ext_rename_file(temp, &path, &ext) != NGX_OK) { |
|
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
265 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
1f3c2b6607e0
use ngx_ext_rename_file() in PUT
Igor Sysoev <igor@sysoev.ru>
parents:
1825
diff
changeset
|
266 return; |
| 637 | 267 } |
| 268 | |
| 633 | 269 if (status == NGX_HTTP_CREATED) { |
| 637 | 270 if (ngx_http_dav_location(r, path.data) != NGX_OK) { |
| 633 | 271 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 272 return; | |
| 273 } | |
| 639 | 274 |
| 275 r->headers_out.content_length_n = 0; | |
| 633 | 276 } |
| 277 | |
| 278 r->headers_out.status = status; | |
| 279 r->header_only = 1; | |
| 280 | |
| 281 ngx_http_finalize_request(r, ngx_http_send_header(r)); | |
| 282 return; | |
| 283 } | |
| 284 | |
| 285 | |
| 637 | 286 static ngx_int_t |
| 1116 | 287 ngx_http_dav_delete_handler(ngx_http_request_t *r) |
| 288 { | |
| 1816 | 289 size_t root; |
| 290 ngx_err_t err; | |
| 291 ngx_int_t rc, depth; | |
| 292 ngx_uint_t i, d, dir; | |
| 293 ngx_str_t path; | |
| 294 ngx_file_info_t fi; | |
| 295 ngx_http_dav_loc_conf_t *dlcf; | |
| 1116 | 296 |
| 297 if (r->headers_in.content_length_n > 0) { | |
| 1815 | 298 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 299 "DELETE with body is unsupported"); | |
| 1116 | 300 return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; |
| 301 } | |
| 302 | |
| 1816 | 303 dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); |
| 304 | |
| 305 if (dlcf->min_delete_depth) { | |
| 306 d = 0; | |
| 307 | |
| 308 for (i = 0; i < r->uri.len; /* void */) { | |
| 309 if (r->uri.data[i++] == '/') { | |
| 310 if (++d >= dlcf->min_delete_depth && i < r->uri.len) { | |
| 311 goto ok; | |
| 312 } | |
| 313 } | |
| 314 } | |
| 315 | |
| 316 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 317 "insufficient URI depth:%i to DELETE", d); | |
| 318 return NGX_HTTP_CONFLICT; | |
| 319 } | |
| 320 | |
| 321 ok: | |
| 322 | |
| 1116 | 323 ngx_http_map_uri_to_path(r, &path, &root, 0); |
| 324 | |
| 325 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 326 "http delete filename: \"%s\"", path.data); | |
| 327 | |
|
2782
4bd7825fab80
uniform ngx_file_info() interface with ngx_fd_info()
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
328 if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) { |
| 1815 | 329 err = ngx_errno; |
| 330 | |
| 331 rc = (err == NGX_ENOTDIR) ? NGX_HTTP_CONFLICT : NGX_HTTP_NOT_FOUND; | |
| 332 | |
| 333 return ngx_http_dav_error(r->connection->log, err, | |
| 334 rc, ngx_file_info_n, path.data); | |
| 1116 | 335 } |
| 336 | |
| 337 if (ngx_is_dir(&fi)) { | |
| 338 | |
| 339 if (r->uri.data[r->uri.len - 1] != '/') { | |
| 1815 | 340 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_EISDIR, |
| 341 "DELETE \"%s\" failed", path.data); | |
| 342 return NGX_HTTP_CONFLICT; | |
| 1116 | 343 } |
| 344 | |
| 345 depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH); | |
| 346 | |
| 347 if (depth != NGX_HTTP_DAV_INFINITY_DEPTH) { | |
| 1815 | 348 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 349 "\"Depth\" header must be infinity"); | |
| 1116 | 350 return NGX_HTTP_BAD_REQUEST; |
| 351 } | |
| 352 | |
| 353 path.len -= 2; /* omit "/\0" */ | |
| 354 | |
| 355 dir = 1; | |
| 356 | |
| 357 } else { | |
| 358 | |
| 1823 | 359 /* |
| 360 * we do not need to test (r->uri.data[r->uri.len - 1] == '/') | |
| 1831 | 361 * because ngx_file_info("/file/") returned NGX_ENOTDIR above |
| 1823 | 362 */ |
| 363 | |
| 1116 | 364 depth = ngx_http_dav_depth(r, 0); |
| 365 | |
| 366 if (depth != 0 && depth != NGX_HTTP_DAV_INFINITY_DEPTH) { | |
| 1815 | 367 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 368 "\"Depth\" header must be 0 or infinity"); | |
| 1116 | 369 return NGX_HTTP_BAD_REQUEST; |
| 370 } | |
| 371 | |
| 372 dir = 0; | |
| 373 } | |
| 374 | |
| 375 rc = ngx_http_dav_delete_path(r, &path, dir); | |
| 376 | |
| 377 if (rc == NGX_OK) { | |
| 378 return NGX_HTTP_NO_CONTENT; | |
| 379 } | |
| 380 | |
| 381 return rc; | |
| 382 } | |
| 383 | |
| 384 | |
| 385 static ngx_int_t | |
| 1820 | 386 ngx_http_dav_delete_path(ngx_http_request_t *r, ngx_str_t *path, ngx_uint_t dir) |
| 1116 | 387 { |
| 1820 | 388 char *failed; |
| 389 ngx_tree_ctx_t tree; | |
| 390 | |
| 391 if (dir) { | |
| 392 | |
| 393 tree.init_handler = NULL; | |
| 394 tree.file_handler = ngx_http_dav_delete_file; | |
| 395 tree.pre_tree_handler = ngx_http_dav_noop; | |
| 396 tree.post_tree_handler = ngx_http_dav_delete_dir; | |
| 397 tree.spec_handler = ngx_http_dav_delete_file; | |
| 398 tree.data = NULL; | |
| 399 tree.alloc = 0; | |
| 400 tree.log = r->connection->log; | |
| 401 | |
| 402 /* TODO: 207 */ | |
| 403 | |
| 404 if (ngx_walk_tree(&tree, path) != NGX_OK) { | |
| 405 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 406 } | |
| 407 | |
| 408 if (ngx_delete_dir(path->data) != NGX_FILE_ERROR) { | |
| 409 return NGX_OK; | |
| 410 } | |
| 411 | |
| 412 failed = ngx_delete_dir_n; | |
| 413 | |
| 414 } else { | |
| 415 | |
| 416 if (ngx_delete_file(path->data) != NGX_FILE_ERROR) { | |
| 417 return NGX_OK; | |
| 418 } | |
| 419 | |
| 420 failed = ngx_delete_file_n; | |
| 421 } | |
| 422 | |
| 423 return ngx_http_dav_error(r->connection->log, ngx_errno, | |
| 424 NGX_HTTP_NOT_FOUND, failed, path->data); | |
| 1116 | 425 } |
| 426 | |
| 427 | |
| 428 static ngx_int_t | |
| 429 ngx_http_dav_delete_dir(ngx_tree_ctx_t *ctx, ngx_str_t *path) | |
| 430 { | |
| 431 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 432 "http delete dir: \"%s\"", path->data); | |
| 433 | |
| 434 if (ngx_delete_dir(path->data) == NGX_FILE_ERROR) { | |
| 435 | |
| 436 /* TODO: add to 207 */ | |
| 437 | |
| 438 (void) ngx_http_dav_error(ctx->log, ngx_errno, 0, ngx_delete_dir_n, | |
| 439 path->data); | |
| 440 } | |
| 441 | |
| 442 return NGX_OK; | |
| 443 } | |
| 444 | |
| 445 | |
| 446 static ngx_int_t | |
| 447 ngx_http_dav_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path) | |
| 448 { | |
| 449 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 450 "http delete file: \"%s\"", path->data); | |
| 451 | |
| 452 if (ngx_delete_file(path->data) == NGX_FILE_ERROR) { | |
| 453 | |
| 454 /* TODO: add to 207 */ | |
| 455 | |
| 456 (void) ngx_http_dav_error(ctx->log, ngx_errno, 0, ngx_delete_file_n, | |
| 457 path->data); | |
| 458 } | |
| 459 | |
| 460 return NGX_OK; | |
| 461 } | |
| 462 | |
| 463 | |
| 464 static ngx_int_t | |
| 1820 | 465 ngx_http_dav_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path) |
| 466 { | |
| 467 return NGX_OK; | |
| 468 } | |
| 469 | |
| 470 | |
| 471 static ngx_int_t | |
| 1116 | 472 ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf) |
| 473 { | |
|
1819
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
474 u_char *p; |
| 1116 | 475 size_t root; |
| 476 ngx_str_t path; | |
| 477 | |
| 478 if (r->headers_in.content_length_n > 0) { | |
|
1819
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
479 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
480 "MKCOL with body is unsupported"); |
| 1116 | 481 return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; |
| 482 } | |
| 483 | |
|
1819
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
484 if (r->uri.data[r->uri.len - 1] != '/') { |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
485 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
486 "MKCOL can create a collection only"); |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
487 return NGX_HTTP_CONFLICT; |
| 1116 | 488 } |
| 489 | |
|
1819
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
490 p = ngx_http_map_uri_to_path(r, &path, &root, 0); |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
491 |
|
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
492 *(p - 1) = '\0'; |
| 1116 | 493 |
| 494 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 495 "http mkcol path: \"%s\"", path.data); | |
| 496 | |
| 497 if (ngx_create_dir(path.data, ngx_dir_access(dlcf->access)) | |
| 498 != NGX_FILE_ERROR) | |
| 499 { | |
| 500 if (ngx_http_dav_location(r, path.data) != NGX_OK) { | |
| 501 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 502 } | |
| 503 | |
| 504 return NGX_HTTP_CREATED; | |
| 505 } | |
| 506 | |
| 507 return ngx_http_dav_error(r->connection->log, ngx_errno, | |
|
1819
0f907513dd3c
change status code, add log message, and test collection URI
Igor Sysoev <igor@sysoev.ru>
parents:
1818
diff
changeset
|
508 NGX_HTTP_CONFLICT, ngx_create_dir_n, path.data); |
| 1116 | 509 } |
| 510 | |
| 511 | |
| 512 static ngx_int_t | |
| 513 ngx_http_dav_copy_move_handler(ngx_http_request_t *r) | |
| 514 { | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
515 u_char *p, *host, *last, ch; |
|
1804
d457a1576532
several changes in server_name:
Igor Sysoev <igor@sysoev.ru>
parents:
1803
diff
changeset
|
516 size_t len, root; |
| 1116 | 517 ngx_err_t err; |
| 518 ngx_int_t rc, depth; | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
519 ngx_uint_t overwrite, slash, dir; |
| 1116 | 520 ngx_str_t path, uri; |
| 521 ngx_tree_ctx_t tree; | |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
522 ngx_copy_file_t cf; |
| 1116 | 523 ngx_file_info_t fi; |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
524 ngx_table_elt_t *dest, *over; |
|
2394
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
525 ngx_ext_rename_file_t ext; |
| 1116 | 526 ngx_http_dav_copy_ctx_t copy; |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
527 ngx_http_dav_loc_conf_t *dlcf; |
| 1116 | 528 |
| 529 if (r->headers_in.content_length_n > 0) { | |
| 530 return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; | |
| 531 } | |
| 532 | |
| 533 dest = r->headers_in.destination; | |
| 534 | |
| 535 if (dest == NULL) { | |
| 536 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 537 "client sent no \"Destination\" header"); | |
| 538 return NGX_HTTP_BAD_REQUEST; | |
| 539 } | |
| 540 | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
541 len = r->headers_in.server.len; |
|
1804
d457a1576532
several changes in server_name:
Igor Sysoev <igor@sysoev.ru>
parents:
1803
diff
changeset
|
542 |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
543 if (len == 0) { |
|
1804
d457a1576532
several changes in server_name:
Igor Sysoev <igor@sysoev.ru>
parents:
1803
diff
changeset
|
544 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
d457a1576532
several changes in server_name:
Igor Sysoev <igor@sysoev.ru>
parents:
1803
diff
changeset
|
545 "client sent no \"Host\" header"); |
|
d457a1576532
several changes in server_name:
Igor Sysoev <igor@sysoev.ru>
parents:
1803
diff
changeset
|
546 return NGX_HTTP_BAD_REQUEST; |
| 1116 | 547 } |
| 548 | |
| 549 #if (NGX_HTTP_SSL) | |
| 550 | |
| 551 if (r->connection->ssl) { | |
| 552 if (ngx_strncmp(dest->value.data, "https://", sizeof("https://") - 1) | |
| 553 != 0) | |
| 554 { | |
| 555 goto invalid_destination; | |
| 556 } | |
| 557 | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
558 host = dest->value.data + sizeof("https://") - 1; |
| 1116 | 559 |
| 560 } else | |
| 561 #endif | |
| 562 { | |
| 563 if (ngx_strncmp(dest->value.data, "http://", sizeof("http://") - 1) | |
| 564 != 0) | |
| 565 { | |
| 566 goto invalid_destination; | |
| 567 } | |
| 568 | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
569 host = dest->value.data + sizeof("http://") - 1; |
| 1116 | 570 } |
| 571 | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
572 if (ngx_strncmp(host, r->headers_in.server.data, len) != 0) { |
| 1116 | 573 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
1822
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
574 "\"Destination\" URI \"%V\" is handled by " |
| 1116 | 575 "different repository than the source URI", |
| 576 &dest->value); | |
| 577 return NGX_HTTP_BAD_REQUEST; | |
| 578 } | |
| 579 | |
| 580 last = dest->value.data + dest->value.len; | |
| 581 | |
|
2007
b9de93d804ea
*) host in request line has priority
Igor Sysoev <igor@sysoev.ru>
parents:
1909
diff
changeset
|
582 for (p = host + len; p < last; p++) { |
| 1116 | 583 if (*p == '/') { |
| 584 goto destination_done; | |
| 585 } | |
| 586 } | |
| 587 | |
| 588 invalid_destination: | |
| 589 | |
| 590 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 591 "client sent invalid \"Destination\" header: \"%V\"", | |
| 592 &dest->value); | |
| 593 return NGX_HTTP_BAD_REQUEST; | |
| 594 | |
| 595 destination_done: | |
| 596 | |
|
1822
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
597 if ((r->uri.data[r->uri.len - 1] == '/' && *(last - 1) != '/') |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
598 || (r->uri.data[r->uri.len - 1] != '/' && *(last - 1) == '/')) |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
599 { |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
600 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
601 "both URI \"%V\" and \"Destination\" URI \"%V\" " |
|
1834
aa343f669f11
style fix: remove trailing space
Igor Sysoev <igor@sysoev.ru>
parents:
1831
diff
changeset
|
602 "should be either collections or non-collections", |
|
1822
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
603 &r->uri, &dest->value); |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
604 return NGX_HTTP_CONFLICT; |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
605 } |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
606 |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
607 depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH); |
| 1116 | 608 |
|
1822
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
609 if (depth != NGX_HTTP_DAV_INFINITY_DEPTH) { |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
610 |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
611 if (r->method == NGX_HTTP_COPY) { |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
612 if (depth != 0) { |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
613 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
614 "\"Depth\" header must be 0 or infinity"); |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
615 return NGX_HTTP_BAD_REQUEST; |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
616 } |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
617 |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
618 } else { |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
619 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
620 "\"Depth\" header must be infinity"); |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
621 return NGX_HTTP_BAD_REQUEST; |
|
935427c55e04
test URI/Destination collection/non-collection and Depth
Igor Sysoev <igor@sysoev.ru>
parents:
1821
diff
changeset
|
622 } |
| 1116 | 623 } |
|
1174
6be5ee17d80b
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1116
diff
changeset
|
624 |
| 1116 | 625 over = r->headers_in.overwrite; |
| 626 | |
| 627 if (over) { | |
| 628 if (over->value.len == 1) { | |
| 629 ch = over->value.data[0]; | |
| 630 | |
| 631 if (ch == 'T' || ch == 't') { | |
| 632 overwrite = 1; | |
| 633 goto overwrite_done; | |
| 634 } | |
| 635 | |
| 636 if (ch == 'F' || ch == 'f') { | |
| 637 overwrite = 0; | |
| 638 goto overwrite_done; | |
| 639 } | |
| 640 | |
| 641 } | |
| 642 | |
| 643 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 644 "client sent invalid \"Overwrite\" header: \"%V\"", | |
| 645 &over->value); | |
| 646 return NGX_HTTP_BAD_REQUEST; | |
| 647 } | |
| 648 | |
| 649 overwrite = 1; | |
| 650 | |
| 651 overwrite_done: | |
| 652 | |
| 653 ngx_http_map_uri_to_path(r, &path, &root, 0); | |
| 654 | |
| 655 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 656 "http copy from: \"%s\"", path.data); | |
| 657 | |
| 658 uri = r->uri; | |
| 659 | |
| 660 r->uri.len = last - p; | |
| 661 r->uri.data = p; | |
| 662 | |
| 663 ngx_http_map_uri_to_path(r, ©.path, &root, 0); | |
| 664 | |
| 665 r->uri = uri; | |
| 666 | |
| 667 copy.path.len--; /* omit "\0" */ | |
| 668 | |
| 669 if (copy.path.data[copy.path.len - 1] == '/') { | |
| 670 slash = 1; | |
| 671 copy.path.len--; | |
| 672 copy.path.data[copy.path.len] = '\0'; | |
| 673 | |
| 674 } else { | |
| 675 slash = 0; | |
| 676 } | |
| 677 | |
| 678 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 679 "http copy to: \"%s\"", copy.path.data); | |
| 680 | |
|
2782
4bd7825fab80
uniform ngx_file_info() interface with ngx_fd_info()
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
681 if (ngx_file_info(copy.path.data, &fi) == NGX_FILE_ERROR) { |
| 1116 | 682 err = ngx_errno; |
| 683 | |
| 684 if (err != NGX_ENOENT) { | |
| 685 return ngx_http_dav_error(r->connection->log, err, | |
| 686 NGX_HTTP_NOT_FOUND, ngx_file_info_n, | |
| 687 copy.path.data); | |
| 688 } | |
| 689 | |
| 690 /* destination does not exist */ | |
| 691 | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
692 overwrite = 0; |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
693 dir = 0; |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
694 |
| 1116 | 695 } else { |
| 696 | |
| 697 /* destination exists */ | |
| 698 | |
| 699 if (ngx_is_dir(&fi) && !slash) { | |
| 1824 | 700 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 701 "\"%V\" could not be %Ved to collection \"%V\"", | |
| 702 &r->uri, &r->method_name, &dest->value); | |
| 1116 | 703 return NGX_HTTP_CONFLICT; |
| 704 } | |
| 705 | |
| 706 if (!overwrite) { | |
| 1824 | 707 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_EEXIST, |
| 708 "\"%s\" could not be created", copy.path.data); | |
| 1116 | 709 return NGX_HTTP_PRECONDITION_FAILED; |
| 710 } | |
| 711 | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
712 dir = ngx_is_dir(&fi); |
| 1116 | 713 } |
| 714 | |
|
2782
4bd7825fab80
uniform ngx_file_info() interface with ngx_fd_info()
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
715 if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) { |
| 1116 | 716 return ngx_http_dav_error(r->connection->log, ngx_errno, |
| 717 NGX_HTTP_NOT_FOUND, ngx_file_info_n, | |
| 718 path.data); | |
| 719 } | |
| 720 | |
| 721 if (ngx_is_dir(&fi)) { | |
| 722 | |
| 723 if (r->uri.data[r->uri.len - 1] != '/') { | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
724 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
725 "\"%V\" is collection", &r->uri); |
| 1116 | 726 return NGX_HTTP_BAD_REQUEST; |
| 727 } | |
| 728 | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
729 if (overwrite) { |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
730 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
731 "http delete: \"%s\"", copy.path.data); |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
732 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
733 rc = ngx_http_dav_delete_path(r, ©.path, dir); |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
734 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
735 if (rc != NGX_OK) { |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
736 return rc; |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
737 } |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
738 } |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
739 } |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
740 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
741 if (ngx_is_dir(&fi)) { |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
742 |
| 1116 | 743 path.len -= 2; /* omit "/\0" */ |
| 744 | |
| 745 if (r->method == NGX_HTTP_MOVE) { | |
| 746 if (ngx_rename_file(path.data, copy.path.data) != NGX_FILE_ERROR) { | |
| 747 return NGX_HTTP_CREATED; | |
| 748 } | |
| 749 } | |
| 750 | |
| 751 if (ngx_create_dir(copy.path.data, ngx_file_access(&fi)) | |
| 752 == NGX_FILE_ERROR) | |
| 753 { | |
| 754 return ngx_http_dav_error(r->connection->log, ngx_errno, | |
| 755 NGX_HTTP_NOT_FOUND, | |
| 756 ngx_create_dir_n, copy.path.data); | |
| 757 } | |
| 758 | |
| 759 copy.len = path.len; | |
| 760 | |
|
1769
a35bc4007ec3
tree.init_handler is never called
Igor Sysoev <igor@sysoev.ru>
parents:
1749
diff
changeset
|
761 tree.init_handler = NULL; |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
762 tree.file_handler = ngx_http_dav_copy_tree_file; |
| 1116 | 763 tree.pre_tree_handler = ngx_http_dav_copy_dir; |
| 764 tree.post_tree_handler = ngx_http_dav_copy_dir_time; | |
| 765 tree.spec_handler = ngx_http_dav_noop; | |
| 766 tree.data = © | |
| 767 tree.alloc = 0; | |
| 768 tree.log = r->connection->log; | |
| 769 | |
| 770 if (ngx_walk_tree(&tree, &path) == NGX_OK) { | |
| 771 | |
| 772 if (r->method == NGX_HTTP_MOVE) { | |
| 773 rc = ngx_http_dav_delete_path(r, &path, 1); | |
| 774 | |
| 775 if (rc != NGX_OK) { | |
| 776 return rc; | |
| 777 } | |
| 778 } | |
| 779 | |
| 780 return NGX_HTTP_CREATED; | |
| 781 } | |
| 782 | |
| 783 } else { | |
| 784 | |
| 785 if (r->method == NGX_HTTP_MOVE) { | |
|
2394
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
786 |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
787 dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
788 |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
789 ext.access = 0; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
790 ext.path_access = dlcf->access; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
791 ext.time = -1; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
792 ext.create_path = 1; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
793 ext.delete_file = 0; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
794 ext.log = r->connection->log; |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
795 |
|
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
796 if (ngx_ext_rename_file(&path, ©.path, &ext) == NGX_OK) { |
| 1116 | 797 return NGX_HTTP_NO_CONTENT; |
| 798 } | |
|
2394
dbe746851b31
use ngx_ext_rename_file() for single file MOVE
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
799 |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
800 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 1116 | 801 } |
| 802 | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
803 dlcf = ngx_http_get_module_loc_conf(r, ngx_http_dav_module); |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
804 |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
805 cf.size = ngx_file_size(&fi); |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
806 cf.buf_size = 0; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
807 cf.access = dlcf->access; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
808 cf.time = ngx_file_mtime(&fi); |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
809 cf.log = r->connection->log; |
| 1116 | 810 |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
811 if (ngx_copy_file(path.data, copy.path.data, &cf) == NGX_OK) { |
| 1116 | 812 return NGX_HTTP_NO_CONTENT; |
| 813 } | |
| 814 } | |
| 815 | |
| 816 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 817 } | |
| 818 | |
| 819 | |
| 820 static ngx_int_t | |
| 821 ngx_http_dav_copy_dir(ngx_tree_ctx_t *ctx, ngx_str_t *path) | |
| 822 { | |
| 823 u_char *p, *dir; | |
| 824 size_t len; | |
| 825 ngx_http_dav_copy_ctx_t *copy; | |
| 826 | |
| 827 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 828 "http copy dir: \"%s\"", path->data); | |
| 829 | |
| 830 copy = ctx->data; | |
| 831 | |
| 832 len = copy->path.len + path->len; | |
| 833 | |
| 834 dir = ngx_alloc(len + 1, ctx->log); | |
| 835 if (dir == NULL) { | |
| 836 return NGX_ABORT; | |
| 837 } | |
| 838 | |
| 839 p = ngx_cpymem(dir, copy->path.data, copy->path.len); | |
| 840 (void) ngx_cpystrn(p, path->data + copy->len, path->len - copy->len + 1); | |
| 841 | |
| 842 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 843 "http copy dir to: \"%s\"", dir); | |
| 844 | |
| 845 if (ngx_create_dir(dir, ngx_dir_access(ctx->access)) == NGX_FILE_ERROR) { | |
| 846 (void) ngx_http_dav_error(ctx->log, ngx_errno, 0, ngx_create_dir_n, | |
| 847 dir); | |
| 848 } | |
| 849 | |
| 850 ngx_free(dir); | |
| 851 | |
| 852 return NGX_OK; | |
| 853 } | |
| 854 | |
| 855 | |
| 856 static ngx_int_t | |
| 857 ngx_http_dav_copy_dir_time(ngx_tree_ctx_t *ctx, ngx_str_t *path) | |
| 858 { | |
| 859 u_char *p, *dir; | |
| 860 size_t len; | |
| 861 ngx_http_dav_copy_ctx_t *copy; | |
| 862 | |
| 863 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 864 "http copy dir time: \"%s\"", path->data); | |
| 865 | |
| 866 copy = ctx->data; | |
| 867 | |
| 868 len = copy->path.len + path->len; | |
| 869 | |
| 870 dir = ngx_alloc(len + 1, ctx->log); | |
| 871 if (dir == NULL) { | |
| 872 return NGX_ABORT; | |
| 873 } | |
| 874 | |
| 875 p = ngx_cpymem(dir, copy->path.data, copy->path.len); | |
| 876 (void) ngx_cpystrn(p, path->data + copy->len, path->len - copy->len + 1); | |
| 877 | |
| 878 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 879 "http copy dir time to: \"%s\"", dir); | |
| 880 | |
|
1803
7405719e4848
condition declarations inside blocks update missed in r1705
Igor Sysoev <igor@sysoev.ru>
parents:
1769
diff
changeset
|
881 #if (NGX_WIN32) |
|
7405719e4848
condition declarations inside blocks update missed in r1705
Igor Sysoev <igor@sysoev.ru>
parents:
1769
diff
changeset
|
882 { |
|
7405719e4848
condition declarations inside blocks update missed in r1705
Igor Sysoev <igor@sysoev.ru>
parents:
1769
diff
changeset
|
883 ngx_fd_t fd; |
| 1116 | 884 |
| 885 fd = ngx_open_file(dir, NGX_FILE_RDWR, NGX_FILE_OPEN, 0); | |
| 886 | |
| 887 if (fd == NGX_INVALID_FILE) { | |
| 888 (void) ngx_http_dav_error(ctx->log, ngx_errno, 0, ngx_open_file_n, dir); | |
| 889 goto failed; | |
| 890 } | |
| 891 | |
| 892 if (ngx_set_file_time(NULL, fd, ctx->mtime) != NGX_OK) { | |
| 893 ngx_log_error(NGX_LOG_ALERT, ctx->log, ngx_errno, | |
| 894 ngx_set_file_time_n " \"%s\" failed", dir); | |
| 895 } | |
| 896 | |
| 897 if (ngx_close_file(fd) == NGX_FILE_ERROR) { | |
| 898 ngx_log_error(NGX_LOG_ALERT, ctx->log, ngx_errno, | |
| 899 ngx_close_file_n " \"%s\" failed", dir); | |
| 900 } | |
|
1803
7405719e4848
condition declarations inside blocks update missed in r1705
Igor Sysoev <igor@sysoev.ru>
parents:
1769
diff
changeset
|
901 } |
| 1116 | 902 |
| 903 failed: | |
| 904 | |
| 905 #else | |
| 906 | |
| 907 if (ngx_set_file_time(dir, 0, ctx->mtime) != NGX_OK) { | |
| 908 ngx_log_error(NGX_LOG_ALERT, ctx->log, ngx_errno, | |
| 909 ngx_set_file_time_n " \"%s\" failed", dir); | |
| 910 } | |
| 911 | |
| 912 #endif | |
| 913 | |
| 914 ngx_free(dir); | |
| 915 | |
| 916 return NGX_OK; | |
| 917 } | |
| 918 | |
| 919 | |
| 920 static ngx_int_t | |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
921 ngx_http_dav_copy_tree_file(ngx_tree_ctx_t *ctx, ngx_str_t *path) |
| 1116 | 922 { |
| 923 u_char *p, *file; | |
| 924 size_t len; | |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
925 ngx_copy_file_t cf; |
| 1116 | 926 ngx_http_dav_copy_ctx_t *copy; |
| 927 | |
| 928 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 929 "http copy file: \"%s\"", path->data); | |
| 930 | |
| 931 copy = ctx->data; | |
| 932 | |
| 933 len = copy->path.len + path->len; | |
| 934 | |
| 935 file = ngx_alloc(len + 1, ctx->log); | |
| 936 if (file == NULL) { | |
| 937 return NGX_ABORT; | |
| 938 } | |
| 939 | |
| 940 p = ngx_cpymem(file, copy->path.data, copy->path.len); | |
| 941 (void) ngx_cpystrn(p, path->data + copy->len, path->len - copy->len + 1); | |
| 942 | |
| 943 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0, | |
| 944 "http copy file to: \"%s\"", file); | |
| 945 | |
|
3024
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
946 cf.size = ctx->size; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
947 cf.buf_size = 0; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
948 cf.access = ctx->access; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
949 cf.time = ctx->mtime; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
950 cf.log = ctx->log; |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
951 |
|
8101d9101ed8
allow cross device temporary files atomic copying:
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
952 (void) ngx_copy_file(path->data, file, &cf); |
|
1825
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
953 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
954 ngx_free(file); |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
955 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
956 return NGX_OK; |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
957 } |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
958 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
959 |
|
2e0fbfef56d4
do not delete target until all tests will be done,
Igor Sysoev <igor@sysoev.ru>
parents:
1824
diff
changeset
|
960 static ngx_int_t |
| 1116 | 961 ngx_http_dav_depth(ngx_http_request_t *r, ngx_int_t dflt) |
| 962 { | |
| 963 ngx_table_elt_t *depth; | |
|
1174
6be5ee17d80b
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1116
diff
changeset
|
964 |
| 1116 | 965 depth = r->headers_in.depth; |
| 966 | |
| 967 if (depth == NULL) { | |
| 968 return dflt; | |
| 969 } | |
| 970 | |
| 971 if (depth->value.len == 1) { | |
| 972 | |
| 973 if (depth->value.data[0] == '0') { | |
| 974 return 0; | |
| 975 } | |
| 976 | |
| 977 if (depth->value.data[0] == '1') { | |
| 978 return 1; | |
| 979 } | |
| 980 | |
| 981 } else { | |
| 982 | |
| 983 if (depth->value.len == sizeof("infinity") - 1 | |
| 984 && ngx_strcmp(depth->value.data, "infinity") == 0) | |
| 985 { | |
| 986 return NGX_HTTP_DAV_INFINITY_DEPTH; | |
| 987 } | |
| 988 } | |
| 989 | |
| 990 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 991 "client sent invalid \"Depth\" header: \"%V\"", | |
| 992 &depth->value); | |
| 993 | |
| 994 return NGX_HTTP_DAV_INVALID_DEPTH; | |
| 995 } | |
| 996 | |
| 997 | |
| 998 static ngx_int_t | |
| 999 ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, ngx_int_t not_found, | |
| 637 | 1000 char *failed, u_char *path) |
| 1001 { | |
| 1002 ngx_int_t rc; | |
| 1003 ngx_uint_t level; | |
| 1004 | |
| 1005 if (err == NGX_ENOENT || err == NGX_ENOTDIR || err == NGX_ENAMETOOLONG) { | |
| 1006 level = NGX_LOG_ERR; | |
| 1007 rc = not_found; | |
| 1008 | |
| 1009 } else if (err == NGX_EACCES || err == NGX_EPERM) { | |
| 1010 level = NGX_LOG_ERR; | |
| 1011 rc = NGX_HTTP_FORBIDDEN; | |
| 1012 | |
| 1013 } else if (err == NGX_EEXIST) { | |
| 1014 level = NGX_LOG_ERR; | |
| 1015 rc = NGX_HTTP_NOT_ALLOWED; | |
| 1016 | |
| 1017 } else if (err == NGX_ENOSPC) { | |
| 1018 level = NGX_LOG_CRIT; | |
| 1019 rc = NGX_HTTP_INSUFFICIENT_STORAGE; | |
| 1020 | |
| 1021 } else { | |
| 1022 level = NGX_LOG_CRIT; | |
| 1023 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 1024 } | |
| 1025 | |
| 1116 | 1026 ngx_log_error(level, log, err, "%s \"%s\" failed", failed, path); |
| 637 | 1027 |
| 1028 return rc; | |
| 1029 } | |
| 1030 | |
| 1031 | |
| 1032 static ngx_int_t | |
| 1033 ngx_http_dav_location(ngx_http_request_t *r, u_char *path) | |
| 1034 { | |
| 1035 u_char *location; | |
| 1036 ngx_http_core_loc_conf_t *clcf; | |
| 1037 | |
| 1038 r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t)); | |
| 1039 if (r->headers_out.location == NULL) { | |
| 1040 return NGX_ERROR; | |
| 1041 } | |
| 1042 | |
| 1043 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | |
| 1044 | |
| 1045 if (!clcf->alias && clcf->root_lengths == NULL) { | |
| 1046 location = path + clcf->root.len; | |
| 1047 | |
| 1048 } else { | |
| 2049 | 1049 location = ngx_pnalloc(r->pool, r->uri.len); |
| 637 | 1050 if (location == NULL) { |
| 1051 return NGX_ERROR; | |
| 1052 } | |
| 1053 | |
| 1054 ngx_memcpy(location, r->uri.data, r->uri.len); | |
| 1055 } | |
| 1056 | |
| 1057 /* | |
| 1058 * we do not need to set the r->headers_out.location->hash and | |
| 1059 * r->headers_out.location->key fields | |
| 1060 */ | |
| 1061 | |
| 1062 r->headers_out.location->value.len = r->uri.len; | |
| 1063 r->headers_out.location->value.data = location; | |
| 1064 | |
| 1065 return NGX_OK; | |
| 1066 } | |
| 1067 | |
| 1068 | |
| 633 | 1069 static void * |
| 1070 ngx_http_dav_create_loc_conf(ngx_conf_t *cf) | |
| 1071 { | |
| 1072 ngx_http_dav_loc_conf_t *conf; | |
| 1073 | |
| 1074 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_dav_loc_conf_t)); | |
| 1075 if (conf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2782
diff
changeset
|
1076 return NULL; |
| 633 | 1077 } |
| 1078 | |
| 1079 /* | |
| 1080 * set by ngx_pcalloc(): | |
| 1081 * | |
| 1082 * conf->methods = 0; | |
| 1083 */ | |
| 1084 | |
|
1864
524831ec3e69
fix building by msvc introduced in r1817
Igor Sysoev <igor@sysoev.ru>
parents:
1834
diff
changeset
|
1085 conf->min_delete_depth = NGX_CONF_UNSET_UINT; |
| 1816 | 1086 conf->access = NGX_CONF_UNSET_UINT; |
| 637 | 1087 conf->create_full_put_path = NGX_CONF_UNSET; |
| 1088 | |
| 633 | 1089 return conf; |
| 1090 } | |
| 1091 | |
| 1092 | |
| 1093 static char * | |
| 1094 ngx_http_dav_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 1095 { | |
| 1096 ngx_http_dav_loc_conf_t *prev = parent; | |
| 1097 ngx_http_dav_loc_conf_t *conf = child; | |
| 1098 | |
| 1099 ngx_conf_merge_bitmask_value(conf->methods, prev->methods, | |
| 637 | 1100 (NGX_CONF_BITMASK_SET|NGX_HTTP_DAV_OFF)); |
| 1101 | |
| 1816 | 1102 ngx_conf_merge_uint_value(conf->min_delete_depth, |
| 1103 prev->min_delete_depth, 0); | |
| 633 | 1104 |
| 669 | 1105 ngx_conf_merge_uint_value(conf->access, prev->access, 0600); |
| 1106 | |
| 1816 | 1107 ngx_conf_merge_value(conf->create_full_put_path, |
| 1108 prev->create_full_put_path, 0); | |
| 1109 | |
| 633 | 1110 return NGX_CONF_OK; |
| 1111 } | |
| 1112 | |
| 1113 | |
| 1114 static ngx_int_t | |
| 681 | 1115 ngx_http_dav_init(ngx_conf_t *cf) |
| 633 | 1116 { |
| 1117 ngx_http_handler_pt *h; | |
| 1118 ngx_http_core_main_conf_t *cmcf; | |
| 1119 | |
| 681 | 1120 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); |
| 633 | 1121 |
| 1122 h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers); | |
| 1123 if (h == NULL) { | |
| 1124 return NGX_ERROR; | |
| 1125 } | |
| 1126 | |
| 1127 *h = ngx_http_dav_handler; | |
| 1128 | |
| 1129 return NGX_OK; | |
| 1130 } |