You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by th...@apache.org on 2003/09/29 14:08:06 UTC
cvs commit: httpd-2.0/docs/conf ssl-std.conf.in ssl-std.conf
thommay 2003/09/29 05:08:06
Modified: . Tag: APACHE_2_0_BRANCH STATUS configure.in
Added: docs/conf Tag: APACHE_2_0_BRANCH ssl-std.conf.in
Removed: docs/conf Tag: APACHE_2_0_BRANCH ssl-std.conf
Log:
Ensure that ssl-std.conf is generated at configure time, and switch
to using the expanded config variables to work the same as
httpd-std.conf PR: 19611
PR: 19611
Reviewed by: jerenkrantz, striker, jim, nd, trawick
Revision Changes Path
No revision
No revision
1.751.2.489 +1 -31 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.488
retrieving revision 1.751.2.489
diff -u -r1.751.2.488 -r1.751.2.489
--- STATUS 27 Sep 2003 18:47:05 -0000 1.751.2.488
+++ STATUS 29 Sep 2003 12:08:06 -0000 1.751.2.489
@@ -147,36 +147,6 @@
+1: wrowe
+1 (concept): jim (final vote when the patch is available)
- * Ensure that ssl-std.conf is generated at configure time, and switch
- to using the expanded config variables to work the same as
- httpd-std.conf PR: 19611
- (this requires deleting ssl-std.conf and replacing it with an autogen'd
- one)
- configure.in: r1.250
- docs/conf/ssl-std.conf.in: r1.1,1.2
- +1: thommay, jerenkrantz, striker, jim, nd, trawick
- nd: The runtime files (e.g. cache) should be in runtimedir, since the
- logfilefir should not be writable for the httpd user.
-
- thommay: In principle I agree; however I was going for the principle
- of least surprise - the new version uses exactly the same
- settings as the old one. If we want to change the locations
- I'm quite happy to do that but don't think that should
- affect backporting this fix.
-
- nd: Actually I see no problem with surprises. If someone uses this
- tailored example config, it's probably his first SSL config. If
- it's not his first one, he probably doesn't care about - IMHO :)
- An appropriate change-log entry should warn the rest of the
- people, shouldn't it?
-
- trawick: existing configs shouldn't be overwritten, new configs
- should default to our best available recommendation
-
- thommay: can't argue with this, commited.
-
- nd: thx.:)
-
* mod_ssl: Drop SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
ENGINE_init() function in config.m4, and use HAVE_ENGINE_INIT instead.
wrowe notes that this feature is a noop until configured with SSLEngine.
1.232.2.11 +1 -1 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.232.2.10
retrieving revision 1.232.2.11
diff -u -r1.232.2.10 -r1.232.2.11
--- configure.in 21 May 2003 04:46:00 -0000 1.232.2.10
+++ configure.in 29 Sep 2003 12:08:06 -0000 1.232.2.11
@@ -566,7 +566,7 @@
dnl Ensure that docs/conf is created.
test -d docs/conf||$mkdir_p docs/conf
-AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
+AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf docs/conf/ssl-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
APACHE_GEN_MAKEFILES
])
No revision
No revision
1.3.2.1 +1 -1 httpd-2.0/docs/conf/ssl-std.conf.in
Index: ssl-std.conf.in
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/ssl-std.conf.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ssl-std.conf.in 29 Jul 2003 20:17:07 -0000 1.3
+++ ssl-std.conf.in 29 Sep 2003 12:08:06 -0000 1.3.2.1
@@ -2,7 +2,7 @@
# This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these
-# directives see <URL:http://httpd.apache.org/docs-2.1/mod/mod_ssl.html>
+# directives see <URL:http://httpd.apache.org/docs-2.0/mod/mod_ssl.html>
#
# For the moment, see <URL:http://www.modssl.org/docs/> for this info.
# The documents are still being prepared from material donated by the