diff options
| -rw-r--r-- | 1.3/patches/07_all_mod_dir_incremental.patch | 17 | ||||
| -rw-r--r-- | 2.0/patches/07_all_mod_dir_incremental.patch | 24 |
2 files changed, 25 insertions, 16 deletions
diff --git a/1.3/patches/07_all_mod_dir_incremental.patch b/1.3/patches/07_all_mod_dir_incremental.patch index b9cc88a..53f8575 100644 --- a/1.3/patches/07_all_mod_dir_incremental.patch +++ b/1.3/patches/07_all_mod_dir_incremental.patch @@ -1,5 +1,6 @@ ---- apache_1.3.33/src/modules/standard/mod_dir.c 2004-02-20 12:37:40.000000000 -0800 -+++ apache_1.3.33.new/src/modules/standard/mod_dir.c 2005-02-20 12:40:43.553575634 -0800 +diff -ur apache_1.3.33.orig/src/modules/standard/mod_dir.c apache_1.3.33/src/modules/standard/mod_dir.c +--- apache_1.3.33.orig/src/modules/standard/mod_dir.c 2004-02-20 12:37:40.000000000 -0800 ++++ apache_1.3.33/src/modules/standard/mod_dir.c 2005-09-17 16:34:20.000000000 -0700 @@ -30,6 +30,7 @@ typedef struct dir_config_struct { @@ -92,7 +93,7 @@ return new; } -@@ -77,7 +136,6 @@ +@@ -77,11 +136,11 @@ dir_config_rec *d = (dir_config_rec *) ap_get_module_config(r->per_dir_config, &dir_module); @@ -100,7 +101,13 @@ char **names_ptr; int num_names; int error_notfound = 0; -@@ -105,16 +163,25 @@ +- ++ array_header *index_names; ++ + if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] != '/') { + char *ifile; + if (r->args != NULL) +@@ -105,16 +164,23 @@ r->filename = ap_pstrcat(r->pool, r->filename, "/", NULL); } @@ -115,8 +122,6 @@ - } - + /* Merge index_names and index_names_incr */ -+ array_header *index_names; -+ + if (d->index_names) { + if (d->index_names_incr) { + index_names = ap_append_arrays(r->pool, d->index_names, d->index_names_incr); diff --git a/2.0/patches/07_all_mod_dir_incremental.patch b/2.0/patches/07_all_mod_dir_incremental.patch index 071e307..5abd7f1 100644 --- a/2.0/patches/07_all_mod_dir_incremental.patch +++ b/2.0/patches/07_all_mod_dir_incremental.patch @@ -1,6 +1,7 @@ ---- ../httpd-2.0.52/modules/mappers/mod_dir.c 2004-08-15 14:59:57.000000000 -0700 -+++ httpd-2.0.52/modules/mappers/mod_dir.c 2005-02-13 02:27:55.724946750 -0800 -@@ -38,6 +38,7 @@ +diff -ur httpd-2.0.54.orig/modules/mappers/mod_dir.c httpd-2.0.54/modules/mappers/mod_dir.c +--- httpd-2.0.54.orig/modules/mappers/mod_dir.c 2005-02-04 12:21:18.000000000 -0800 ++++ httpd-2.0.54/modules/mappers/mod_dir.c 2005-09-17 16:29:52.000000000 -0700 +@@ -39,6 +39,7 @@ typedef struct dir_config_struct { apr_array_header_t *index_names; @@ -8,7 +9,7 @@ slash_cfg do_slash; } dir_config_rec; -@@ -54,6 +55,57 @@ +@@ -55,6 +56,57 @@ return NULL; } @@ -66,7 +67,7 @@ static const char *configure_slash(cmd_parms *cmd, void *d_, int arg) { dir_config_rec *d = d_; -@@ -66,6 +118,10 @@ +@@ -67,6 +119,10 @@ { AP_INIT_ITERATE("DirectoryIndex", add_index, NULL, DIR_CMD_PERMS, "a list of file names"), @@ -77,7 +78,7 @@ AP_INIT_FLAG("DirectorySlash", configure_slash, NULL, DIR_CMD_PERMS, "On or Off"), {NULL} -@@ -76,6 +132,7 @@ +@@ -77,6 +133,7 @@ dir_config_rec *new = apr_pcalloc(p, sizeof(dir_config_rec)); new->index_names = NULL; @@ -85,7 +86,7 @@ new->do_slash = SLASH_UNSET; return (void *) new; } -@@ -89,13 +146,13 @@ +@@ -90,16 +147,17 @@ new->index_names = add->index_names ? add->index_names : base->index_names; new->do_slash = (add->do_slash == SLASH_UNSET) ? base->do_slash : add->do_slash; @@ -100,7 +101,11 @@ char **names_ptr; int num_names; int error_notfound = 0; -@@ -154,16 +211,25 @@ ++ apr_array_header_t *index_names; + + /* only handle requests against directories */ + if (r->finfo.filetype != APR_DIR) { +@@ -155,16 +213,23 @@ return DECLINED; } @@ -113,9 +118,8 @@ - names_ptr = dummy_ptr; - num_names = 1; - } +- + /* Merge index_names and index_names_incr */ -+ apr_array_header_t *index_names; - + if (d->index_names) { + if (d->index_names_incr) { + index_names = apr_array_append(r->pool, d->index_names, d->index_names_incr); |