coar 98/10/20 10:42:45
Modified: src/main http_request.c
Log:
Use a common routine to check for absoluteness of a path; this
works for both Win32 and Unix and gets rid of #ifdefs.
PR: 2976, 3074
Submitted by: Ken Parzygnat <[EMAIL PROTECTED]>
Reviewed by: Ken Coar
Revision Changes Path
1.135 +1 -8 apache-1.3/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- http_request.c 1998/10/15 07:58:24 1.134
+++ http_request.c 1998/10/20 17:42:43 1.135
@@ -832,14 +832,7 @@
* file may not have a uri associated with it -djg
*/
rnew->uri = "INTERNALLY GENERATED file-relative req";
-#ifdef WIN32
- rnew->filename = ((new_file[0] == '/'
- || (ap_isalpha(new_file[0])
- && new_file[1] == ':'
- && new_file[2] == '/')) ?
-#else
- rnew->filename = ((new_file[0] == '/') ?
-#endif
+ rnew->filename = ((ap_os_is_path_absolute(new_file)) ?
ap_pstrdup(rnew->pool, new_file) :
ap_make_full_path(rnew->pool, fdir, new_file));
rnew->per_dir_config = r->server->lookup_defaults;
