Mailing List Archive

ben 98/05/09 08:49:36

Modified: src CHANGES
src/main http_core.c http_main.c
Log:
Make Win32 work again after DoS changes.

Revision Changes Path
1.840 +3 -0 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- CHANGES 1998/05/09 15:09:29 1.839
+++ CHANGES 1998/05/09 15:49:32 1.840
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7

+ *) WIN32: Make Win32 work again after the /dev/null DoS fix.
+ [Ben Laurie]
+
*) WIN32: Check for buffer overflows in ap_os_canonical_filename.
[Ben Laurie]




1.199 +1 -1 apache-1.3/src/main/http_core.c

Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- http_core.c 1998/05/09 04:42:28 1.198
+++ http_core.c 1998/05/09 15:49:33 1.199
@@ -1398,7 +1398,7 @@
if (err != NULL) return err;

if (!ap_is_directory (arg)) return "ServerRoot must be a valid directory";
- ap_cpystrn (ap_server_root, arg, sizeof(ap_server_root));
+ ap_cpystrn (ap_server_root, ap_os_canonical_filename(cmd->pool, arg), sizeof(ap_server_root));
return NULL;
}




1.346 +2 -2 apache-1.3/src/main/http_main.c

Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- http_main.c 1998/05/09 15:26:29 1.345
+++ http_main.c 1998/05/09 15:49:34 1.346
@@ -5253,10 +5253,10 @@
break;
#endif /* WIN32 */
case 'd':
- ap_cpystrn(ap_server_root, optarg, sizeof(ap_server_root));
+ ap_cpystrn(ap_server_root, ap_os_canonical_filename(pconf, optarg), sizeof(ap_server_root));
break;
case 'f':
- ap_cpystrn(ap_server_confname, optarg, sizeof(ap_server_confname));
+ ap_cpystrn(ap_server_confname, ap_os_canonical_filename(pconf, optarg), sizeof(ap_server_confname));
break;
case 'v':
printf("Server version: %s\n", ap_get_server_version());