2000-03-01 06:25:15 +00:00
|
|
|
--- src/main/http_request.c.orig Tue Jan 11 08:13:41 2000
|
|
|
|
+++ src/main/http_request.c Sun Feb 20 18:44:49 2000
|
|
|
|
@@ -175,7 +175,7 @@
|
|
|
|
{
|
|
|
|
char *cp;
|
|
|
|
char *path = r->filename;
|
|
|
|
- char *end = &path[strlen(path)];
|
|
|
|
+ char *end;
|
|
|
|
char *last_cp = NULL;
|
|
|
|
int rv;
|
|
|
|
#ifdef HAVE_DRIVE_LETTERS
|
|
|
|
@@ -187,6 +187,9 @@
|
1999-05-03 01:51:00 +00:00
|
|
|
return OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (r->execfilename) path = r->execfilename;
|
2000-03-01 06:25:15 +00:00
|
|
|
+ end = path + strlen(path);
|
1999-05-03 01:51:00 +00:00
|
|
|
+
|
|
|
|
#ifdef HAVE_DRIVE_LETTERS
|
|
|
|
/* If the directory is x:\, then we don't want to strip
|
|
|
|
* the trailing slash since x: is not a valid directory.
|
2000-03-01 06:25:15 +00:00
|
|
|
@@ -511,6 +514,7 @@
|
1999-05-03 01:51:00 +00:00
|
|
|
res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
|
|
|
|
ap_pstrdup(r->pool, test_dirname),
|
|
|
|
sconf->access_name);
|
|
|
|
+ if (r->execfilename) r->filename = r->execfilename;
|
|
|
|
if (res)
|
|
|
|
return res;
|
|
|
|
|
2000-03-01 06:25:15 +00:00
|
|
|
@@ -521,6 +525,7 @@
|
2000-01-03 03:36:38 +00:00
|
|
|
r->per_dir_config = per_dir_defaults;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ if (r->execfilename) r->filename = r->execfilename;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|