dgaudet 97/08/19 00:52:44
Modified: src/core http_request.c httpd.h Log: Fix a bug introduced by Ben's canonical name patch. And avoid a strdup that's not necessary. Revision Changes Path 1.78 +1 -1 apachen/src/core/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apachen/src/core/http_request.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- http_request.c 1997/08/18 10:59:04 1.77 +++ http_request.c 1997/08/19 07:52:42 1.78 @@ -261,7 +261,7 @@ * fake one. But don't run through the directory entries. */ - if (test_filename == NULL) { + if (r->filename == NULL) { r->filename = pstrdup(r->pool, r->uri); r->finfo.st_mode = 0; /* Not really a file... */ r->per_dir_config = per_dir_defaults; 1.141 +3 -3 apachen/src/core/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apachen/src/core/httpd.h,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- httpd.h 1997/08/18 10:59:04 1.140 +++ httpd.h 1997/08/19 07:52:42 1.141 @@ -832,10 +832,10 @@ API_EXPORT(void) chdir_file(const char *file); #ifndef HAVE_CANONICAL_FILENAME -#define os_canonical_filename(p,f) pstrdup(p,f) -#endif - +#define os_canonical_filename(p,f) (f) +#else API_EXPORT(char *)os_canonical_filename(pool *p,const char *file); +#endif char *get_local_host(pool *); unsigned long get_virthost_addr (const char *hostname, unsigned short *port);