cvs commit: apache-2.0 STATUS
mjc 98/02/08 02:08:18 Modified:.STATUS Log: My feelings. Multi-fibre options would be good imho. Revision ChangesPath 1.18 +8 -8 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- STATUS1998/02/07 20:12:45 1.17 +++ STATUS1998/02/08 10:08:17 1.18 @@ -30,7 +30,7 @@ varies from the above such that if it's shown that the autoconf toolset can do what we want, with less headache than what we have, then we go for it) - Status: Jim +1, Ken +1, Marc +1 + Status: Jim +1, Ken +1, Marc +1, MarkC +1 * The autoconf toolset should include all three: autoconf, automake, and libtool. @@ -44,17 +44,17 @@ to add more, but try not to duplicate earlier items too much. * multithreading. - Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1 + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1 - Thread Abstraction - Status: Sameer +1, Marc +1 + Status: Sameer +1, Marc +1, MarkC +1 * revamped process model (Dean's proposal) Dean says: it's hard to do the multithreading work cleanly without considering a bunch of this - Status: Marc +1 on much of it; threads aren't enough for perf. + Status: Marc +1 on much of it; threads aren't enough for perf. MarkC +1 * new layered I/O. - Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1 + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1 . sfio Status: Dean -1 until it's shown to be thread safe (RST claims it isn't) @@ -89,14 +89,14 @@ . change API 'phase' model to use module-registered hooks rather than a fixed static structure - Status: Ken +1, Ralf +1 + Status: Ken +1, Ralf +1, MarkC +1 . clearly identify API functions by renaming them Status: Ken +1, Ralf +1 . backward compatibility with 1.3 (just require a recompile) if functions get renamed, old names retained as wrappers - Status: Paul +1, Sameer +1, Marc +1, Ralf +1 + Status: Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1 . make API call syntax rational (e.g., all r*() routines list r as their first argument, et cetera) @@ -108,7 +108,7 @@ * rewrite in C++ . Yes: . doesn't like the idea, but is open to it: Marc +1, Ralf +1 - . No way ever: + . No way ever: MarkC +1 Closed issues:
cvs commit: apache-2.0 STATUS
ben 98/02/08 04:05:55 Modified:.STATUS Log: Revision ChangesPath 1.19 +11 -8 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- STATUS1998/02/08 10:08:17 1.18 +++ STATUS1998/02/08 12:05:54 1.19 @@ -30,7 +30,7 @@ varies from the above such that if it's shown that the autoconf toolset can do what we want, with less headache than what we have, then we go for it) - Status: Jim +1, Ken +1, Marc +1, MarkC +1 + Status: Jim +1, Ken +1, Marc +1, MarkC +1, Ben +1 * The autoconf toolset should include all three: autoconf, automake, and libtool. @@ -44,9 +44,9 @@ to add more, but try not to duplicate earlier items too much. * multithreading. - Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1 + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1, Ben +1 - Thread Abstraction - Status: Sameer +1, Marc +1, MarkC +1 + Status: Sameer +1, Marc +1, MarkC +1, Ben +1 * revamped process model (Dean's proposal) Dean says: it's hard to do the multithreading work cleanly without @@ -54,7 +54,7 @@ Status: Marc +1 on much of it; threads aren't enough for perf. MarkC +1 * new layered I/O. - Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1 + Status: Brian +1, Ken +1, Dean +1, Jim +1, Paul +1, Sameer +1, Marc +1, Ralf +1, MarkC +1, Ben +1 . sfio Status: Dean -1 until it's shown to be thread safe (RST claims it isn't) @@ -73,7 +73,7 @@ can get zero-copy in the user space, which is a big win for caching modules of all sorts. You can also support the traditional slow style of stdio, which adds an extra user space copy.) - Status: Dean +1, Marc +1 + Status: Dean +1, Marc +1, Ben +1 * API work @@ -91,8 +91,11 @@ than a fixed static structure Status: Ken +1, Ralf +1, MarkC +1 + . use virtual functions for module hooks + Status: Ben +1 + . clearly identify API functions by renaming them - Status: Ken +1, Ralf +1 + Status: Ken +1, Ralf +1, Ben +1 . backward compatibility with 1.3 (just require a recompile) if functions get renamed, old names retained as wrappers @@ -103,10 +106,10 @@ Status: Ken +1, Ralf +0 * new configuration language - Status: Dean +1, Marc +1, Ralf +0 + Status: Dean +1, Marc +1, Ralf +0, Ben +1 * rewrite in C++ - . Yes: + . Yes: Ben +1 . doesn't like the idea, but is open to it: Marc +1, Ralf +1 . No way ever: MarkC +1
cvs commit: apache-1.3/src/include httpd.h
jim 98/02/08 07:06:56 Modified:src CHANGES src/include httpd.h Log: And bump up to 1.3b5-dev Revision ChangesPath 1.620 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.619 retrieving revision 1.620 diff -u -r1.619 -r1.620 --- CHANGES 1998/02/07 21:23:28 1.619 +++ CHANGES 1998/02/08 15:06:53 1.620 @@ -1,3 +1,5 @@ +Changes with Apache 1.3b5 + Changes with Apache 1.3b4 *) The module structure was modified to include a *dynamic_load_handle 1.182 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- httpd.h 1998/02/08 15:03:34 1.181 +++ httpd.h 1998/02/08 15:06:55 1.182 @@ -356,7 +356,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3b4/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3b5-dev/* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else @@ -367,7 +367,7 @@ /* Numeric release version identifier: major minor bugfix betaseq * Always increases along the same track as the source branch. */ -#define APACHE_RELEASE 1030004 +#define APACHE_RELEASE 1030005 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT
cvs commit: apache-devsite how-to-release.html
jim 98/02/08 07:23:37 Modified:.how-to-release.html Log: info about pre-release tarball Revision ChangesPath 1.22 +15 -0 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- how-to-release.html 1998/01/27 07:52:00 1.21 +++ how-to-release.html 1998/02/08 15:23:36 1.22 @@ -158,6 +158,21 @@ codeb$ pgp -sba apache_1.X.Y.tar.gz/b/codebr codeb$ pgp -sba apache_1.X.Y.tar.Z/b/codebr P +LI Make the tarball available for testing purposes:br + codeb$ cp apache_1.X.Y.tar.gz /pub/httpd/dist/b/codebr + codeb$ cp apache_1.X.Y.tar.gz.asc /pub/httpd/dist/b/codebr + codeb$ cp apache_1.X.Y.tar.Z /pub/httpd/dist/b/codebr + codeb$ cp apache_1.X.Y.tar.Z.asc /pub/httpd/dist/b/codebr + UL + LIFONT COLOR=redNote:/FONT If rolling the tarball + remotely, you should use codescp/code to place them + in codedev.apache.org/code in the code/pub/httpd/dist/code + directory. + /UL + P + emFONT COLOR=redNote:/FONT Do not continue with the rest of + these instructions until the group approves the tarball !/em +P LI Make the distribution available:br codeb$ cp apache_1.X.Y.tar.gz /pub/apache/dist/b/codebr codeb$ cp apache_1.X.Y.tar.gz.asc /pub/apache/dist/b/codebr
cvs commit: apache-1.3/src/main http_main.c http_request.c
ben 98/02/08 10:16:05
Modified:src CHANGES
src/main http_main.c http_request.c
Log:
Make sure we use the canonical filename where we need to.
Revision ChangesPath
1.621 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -r1.620 -r1.621
--- CHANGES 1998/02/08 15:06:53 1.620
+++ CHANGES 1998/02/08 18:15:58 1.621
@@ -1,5 +1,8 @@
Changes with Apache 1.3b5
+ *) Sort out problems with canonical filename handling happening too late.
+ [Dean Gaudet, Ben Laurie]
+
Changes with Apache 1.3b4
*) The module structure was modified to include a *dynamic_load_handle
1.284 +5 -0 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.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- http_main.c 1998/02/07 10:27:52 1.283
+++ http_main.c 1998/02/08 18:16:01 1.284
@@ -112,6 +112,9 @@
#ifdef MULTITHREAD
/* special debug stuff -- PCS */
+/* Set this non-zero if you are prepared to put up with more than one log
entry per second */
+#define SEVERELY_VERBOSE 0
+
/* APD1() to APD5() are macros to help us debug. Then can either
* log to the screen or the error_log file. In release builds, this
* macros do nothing. In debug builds, they send messages at priority
@@ -4376,8 +4379,10 @@
}
while (1) {
+#if SEVERELY_VERBOSE
APD4(child PID %d: thread_main total_jobs=%d start_exit=%d,
my_pid, total_jobs, start_exit);
+#endif
if ((max_jobs_per_exe (total_jobs max_jobs_per_exe)
!start_exit)) {
start_exit = 1;
wait_time = 1;
1.106 +6 -6 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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- http_request.c1998/02/03 07:32:16 1.105
+++ http_request.c1998/02/08 18:16:03 1.106
@@ -291,8 +291,6 @@
return OK;
}
-test_filename = pstrdup(r-pool, r-filename);
-
/*
* Go down the directory hierarchy. Where we have to check for symlinks,
* do so. Where a .htaccess file has permission to override anything,
@@ -304,7 +302,7 @@
* Fake filenames (i.e. proxy:) only match Directory sections.
*/
-if (!os_is_path_absolute(test_filename))
+if (!os_is_path_absolute(r-filename))
{
void *this_conf, *entry_config;
core_dir_config *entry_core;
@@ -320,14 +318,14 @@
this_conf = NULL;
if (entry_core-r) {
-if (!regexec(entry_core-r, test_filename, 0, NULL, 0))
+if (!regexec(entry_core-r, r-filename, 0, NULL, 0))
this_conf = entry_config;
}
else if (entry_core-d_is_fnmatch) {
-if (!fnmatch(entry_dir, test_filename, 0))
+if (!fnmatch(entry_dir, r-filename, 0))
this_conf = entry_config;
}
-else if (!strncmp(test_filename, entry_dir, strlen(entry_dir)))
+else if (!strncmp(r-filename, entry_dir, strlen(entry_dir)))
this_conf = entry_config;
if (this_conf)
@@ -342,6 +340,8 @@
}
r-filename = os_canonical_filename(r-pool, r-filename);
+test_filename = pstrdup(r-pool, r-filename);
+
no2slash(test_filename);
num_dirs = count_dirs(test_filename);
cvs commit: apache-1.3/src/os/win32 util_win32.c
ben 98/02/08 10:50:52
Modified:src CHANGES
src/os/win32 util_win32.c
Log:
Support extensionless CGIs.
Submitted by: Sam Robb [EMAIL PROTECTED]
Revision ChangesPath
1.622 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- CHANGES 1998/02/08 18:15:58 1.621
+++ CHANGES 1998/02/08 18:50:49 1.622
@@ -1,5 +1,9 @@
Changes with Apache 1.3b5
+ *) WIN32: Append a '.' to extensionless executables in spawn[lv]e*
+ replacements, which makes them work.
+ [Sam Robb [EMAIL PROTECTED], Ben Laurie]
+
*) Sort out problems with canonical filename handling happening too late.
[Dean Gaudet, Ben Laurie]
1.8 +26 -4 apache-1.3/src/os/win32/util_win32.c
Index: util_win32.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/util_win32.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util_win32.c 1997/12/26 15:29:40 1.7
+++ util_win32.c 1998/02/08 18:50:51 1.8
@@ -85,10 +85,11 @@
return stat(szPath, pStat);
}
-/* Fix two really crap problems with Win32 spawn[lv]e*:
+/* Fix three really crap problems with Win32 spawn[lv]e*:
*
* 1. Win32 doesn't deal with spaces in argv.
* 2. Win95 doesn't like / in cmdname.
+ * 3. Win32 wants a '.' appended to extensionless files.
*/
#undef _spawnv
@@ -99,13 +100,20 @@
const char *szArg;
char *szCmd;
char *s;
+int len=strlen(cmdname);
-szCmd = _alloca(strlen(cmdname)+1);
+szCmd = _alloca(len+2);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if (*s == '/')
*s = '\\';
+s = strrchr(szCmd, '.');
+if (!s || s strrchr(szCmd, '\\')) {
+szCmd[len] = '.';
+szCmd[len+1] = '\0';
+}
+
for (n=0; argv[n]; ++n)
;
@@ -138,13 +146,20 @@
const char *szArg;
char *szCmd;
char *s;
+int len=strlen(cmdname);
-szCmd = _alloca(strlen(cmdname)+1);
+szCmd = _alloca(len+2);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if (*s == '/')
*s = '\\';
+s = strrchr(szCmd, '.');
+if (!s || s strrchr(szCmd, '\\')) {
+szCmd[len] = '.';
+szCmd[len+1] = '\0';
+}
+
for (n = 0; argv[n] ; ++n)
;
@@ -178,12 +193,19 @@
const char *const *aszEnv;
char *szCmd;
char *s;
+int len=strlen(cmdname);
-szCmd = _alloca(strlen(cmdname)+1);
+szCmd = _alloca(len+2);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if(*s == '/')
*s = '\\';
+
+s = strrchr(szCmd, '.');
+if (!s || s strrchr(szCmd, '\\')) {
+szCmd[len] = '.';
+szCmd[len+1] = '\0';
+}
va_start(vlist, cmdname);
for (n = 0; va_arg(vlist, const char *); ++n)
cvs commit: apache-1.3/src/include httpd.h
jim 98/02/08 12:46:20 Modified:src/include httpd.h Log: Bring back down to 1.3b4-dev Revision ChangesPath 1.183 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- httpd.h 1998/02/08 15:06:55 1.182 +++ httpd.h 1998/02/08 20:46:18 1.183 @@ -356,7 +356,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.3b5-dev/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.3b4-dev/* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else @@ -367,7 +367,7 @@ /* Numeric release version identifier: major minor bugfix betaseq * Always increases along the same track as the source branch. */ -#define APACHE_RELEASE 1030005 +#define APACHE_RELEASE 1030004 #define SERVER_PROTOCOL HTTP/1.1 #ifndef SERVER_SUPPORT
cvs commit: apache-1.3/src/test/vhtest/logs .cvsignore
dgaudet 98/02/08 14:50:19 Modified:src/test/vhtest README src/test/vhtest/conf common.conf test1.conf test1d.conf test2.conf test2d.conf test3.conf test4.conf test5.conf test6.conf Added: src/test/vhtest/logs .cvsignore Log: tweak tweak, docs were slightly wrong Revision ChangesPath 1.2 +1 -3 apache-1.3/src/test/vhtest/README Index: README === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1997/11/10 02:11:41 1.1 +++ README1998/02/08 22:50:12 1.2 @@ -19,9 +19,7 @@ To use: -cd conf -perl -pi.orig -e s#/home/dgaudet/ap/vhtest#`pwd`# *.conf -cd .. +perl -pi.orig -e s#/home/dgaudet/ap/vhtest#`pwd`# conf/*.conf ./runtest /path/to/httpd Or to run a specific test: 1.2 +2 -2 apache-1.3/src/test/vhtest/conf/common.conf Index: common.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/common.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- common.conf 1997/11/10 02:11:46 1.1 +++ common.conf 1998/02/08 22:50:13 1.2 @@ -3,7 +3,7 @@ HostnameLookups off User nobody Group #-1 -ServerRoot /home/dgaudet/ap/vhtest +ServerRoot /home/dgaudet/ap/apachen/src/test/vhtest ErrorLog logs/error_log LogLevel debug # vhost Host header request response-code @@ -13,7 +13,7 @@ ResourceConfig /dev/null AccessConfig /dev/null ServerName main -DocumentRoot /home/dgaudet/ap/vhtest/docroot/main +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/main Directory / AllowOverride none 1.2 +5 -5 apache-1.3/src/test/vhtest/conf/test1.conf Index: test1.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- test1.conf1997/11/10 02:11:48 1.1 +++ test1.conf1998/02/08 22:50:14 1.2 @@ -1,6 +1,6 @@ ## test some basic ip-vhosts and a single name-vhost address -Include /home/dgaudet/ap/vhtest/conf/common.conf +Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf #Listen 127.0.0.1:8080 #Listen 127.0.0.2:8080 @@ -9,20 +9,20 @@ VirtualHost 127.0.0.1:8080 ServerName vhost1 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1 /VirtualHost VirtualHost 127.0.0.2:8080 ServerName vhost2 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost3 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost4 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4 /VirtualHost 1.2 +6 -6 apache-1.3/src/test/vhtest/conf/test1d.conf Index: test1d.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1d.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- test1d.conf 1997/11/10 02:11:48 1.1 +++ test1d.conf 1998/02/08 22:50:14 1.2 @@ -1,6 +1,6 @@ ## same as test1, but we throw in a _default_ -Include /home/dgaudet/ap/vhtest/conf/common.conf +Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf #Listen 127.0.0.1:8080 #Listen 127.0.0.2:8080 @@ -9,25 +9,25 @@ VirtualHost 127.0.0.1:8080 ServerName vhost1 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1 /VirtualHost VirtualHost 127.0.0.2:8080 ServerName vhost2 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost3 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost4 -DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4 +DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4 /VirtualHost VirtualHost _default_:8080 ServerName default1
cvs commit: apache-1.3/src/test/vhtest/conf common.conf test1.conf test1d.conf test2.conf test2d.conf test3.conf test4.conf test5.conf test6.conf
dgaudet 98/02/08 14:51:29 Modified:src/test/vhtest/conf common.conf test1.conf test1d.conf test2.conf test2d.conf test3.conf test4.conf test5.conf test6.conf Log: oh foo this method of configuration sucks Revision ChangesPath 1.3 +2 -2 apache-1.3/src/test/vhtest/conf/common.conf Index: common.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/common.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- common.conf 1998/02/08 22:50:13 1.2 +++ common.conf 1998/02/08 22:51:24 1.3 @@ -3,7 +3,7 @@ HostnameLookups off User nobody Group #-1 -ServerRoot /home/dgaudet/ap/apachen/src/test/vhtest +ServerRoot /home/dgaudet/ap/vhtest ErrorLog logs/error_log LogLevel debug # vhost Host header request response-code @@ -13,7 +13,7 @@ ResourceConfig /dev/null AccessConfig /dev/null ServerName main -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/main +DocumentRoot /home/dgaudet/ap/vhtest/docroot/main Directory / AllowOverride none 1.3 +5 -5 apache-1.3/src/test/vhtest/conf/test1.conf Index: test1.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- test1.conf1998/02/08 22:50:14 1.2 +++ test1.conf1998/02/08 22:51:24 1.3 @@ -1,6 +1,6 @@ ## test some basic ip-vhosts and a single name-vhost address -Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf +Include /home/dgaudet/ap/vhtest/conf/common.conf #Listen 127.0.0.1:8080 #Listen 127.0.0.2:8080 @@ -9,20 +9,20 @@ VirtualHost 127.0.0.1:8080 ServerName vhost1 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1 /VirtualHost VirtualHost 127.0.0.2:8080 ServerName vhost2 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost3 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost4 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4 /VirtualHost 1.3 +6 -6 apache-1.3/src/test/vhtest/conf/test1d.conf Index: test1d.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test1d.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- test1d.conf 1998/02/08 22:50:14 1.2 +++ test1d.conf 1998/02/08 22:51:25 1.3 @@ -1,6 +1,6 @@ ## same as test1, but we throw in a _default_ -Include /home/dgaudet/ap/apachen/src/test/vhtest/conf/common.conf +Include /home/dgaudet/ap/vhtest/conf/common.conf #Listen 127.0.0.1:8080 #Listen 127.0.0.2:8080 @@ -9,25 +9,25 @@ VirtualHost 127.0.0.1:8080 ServerName vhost1 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost1 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost1 /VirtualHost VirtualHost 127.0.0.2:8080 ServerName vhost2 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost2 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost2 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost3 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost3 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost3 /VirtualHost VirtualHost 127.0.0.3:8080 ServerName vhost4 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/vhost4 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/vhost4 /VirtualHost VirtualHost _default_:8080 ServerName default1 -DocumentRoot /home/dgaudet/ap/apachen/src/test/vhtest/docroot/default1 +DocumentRoot /home/dgaudet/ap/vhtest/docroot/default1 /VirtualHost 1.3 +6 -6 apache-1.3/src/test/vhtest/conf/test2.conf Index: test2.conf === RCS file: /export/home/cvs/apache-1.3/src/test/vhtest/conf/test2.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- test2.conf1998/02/08 22:50:14 1.2 +++ test2.conf1998/02/08 22:51:25 1.3 @@ -1,7 +1,7 @@ ## test more complex ip-vhosts with multiple ports, and name-vhosts on a ## single port of one ip -Include
