You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/05/24 20:48:10 UTC
cvs commit: httpd-2.0/server main.c mpm_common.c
trawick 02/05/24 11:48:10
Modified: . CHANGES
server main.c mpm_common.c
Log:
the "-k startssl" parameter is reverted by popular demand
Revision Changes Path
1.784 +3 -4 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- CHANGES 23 May 2002 20:00:28 -0000 1.783
+++ CHANGES 24 May 2002 18:48:09 -0000 1.784
@@ -6,10 +6,9 @@
*) Fix a file permissions problem which prevented mod_disk_cache
from working on Unix. [Jeff Trawick]
- *) Add "-k start|startssl|restart|graceful|stop" support to httpd
- for the Unix MPMs. These have semantics very similar to the
- old apachectl commands of the same name.
- [Justin Erenkrantz, Jeff Trawick]
+ *) Add "-k start|restart|graceful|stop" support to httpd for the Unix
+ MPMs. These have semantics very similar to the old apachectl
+ commands of the same name. [Justin Erenkrantz, Jeff Trawick]
*) Make sure that the runtime dir is created by make install.
PR 9233. [Jeff Trawick]
1.133 +1 -1 httpd-2.0/server/main.c
Index: main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- main.c 23 May 2002 18:52:26 -0000 1.132
+++ main.c 24 May 2002 18:48:10 -0000 1.133
@@ -312,7 +312,7 @@
#endif
#ifdef AP_MPM_WANT_SIGNAL_SERVER
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-k start|startssl|restart|graceful|stop]",
+ " %s [-k start|restart|graceful|stop]",
pad);
#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
1.97 +0 -8 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mpm_common.c 23 May 2002 18:31:02 -0000 1.96
+++ mpm_common.c 24 May 2002 18:48:10 -0000 1.97
@@ -850,14 +850,6 @@
dash_k_arg = optarg;
break;
}
- if (!strcmp(optarg, "startssl")) {
- char **new_define;
-
- dash_k_arg = "start";
- new_define = (char **)apr_array_push(ap_server_config_defines);
- *new_define = "SSL";
- break;
- }
}
default:
*(const char **)apr_array_push(mpm_new_argv) =