You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2003/01/29 18:05:55 UTC
cvs commit: httpd-2.0/server main.c
bnicholes 2003/01/29 09:05:55
Modified: server/mpm/netware Tag: APACHE_2_0_BRANCH mpm_netware.c
server Tag: APACHE_2_0_BRANCH main.c
Log:
Enabled the -n parameter on NetWare to allow the administrator to rename
the console screen
Revision Changes Path
No revision
No revision
1.62.2.3 +7 -1 httpd-2.0/server/mpm/netware/mpm_netware.c
Index: mpm_netware.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
retrieving revision 1.62.2.2
retrieving revision 1.62.2.3
diff -u -r1.62.2.2 -r1.62.2.3
--- mpm_netware.c 12 Dec 2002 19:41:55 -0000 1.62.2.2
+++ mpm_netware.c 29 Jan 2003 17:05:53 -0000 1.62.2.3
@@ -124,6 +124,7 @@
#include <netware.h>
#include <nks/netware.h>
#include <library.h>
+#include <screen.h>
/* Limit on the total --- clients will be locked out if more servers than
* this are needed. It is intended solely to keep the server from crashing
@@ -1058,8 +1059,13 @@
optbuf[0] = '-';
optbuf[2] = '\0';
apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv);
- while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &opt_arg) == APR_SUCCESS) {
+ while (apr_getopt(opt, AP_SERVER_BASEARGS"n:", optbuf + 1, &opt_arg) == APR_SUCCESS) {
switch (optbuf[1]) {
+ case 'n':
+ if (opt_arg) {
+ renamescreen(opt_arg);
+ }
+ break;
case 'E':
/* Don't need to hold the screen open if the output is going to a file */
hold_screen_on_exit = -1;
No revision
No revision
1.140.2.1 +4 -0 httpd-2.0/server/main.c
Index: main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.140
retrieving revision 1.140.2.1
diff -u -r1.140 -r1.140.2.1
--- main.c 16 Oct 2002 18:03:44 -0000 1.140
+++ main.c 29 Jan 2003 17:05:53 -0000 1.140.2.1
@@ -342,6 +342,10 @@
" -c \"directive\" : process directive after reading "
"config files");
+#ifdef NETWARE
+ ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+ " -n name : set screen name");
+#endif
#ifdef WIN32
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -n name : set service name and use its "