jim 99/03/15 16:38:59
Modified: . Makefile.tmpl STATUS
src CHANGES
Log:
Honor TARGET in httpd.conf 'creation'
Revision Changes Path
1.67 +1 -0 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Makefile.tmpl 1999/03/08 20:50:04 1.66
+++ Makefile.tmpl 1999/03/16 00:38:46 1.67
@@ -432,6 +432,7 @@
-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
-e 's;@@ServerRoot@@;$(prefix);g' \
+ -e 's;httpd.conf;$(TARGET).conf;' \
-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
-e
's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
1.648 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- STATUS 1999/03/16 00:26:54 1.647
+++ STATUS 1999/03/16 00:38:47 1.648
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/03/16 00:26:54 $]
+ Last modified at [$Date: 1999/03/16 00:38:47 $]
Release:
@@ -47,10 +47,6 @@
TCN additions and when the RVSA algorithm is used.
Available Patches:
-
- * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf
- Message-ID: <[EMAIL PROTECTED]>
- Status: Jim +1
* Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch
ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
1.1281 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -r1.1280 -r1.1281
--- CHANGES 1999/03/16 00:26:56 1.1280
+++ CHANGES 1999/03/16 00:38:53 1.1281
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Using APACI, the main config file (usually httpd.conf) was
+ not being adjusted as $(TARGET).conf. [Wilfredo Sanchez
+ <[EMAIL PROTECTED]>]
+
*) PORT: AIX does not require the SHARED_CODE "hack"
[Ryan Bloom <[EMAIL PROTECTED]>]